projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
12e52a4
)
sendcommand now uses the new directory semantics
author
Art Cancro
<ajc@citadel.org>
Sun, 31 Jan 2021 02:53:46 +0000
(21:53 -0500)
committer
Art Cancro
<ajc@citadel.org>
Sun, 31 Jan 2021 02:53:46 +0000
(21:53 -0500)
citadel/utils/sendcommand.c
patch
|
blob
|
history
diff --git
a/citadel/utils/sendcommand.c
b/citadel/utils/sendcommand.c
index a77c8a8eb4ef390ff401ae468a8699d01e2ec659..7d8e089853fc1416e11739d8a29a23f3da922d06 100644
(file)
--- a/
citadel/utils/sendcommand.c
+++ b/
citadel/utils/sendcommand.c
@@
-140,9
+140,6
@@
int main(int argc, char **argv)
int watchdog = 60;
char buf[SIZ];
int xfermode = 0;
int watchdog = 60;
char buf[SIZ];
int xfermode = 0;
- int relh=0;
- int home=0;
- char relhome[PATH_MAX]="";
char ctdldir[PATH_MAX]=CTDLDIR;
StartLibCitadel(SIZ);
char ctdldir[PATH_MAX]=CTDLDIR;
StartLibCitadel(SIZ);
@@
-151,13
+148,7
@@
int main(int argc, char **argv)
while ((a = getopt(argc, argv, "h:w:")) != EOF) {
switch (a) {
case 'h':
while ((a = getopt(argc, argv, "h:w:")) != EOF) {
switch (a) {
case 'h':
- relh=optarg[0]!='/';
- if (!relh) {
- strncpy(ctdl_home_directory, optarg, sizeof ctdl_home_directory);
- } else {
- strncpy(relhome, optarg, sizeof relhome);
- }
- home = 1;
+ strncpy(ctdldir, optarg, sizeof ctdldir);
break;
case 'w':
watchdog = atoi(optarg);
break;
case 'w':
watchdog = atoi(optarg);
@@
-168,12
+159,17
@@
int main(int argc, char **argv)
}
}
}
}
- fprintf(stderr, "sendcommand: started (pid=%d) connecting to Citadel server
at
%s\n",
+ fprintf(stderr, "sendcommand: started (pid=%d) connecting to Citadel server
with data directory
%s\n",
(int) getpid(),
(int) getpid(),
- file_citadel_admin_socket
+ ctdldir
);
fflush(stderr);
);
fflush(stderr);
+ if (chdir(ctdldir) != 0) {
+ fprintf(stderr, "sendcommand: %s: %s\n", ctdldir, strerror(errno));
+ exit(errno);
+ }
+
alarm(watchdog);
serv_sock = uds_connectsock(file_citadel_admin_socket);
serv_gets(buf);
alarm(watchdog);
serv_sock = uds_connectsock(file_citadel_admin_socket);
serv_gets(buf);