centralized filename calculation

[citadel.git] / citadel / sendcommand.c

diff --git a/citadel/sendcommand.c b/citadel/sendcommand.c
index 599655dd7a81c9d9b7585dba9a9cb9c99719be82..5e80465a9abe31db3334809884221b5d922e1137 100644 (file)
--- a/citadel/sendcommand.c
+++ b/citadel/sendcommand.c
@@ -102,19 +102,23 @@ void logoff(int e)
 /*
  * Connect sendcommand to the Citadel server running on this computer.
  */
-void np_attach_to_server(void)
+void np_attach_to_server(char *host, char *port)
 {
-       char hostbuf[SIZ], portbuf[SIZ];
        char buf[SIZ];
+       char hostbuf[256], portbuf[256];
        char *args[] =
        {"sendcommand", NULL};
        int r;
 
-       strcpy(hostbuf, "localhost");
-       strcpy(portbuf, "citadel");
        fprintf(stderr, "Attaching to server...\n");
+       strcpy(hostbuf, host);
+       strcpy(portbuf, port);
        ipc = CtdlIPC_new(1, args, hostbuf, portbuf);
-       CtdlIPC_getline(ipc, buf);
+       if (!ipc) {
+               fprintf(stderr, "Can't connect: %s\n", strerror(errno));
+               exit(3);
+       }
+       CtdlIPC_chat_recv(ipc, buf);
        fprintf(stderr, "%s\n", &buf[4]);
        snprintf(buf, sizeof buf, "IPGM %d", config.c_ipgm_secret);
        r = CtdlIPCInternalProgram(ipc, config.c_ipgm_secret, buf);
@@ -125,6 +129,10 @@ void np_attach_to_server(void)
 }
 
 
+void sendcommand_die(void) {
+       exit(0);
+}
+
 
 /*
  * main
@@ -135,7 +143,12 @@ int main(int argc, char **argv)
        char cmd[SIZ];
        char buf[SIZ];
 
-       strcpy(bbs_home_directory, BBSDIR);
+       int relh=0;
+       int home=0;
+       char relhome[PATH_MAX]="";
+       char ctdldir[PATH_MAX]=CTDLDIR;
+
+       strcpy(ctdl_home_directory, DEFAULT_PORT);
 
        strcpy(cmd, "");
        /*
@@ -143,9 +156,14 @@ int main(int argc, char **argv)
         */
        for (a = 1; a < argc; ++a) {
                if (!strncmp(argv[a], "-h", 2)) {
-                       strcpy(bbs_home_directory, argv[a]);
-                       strcpy(bbs_home_directory, &bbs_home_directory[2]);
+                       relh=argv[a][2]!='/';
+                       if (!relh) safestrncpy(ctdl_home_directory, &argv[a][2],
+                                                                  sizeof ctdl_home_directory);
+                       else
+                               safestrncpy(relhome, &argv[a][2],
+                                                       sizeof relhome);
                        home_specified = 1;
+                       home=1;
                } else {
                        if (strlen(cmd) > 0)
                                strcat(cmd, " ");
@@ -153,6 +171,7 @@ int main(int argc, char **argv)
                }
        }
 
+       calc_dirs_n_files(relh, home, relhome, ctdldir);
        get_config();
 
        signal(SIGINT, cleanup);
@@ -163,18 +182,19 @@ int main(int argc, char **argv)
        fprintf(stderr, "sendcommand: started (pid=%d) "
                        "running in %s\n",
                        (int) getpid(),
-                       bbs_home_directory);
+                       ctdl_home_directory);
        fflush(stderr);
-       np_attach_to_server();
+       np_attach_to_server(UDS, ctdl_home_directory);
        fflush(stderr);
+       setIPCDeathHook(sendcommand_die);
 
        fprintf(stderr, "%s\n", cmd);
-       CtdlIPC_putline(ipc, cmd);
-       CtdlIPC_getline(ipc, buf);
+       CtdlIPC_chat_send(ipc, cmd);
+       CtdlIPC_chat_recv(ipc, buf);
        fprintf(stderr, "%s\n", buf);
 
        if (buf[0] == '1') {
-               while (CtdlIPC_getline(ipc, buf), strcmp(buf, "000")) {
+               while (CtdlIPC_chat_recv(ipc, buf), strcmp(buf, "000")) {
                        printf("%s\n", buf);
                }
        } else if (buf[0] == '4') {
@@ -188,9 +208,9 @@ int main(int argc, char **argv)
                                if (buf[strlen(buf) - 1] == '\r')
                                        buf[strlen(buf) - 1] = 0;
                        if (strcmp(buf, "000"))
-                               CtdlIPC_putline(ipc, buf);
+                               CtdlIPC_chat_send(ipc, buf);
                } while (strcmp(buf, "000"));
-               CtdlIPC_putline(ipc, "000");
+               CtdlIPC_chat_send(ipc, "000");
        }
        fprintf(stderr, "sendcommand: processing ended.\n");
        cleanup(0);