* Variable names, comments, documentation, etc... removed the acronym 'BBS'

[citadel.git] / citadel / sendcommand.c

diff --git a/citadel/sendcommand.c b/citadel/sendcommand.c
index 8c7f63e5307970636a03d19cb7872891e4c9764c..da37dd71c3ddd33fc443adc01bb60ed0cf136ffb 100644 (file)
--- a/citadel/sendcommand.c
+++ b/citadel/sendcommand.c
@@ -31,14 +31,14 @@
 #include <limits.h>
 #include "citadel.h"
 #include "tools.h"
-#include "ipc.h"
+#include "citadel_ipc.h"
+#include "server.h"
+#include "serv_extensions.h"
 #include "config.h"
 
 #define LOCKFILE "/tmp/LCK.sendcommand"
 
-struct config config;
-extern int home_specified;
-
+static CtdlIPC *ipc = NULL;
 
 /*
  * make sure only one copy of sendcommand runs at a time, using lock files
@@ -85,7 +85,7 @@ void cleanup(int e)
        alarm(30);
        signal(SIGALRM, nq_cleanup);
        if (nested++ < 1)
-               serv_puts("QUIT");
+               CtdlIPCQuit(ipc);
        nq_cleanup(e);
 }
 
@@ -108,21 +108,31 @@ void np_attach_to_server(void)
        char buf[SIZ];
        char *args[] =
        {"sendcommand", NULL};
+       int r;
 
+       strcpy(hostbuf, UDS);   /* Only run on a unix domain socket */
+       strcpy(portbuf, ".");   /* IPGM will refuse to run on the network */
        fprintf(stderr, "Attaching to server...\n");
-       attach_to_server(1, args, hostbuf, portbuf);
-       serv_gets(buf);
-       fprintf(stderr, "%s\n", &buf[4]);
-       sprintf(buf, "IPGM %d", config.c_ipgm_secret);
-       serv_puts(buf);
-       serv_gets(buf);
+       ipc = CtdlIPC_new(1, args, hostbuf, portbuf);
+       if (!ipc) {
+               fprintf(stderr, "Can't connect: %s\n", strerror(errno));
+               exit(3);
+       }
+       CtdlIPC_chat_recv(ipc, buf);
        fprintf(stderr, "%s\n", &buf[4]);
-       if (buf[0] != '2') {
+       snprintf(buf, sizeof buf, "IPGM %d", config.c_ipgm_secret);
+       r = CtdlIPCInternalProgram(ipc, config.c_ipgm_secret, buf);
+       fprintf(stderr, "%s\n", buf);
+       if (r / 100 != 2) {
                cleanup(2);
        }
 }
 
 
+void sendcommand_die(void) {
+       exit(0);
+}
+
 
 /*
  * main
@@ -133,7 +143,7 @@ int main(int argc, char **argv)
        char cmd[SIZ];
        char buf[SIZ];
 
-       strcpy(bbs_home_directory, BBSDIR);
+       strcpy(ctdl_home_directory, CTDLDIR);
 
        strcpy(cmd, "");
        /*
@@ -141,8 +151,8 @@ 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]);
+                       strcpy(ctdl_home_directory, argv[a]);
+                       strcpy(ctdl_home_directory, &ctdl_home_directory[2]);
                        home_specified = 1;
                } else {
                        if (strlen(cmd) > 0)
@@ -158,19 +168,22 @@ int main(int argc, char **argv)
        signal(SIGHUP, cleanup);
        signal(SIGTERM, cleanup);
 
-       fprintf(stderr, "sendcommand: started.  pid=%ld\n", (long) getpid());
-       fprintf(stderr, "Running from %s\n", bbs_home_directory);
+       fprintf(stderr, "sendcommand: started (pid=%d) "
+                       "running in %s\n",
+                       (int) getpid(),
+                       ctdl_home_directory);
        fflush(stderr);
        np_attach_to_server();
        fflush(stderr);
+       setIPCDeathHook(sendcommand_die);
 
        fprintf(stderr, "%s\n", cmd);
-       serv_puts(cmd);
-       serv_gets(buf);
+       CtdlIPC_chat_send(ipc, cmd);
+       CtdlIPC_chat_recv(ipc, buf);
        fprintf(stderr, "%s\n", buf);
 
        if (buf[0] == '1') {
-               while (serv_gets(buf), strcmp(buf, "000")) {
+               while (CtdlIPC_chat_recv(ipc, buf), strcmp(buf, "000")) {
                        printf("%s\n", buf);
                }
        } else if (buf[0] == '4') {
@@ -184,9 +197,9 @@ int main(int argc, char **argv)
                                if (buf[strlen(buf) - 1] == '\r')
                                        buf[strlen(buf) - 1] = 0;
                        if (strcmp(buf, "000"))
-                               serv_puts(buf);
+                               CtdlIPC_chat_send(ipc, buf);
                } while (strcmp(buf, "000"));
-               serv_puts("000");
+               CtdlIPC_chat_send(ipc, "000");
        }
        fprintf(stderr, "sendcommand: processing ended.\n");
        cleanup(0);