* Holy war on strlen: use IsEmptyStr where apropriate.

[citadel.git] / citadel / sendcommand.c

diff --git a/citadel/sendcommand.c b/citadel/sendcommand.c
index 9960af66737475023a219b11a0095f69dcf2fbad..4c23a6d350cad80b9fec137c530608c8e83d7ab3 100644 (file)
--- a/citadel/sendcommand.c
+++ b/citadel/sendcommand.c
@@ -33,7 +33,6 @@
 #include "tools.h"
 #include "citadel_ipc.h"
 #include "server.h"
-#include "serv_extensions.h"
 #include "config.h"
 
 #define LOCKFILE "/tmp/LCK.sendcommand"
@@ -102,17 +101,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;
 
        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);
@@ -123,6 +128,10 @@ void np_attach_to_server(void)
 }
 
 
+void sendcommand_die(void) {
+       exit(0);
+}
+
 
 /*
  * main
@@ -133,7 +142,15 @@ 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;
+       fd_set read_fd;
+       struct timeval tv;
+       int ret, err;
+
+       strcpy(ctdl_home_directory, DEFAULT_PORT);
 
        strcpy(cmd, "");
        /*
@@ -141,16 +158,22 @@ 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)
+                       if (!IsEmptyStr(cmd))
                                strcat(cmd, " ");
                        strcat(cmd, argv[a]);
                }
        }
 
+       calc_dirs_n_files(relh, home, relhome, ctdldir);
        get_config();
 
        signal(SIGINT, cleanup);
@@ -161,34 +184,64 @@ 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);
 
+       tv.tv_sec = 0;
+       tv.tv_usec = 1000;
+
        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') {
                do {
                        if (fgets(buf, sizeof buf, stdin) == NULL)
                                strcpy(buf, "000");
-                       if (strlen(buf) > 0)
+                       if (!IsEmptyStr(buf))
                                if (buf[strlen(buf) - 1] == '\n')
                                        buf[strlen(buf) - 1] = 0;
-                       if (strlen(buf) > 0)
+                       if (!IsEmptyStr(buf))
                                if (buf[strlen(buf) - 1] == '\r')
                                        buf[strlen(buf) - 1] = 0;
                        if (strcmp(buf, "000"))
-                               CtdlIPC_putline(ipc, buf);
+                               CtdlIPC_chat_send(ipc, buf);
+                       
+                       FD_ZERO(&read_fd);
+                       FD_SET(ipc->sock, &read_fd);
+                       ret = select(ipc->sock+1, &read_fd, NULL, NULL,  &tv);
+                       err = errno;
+                       if (err!=0)
+                               printf("select failed: %d", err);
+
+                       if (ret == -1) {
+                               if (!(errno == EINTR || errno == EAGAIN))
+                                       printf("select failed: %d", err);
+                               return 1;
+                       }
+
+                       if (ret != 0) {
+                               size_t n;
+                               char rbuf[SIZ];
+
+                               rbuf[0] = '\0';
+                               n = read(ipc->sock, rbuf, SIZ);
+                               if (n>0) {
+                                       rbuf[n]='\0';
+                                       printf (rbuf);
+                               }
+                       }
                } while (strcmp(buf, "000"));
-               CtdlIPC_putline(ipc, "000");
+               CtdlIPC_chat_send(ipc, "\n");
+               CtdlIPC_chat_send(ipc, "000");
        }
        fprintf(stderr, "sendcommand: processing ended.\n");
        cleanup(0);