1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
|
We observed the pseudo database becoming large and corrupted when undergoing
significant use (generating multiple output package types).
This patch checks for the existence of an PSEUDO_DATADIR environment variable
and, when it exists, uses the directory specified there to store the pseudo
database. This should enable us to use a different database for each run of
pseudo.
JL (23/07/10)
Updates to include lock/log/socket/pid files
RP (24/07/10)
Index: git/pseudo.h
===================================================================
--- git.orig/pseudo.h 2010-07-24 00:28:35.762423800 +0100
+++ git/pseudo.h 2010-07-24 10:34:33.902335659 +0100
@@ -123,6 +123,7 @@
extern char *pseudo_fix_path(const char *, const char *, size_t, size_t, size_t *, int);
extern char **pseudo_dropenv(char * const *);
extern char **pseudo_setupenv(char * const *, char *);
+extern char *pseudo_data_path(char *);
extern char *pseudo_prefix_path(char *);
extern char *pseudo_get_prefix(char *);
extern int pseudo_logfile(char *defname);
@@ -134,10 +135,16 @@
extern char *pseudo_version;
-#define PSEUDO_LOCKFILE PSEUDO_DATA "/pseudo.lock"
-#define PSEUDO_LOGFILE PSEUDO_DATA "/pseudo.log"
-#define PSEUDO_PIDFILE PSEUDO_DATA "/pseudo.pid"
-#define PSEUDO_SOCKET PSEUDO_DATA "/pseudo.socket"
+#define PSEUDO_LOCKFILE "/pseudo.lock"
+#define PSEUDO_LOGFILE "/pseudo.log"
+#define PSEUDO_PIDFILE "/pseudo.pid"
+#define PSEUDO_SOCKET "/pseudo.socket"
+
+extern char *pseudo_get_pid();
+extern char *pseudo_get_lockfile();
+extern char *pseudo_get_logfile();
+extern char *pseudo_get_socketfile();
+
/* some systems might not have *at(). We like to define operations in
* terms of each other, and for instance, open(...) is the same as
Index: git/pseudo_db.c
===================================================================
--- git.orig/pseudo_db.c 2010-07-24 00:28:35.762423800 +0100
+++ git/pseudo_db.c 2010-07-24 00:28:36.282335730 +0100
@@ -465,17 +465,18 @@
char *errmsg;
static int registered_cleanup = 0;
char *dbfile;
+ char *data_dir;
if (!db)
return 1;
if (*db)
return 0;
if (db == &file_db) {
- dbfile = strdup(PSEUDO_DATA "/files.db");
+ dbfile = pseudo_data_path("files.db");
rc = sqlite3_open(dbfile, db);
free(dbfile);
} else {
- dbfile = strdup(PSEUDO_DATA "/logs.db");
+ dbfile = pseudo_data_path("logs.db");
rc = sqlite3_open(dbfile, db);
free(dbfile);
}
Index: git/pseudo_server.c
===================================================================
--- git.orig/pseudo_server.c 2010-07-24 00:28:35.762423800 +0100
+++ git/pseudo_server.c 2010-07-24 10:27:59.242335869 +0100
@@ -107,7 +107,7 @@
}
/* cd to the data directory */
- pseudo_path = strdup(PSEUDO_DATA);
+ pseudo_path = pseudo_data_path(NULL);
if (!pseudo_path) {
pseudo_diag("can't find %s directory.\n", PSEUDO_DATA);
return 1;
@@ -138,9 +138,9 @@
return 0;
}
setsid();
- pseudo_path = strdup(PSEUDO_PIDFILE);
+ pseudo_path = pseudo_get_pid();
if (!pseudo_path) {
- pseudo_diag("Couldn't get path for %s\n", PSEUDO_PIDFILE);
+ pseudo_diag("Couldn't get pid path\n");
return 1;
}
fp = fopen(pseudo_path, "w");
@@ -156,7 +156,7 @@
pseudo_new_pid();
fclose(stdin);
fclose(stdout);
- if (!pseudo_logfile(PSEUDO_LOGFILE))
+ if (!pseudo_logfile(pseudo_get_logfile()))
fclose(stderr);
}
signal(SIGHUP, quit_now);
Index: git/pseudo_util.c
===================================================================
--- git.orig/pseudo_util.c 2010-07-24 00:28:35.962336149 +0100
+++ git/pseudo_util.c 2010-07-24 10:50:48.062336358 +0100
@@ -593,6 +593,50 @@
return new_environ;
}
+/* get the full path to the datadir for this run of pseudo
+ * file parameter is optional and returns the datadir path
+ * with the file name appended.
+ */
+char *
+pseudo_data_path(char *file) {
+ static char *datadir = NULL;
+ static size_t datadir_len;
+ char *path;
+
+ if (!datadir) {
+ datadir = getenv("PSEUDO_DATADIR");
+ if (!datadir) {
+ datadir = strdup(PSEUDO_DATA);
+ }
+ datadir_len = strlen(datadir);
+ }
+
+ if (!file) {
+ return strdup(datadir);
+ } else {
+ size_t len = datadir_len + strlen(file) + 2;
+ path = malloc(len);
+ if (path) {
+ char *endptr;
+ int rc;
+
+ rc = snprintf(path, len, "%s", datadir);
+ /* this certainly SHOULD be impossible */
+ if ((size_t) rc >= len)
+ rc = len - 1;
+ endptr = path + rc;
+ /* strip extra slashes.
+ * This probably has no real effect, but I don't like
+ * seeing " //" in paths.
+ */
+ while ((endptr > path) && (endptr[-1] == '/'))
+ --endptr;
+ snprintf(endptr, len - (endptr - path), "/%s", file);
+ }
+ return path;
+ }
+}
+
/* get the full path to a file under $PSEUDO_PREFIX. Other ways of
* setting the prefix all set it in the environment.
*/
@@ -691,6 +735,26 @@
return s;
}
+char *
+pseudo_get_pid() {
+ return pseudo_data_path(PSEUDO_PIDFILE);
+}
+
+char *
+pseudo_get_lockfile() {
+ return pseudo_data_path(PSEUDO_LOCKFILE);
+}
+
+char *
+pseudo_get_logfile() {
+ return pseudo_data_path(PSEUDO_LOGFILE);
+}
+
+char *
+pseudo_get_socketfile() {
+ return pseudo_data_path(PSEUDO_SOCKET);
+}
+
/* these functions define the sizes pseudo will try to use
* when trying to allocate space, or guess how much space
* other people will have allocated; see the GNU man page
@@ -844,20 +908,14 @@
/* set up a log file */
int
-pseudo_logfile(char *defname) {
- char *pseudo_path;
+pseudo_logfile(char *pseudo_path) {
char *filename, *s;
extern char *program_invocation_short_name; /* glibcism */
int fd;
if ((filename = getenv("PSEUDO_DEBUG_FILE")) == NULL) {
- if (!defname) {
- pseudo_debug(3, "no special log file requested, using stderr.\n");
- return -1;
- }
- pseudo_path = strdup(defname);
if (!pseudo_path) {
- pseudo_diag("can't get path for prefix/%s\n", PSEUDO_LOGFILE);
+ pseudo_debug(3, "no special log file requested or unable to malloc space, using stderr.\n");
return -1;
}
} else {
@@ -903,6 +961,7 @@
len += 8;
if (prog)
len += strlen(program_invocation_short_name);
+ free(pseudo_path);
pseudo_path = malloc(len);
if (!pseudo_path) {
pseudo_diag("can't allocate space for debug file name.\n");
Index: git/pseudo.c
===================================================================
--- git.orig/pseudo.c 2010-07-24 10:22:10.053594896 +0100
+++ git/pseudo.c 2010-07-24 10:23:20.883585467 +0100
@@ -272,7 +272,7 @@
pseudo_new_pid();
pseudo_debug(3, "opening lock.\n");
- lockname = strdup(PSEUDO_LOCKFILE);
+ lockname = pseudo_get_lockfile();
if (!lockname) {
pseudo_diag("Couldn't allocate a file path.\n");
exit(EXIT_FAILURE);
Index: git/pseudo_client.c
===================================================================
--- git.orig/pseudo_client.c 2010-07-24 10:03:51.933588401 +0100
+++ git/pseudo_client.c 2010-07-24 10:49:22.922336916 +0100
@@ -359,6 +359,7 @@
FILE *fp;
extern char **environ;
int cwd_fd;
+ char *pidpath;
if ((server_pid = fork()) != 0) {
if (server_pid == -1) {
@@ -383,7 +384,12 @@
pseudo_diag("Couldn't change to server dir [%d]: %s\n",
pseudo_dir_fd, strerror(errno));
}
- fp = fopen(PSEUDO_PIDFILE, "r");
+ pidpath = pseudo_get_pid();
+ if (!pidpath) {
+ pseudo_diag("Couldn't get pid path\n");
+ return 1;
+ }
+ fp = fopen(pidpath, "r");
if (fchdir(cwd_fd) == -1) {
pseudo_diag("return to previous directory failed: %s\n",
strerror(errno));
@@ -396,8 +402,9 @@
fclose(fp);
} else {
pseudo_diag("no pid file (%s): %s\n",
- PSEUDO_PIDFILE, strerror(errno));
+ pidpath, strerror(errno));
}
+ free(pidpath);
pseudo_debug(2, "read new pid file: %d\n", server_pid);
/* at this point, we should have a new server_pid */
return 0;
@@ -535,10 +542,19 @@
static int
client_connect(void) {
+ char *socketfile = pseudo_get_socketfile();
/* we have a server pid, is it responsive? */
- struct sockaddr_un sun = { AF_UNIX, PSEUDO_SOCKET };
+ struct sockaddr_un sun = { AF_UNIX, "" };
int cwd_fd;
+ if (!socketfile) {
+ pseudo_diag("Couldn't malloc socketfile");
+
+ return 1;
+ }
+
+ strncpy(sun.sun_path, socketfile, sizeof(sun.sun_path) - 1);
+
connect_fd = socket(PF_UNIX, SOCK_STREAM, 0);
connect_fd = pseudo_fd(connect_fd, MOVE_FD);
if (connect_fd == -1) {
@@ -564,7 +580,7 @@
return 1;
}
if (connect(connect_fd, (struct sockaddr *) &sun, sizeof(sun)) == -1) {
- pseudo_debug(3, "can't connect socket to pseudo.socket: (%s)\n", strerror(errno));
+ pseudo_debug(3, "can't connect socket to %s: (%s)\n", sun.sun_path, strerror(errno));
close(connect_fd);
if (fchdir(cwd_fd) == -1) {
pseudo_diag("return to previous directory failed: %s\n",
@@ -588,6 +604,7 @@
FILE *fp;
server_pid = 0;
int cwd_fd;
+ char *pidpath;
/* avoid descriptor leak, I hope */
if (connect_fd >= 0) {
@@ -604,7 +621,12 @@
return 1;
}
if (fchdir(pseudo_dir_fd) != 1) {
- fp = fopen(PSEUDO_PIDFILE, "r");
+ pidpath = pseudo_get_pid();
+ if (!pidpath) {
+ pseudo_diag("Couldn't get pid path\n");
+ return 1;
+ }
+ fp = fopen(pidpath, "r");
if (fchdir(cwd_fd) == -1) {
pseudo_diag("return to previous directory failed: %s\n",
strerror(errno));
@@ -619,6 +641,7 @@
pseudo_debug(1, "Opened server PID file, but didn't get a pid.\n");
}
fclose(fp);
+ free(pidpath);
}
if (server_pid) {
if (kill(server_pid, 0) == -1) {
|
