projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sendcommand: locate admin socket using calc_dirs_n_files
[citadel.git]
/
citadel
/
utils
/
sendcommand.c
diff --git
a/citadel/utils/sendcommand.c
b/citadel/utils/sendcommand.c
index e9e5fbcd639a56dbece398927634d6418f4f0514..fde3d5c3c5dff8e39aee0fe6ca9f086e5c32b8a5 100644
(file)
--- a/
citadel/utils/sendcommand.c
+++ b/
citadel/utils/sendcommand.c
@@
-26,6
+26,7
@@
#include <sys/socket.h>
#include <sys/un.h>
#include "citadel.h"
#include <sys/socket.h>
#include <sys/un.h>
#include "citadel.h"
+#include "include/citadel_dirs.h"
@@
-141,15
+142,18
@@
int main(int argc, char **argv)
{
int a;
int watchdog = 60;
{
int a;
int watchdog = 60;
- char *ctdl_home_directory = CTDLDIR;
char buf[SIZ];
int xfermode = 0;
char buf[SIZ];
int xfermode = 0;
+ int relh=0;
+ int home=0;
+ char relhome[PATH_MAX]="";
+ char ctdldir[PATH_MAX]=CTDLDIR;
/* Parse command line */
while ((a = getopt(argc, argv, "h:w:")) != EOF) {
switch (a) {
case 'h':
/* Parse command line */
while ((a = getopt(argc, argv, "h:w:")) != EOF) {
switch (a) {
case 'h':
-
ctdl_home_directory = strdup(
optarg);
+
strcpy(relhome,
optarg);
break;
case 'w':
watchdog = atoi(optarg);
break;
case 'w':
watchdog = atoi(optarg);
@@
-159,15
+163,16
@@
int main(int argc, char **argv)
}
}
}
}
- fprintf(stderr, "sendcommand: started (pid=%d) connecting to Citadel server in %s\n",
+ calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
+
+ fprintf(stderr, "sendcommand: started (pid=%d) connecting to Citadel server at %s\n",
(int) getpid(),
(int) getpid(),
- ctdl_home_directory
+ file_citadel_admin_socket
);
fflush(stderr);
alarm(watchdog);
);
fflush(stderr);
alarm(watchdog);
- snprintf(buf, sizeof buf, "%s/citadel-admin.socket", ctdl_home_directory);
- serv_sock = uds_connectsock(buf);
+ serv_sock = uds_connectsock(file_citadel_admin_socket);
serv_gets(buf);
fprintf(stderr, "%s\n", buf);
serv_gets(buf);
fprintf(stderr, "%s\n", buf);