sendcommand now uses the new directory semantics

[citadel.git] / citadel / utils / sendcommand.c

diff --git a/citadel/utils/sendcommand.c b/citadel/utils/sendcommand.c
index 001a4b1dcdbe24334d0a3b98e764f0fd34c08cfd..7d8e089853fc1416e11739d8a29a23f3da922d06 100644 (file)
--- a/citadel/utils/sendcommand.c
+++ b/citadel/utils/sendcommand.c
@@ -1,7 +1,7 @@
 /*
  * Command-line utility to transmit a server command.
  *
- * Copyright (c) 1987-2012 by the citadel.org team
+ * Copyright (c) 1987-2021 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -27,7 +27,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include "citadel.h"
-#include "include/citadel_dirs.h"
+#include "citadel_dirs.h"
 #include <libcitadel.h>
 
 int serv_sock = (-1);
@@ -140,9 +140,6 @@ int main(int argc, char **argv)
        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);
@@ -151,13 +148,7 @@ int main(int argc, char **argv)
        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);
@@ -168,14 +159,17 @@ int main(int argc, char **argv)
                }
        }
 
-       calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
-
-       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(),
-               file_citadel_admin_socket
+               ctdldir
        );
        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);