X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Futils%2Fsendcommand.c;fp=citadel%2Futils%2Fsendcommand.c;h=fde3d5c3c5dff8e39aee0fe6ca9f086e5c32b8a5;hb=3524c469a659a79b07a4be6ea358288b74242652;hp=e9e5fbcd639a56dbece398927634d6418f4f0514;hpb=224f5aa99fdfc177f2f37e136b7fed9c68330fdc;p=citadel.git

diff --git a/citadel/utils/sendcommand.c b/citadel/utils/sendcommand.c
index e9e5fbcd6..fde3d5c3c 100644
--- 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 "include/citadel_dirs.h"
 
 
 
@@ -141,15 +142,18 @@ int main(int argc, char **argv)
 {
 	int a;
 	int watchdog = 60;
-	char *ctdl_home_directory = CTDLDIR;
 	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':
-			ctdl_home_directory = strdup(optarg);
+			strcpy(relhome, 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(),
-		ctdl_home_directory
+		file_citadel_admin_socket
 	);
 	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);