Removed the global variable 'home_specified'

[citadel.git] / citadel / sendcommand.c

diff --git a/citadel/sendcommand.c b/citadel/sendcommand.c
index 5e80465a9abe31db3334809884221b5d922e1137..45ff15c5daa99c089879bbe54f4aa31dae4da871 100644 (file)
--- a/citadel/sendcommand.c
+++ b/citadel/sendcommand.c
@@ -29,11 +29,10 @@
 #include <signal.h>
 #include <errno.h>
 #include <limits.h>
+#include <libcitadel.h>
 #include "citadel.h"
-#include "tools.h"
 #include "citadel_ipc.h"
 #include "server.h"
-#include "serv_extensions.h"
 #include "config.h"
 
 #define LOCKFILE "/tmp/LCK.sendcommand"
@@ -74,16 +73,46 @@ void remove_lockfile(void)
  */
 void nq_cleanup(int e)
 {
+       if (e == SIGALRM)
+               fprintf(stderr, "\nWatch dog time out.\n");
        remove_lockfile();
        exit(e);
 }
 
+/*
+ * send binary to server
+ */
+void serv_write(CtdlIPC *ipc, const char *buf, unsigned int nbytes)
+{
+       unsigned int bytes_written = 0;
+       int retval;
+/*
+#if defined(HAVE_OPENSSL)
+       if (ipc->ssl) {
+               serv_write_ssl(ipc, buf, nbytes);
+               return;
+       }
+#endif
+*/
+       while (bytes_written < nbytes) {
+               retval = write(ipc->sock, &buf[bytes_written],
+                              nbytes - bytes_written);
+               if (retval < 1) {
+                       connection_died(ipc, 0);
+                       return;
+               }
+               bytes_written += retval;
+       }
+}
+
+
 void cleanup(int e)
 {
        static int nested = 0;
 
        alarm(30);
        signal(SIGALRM, nq_cleanup);
+       serv_write(ipc, "\n", 1);
        if (nested++ < 1)
                CtdlIPCQuit(ipc);
        nq_cleanup(e);
@@ -134,6 +163,7 @@ void sendcommand_die(void) {
 }
 
 
+
 /*
  * main
  */
@@ -142,12 +172,17 @@ int main(int argc, char **argv)
        int a;
        char cmd[SIZ];
        char buf[SIZ];
+       int watchdog = 5;
 
        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;
+       int server_shutting_down = 0;
+       
        strcpy(ctdl_home_directory, DEFAULT_PORT);
 
        strcpy(cmd, "");
@@ -162,16 +197,19 @@ int main(int argc, char **argv)
                        else
                                safestrncpy(relhome, &argv[a][2],
                                                        sizeof relhome);
-                       home_specified = 1;
                        home=1;
+               } else if (!strncmp(argv[a], "-w", 2)) {
+                       watchdog = atoi(&argv[a][2]);
+                       if (watchdog<1)
+                               watchdog=1;
                } else {
-                       if (strlen(cmd) > 0)
+                       if (!IsEmptyStr(cmd))
                                strcat(cmd, " ");
                        strcat(cmd, argv[a]);
                }
        }
 
-       calc_dirs_n_files(relh, home, relhome, ctdldir);
+       calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
        get_config();
 
        signal(SIGINT, cleanup);
@@ -184,6 +222,10 @@ int main(int argc, char **argv)
                        (int) getpid(),
                        ctdl_home_directory);
        fflush(stderr);
+
+       alarm(watchdog);
+       signal(SIGALRM, nq_cleanup); /* Set up a watchdog type timer in case we hang */
+       
        np_attach_to_server(UDS, ctdl_home_directory);
        fflush(stderr);
        setIPCDeathHook(sendcommand_die);
@@ -193,26 +235,73 @@ int main(int argc, char **argv)
        CtdlIPC_chat_recv(ipc, buf);
        fprintf(stderr, "%s\n", buf);
 
+       tv.tv_sec = 0;
+       tv.tv_usec = 1000;
+
+       if (!strncasecmp(&buf[1], "31", 2)) {
+               server_shutting_down = 1;
+       }
+
        if (buf[0] == '1') {
                while (CtdlIPC_chat_recv(ipc, buf), strcmp(buf, "000")) {
                        printf("%s\n", buf);
+                       alarm(watchdog); /* Kick the watchdog timer */
                }
        } 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_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';
+                                       fprintf (stderr, rbuf);
+                                       fflush (stdout);
+                               }
+                       }
+                       alarm(watchdog); /* Kick the watchdog timer */
                } while (strcmp(buf, "000"));
+               CtdlIPC_chat_send(ipc, "\n");
                CtdlIPC_chat_send(ipc, "000");
        }
+       alarm(0);       /* Shutdown the watchdog timer */
        fprintf(stderr, "sendcommand: processing ended.\n");
-       cleanup(0);
+
+       /* Clean up and log off ... unless the server indicated that the command
+        * we sent is shutting it down, in which case we want to just cut the
+        * connection and exit.
+        */
+       if (server_shutting_down) {
+               nq_cleanup(0);
+       }
+       else {
+               cleanup(0);
+       }
        return 0;
 }