Removed the global variable 'home_specified'

[citadel.git] / citadel / sendcommand.c

diff --git a/citadel/sendcommand.c b/citadel/sendcommand.c
index 225b23a4c7a99ec989db0adf44e1428ba4dfbe95..45ff15c5daa99c089879bbe54f4aa31dae4da871 100644 (file)
--- a/citadel/sendcommand.c
+++ b/citadel/sendcommand.c
@@ -73,6 +73,8 @@ void remove_lockfile(void)
  */
 void nq_cleanup(int e)
 {
+       if (e == SIGALRM)
+               fprintf(stderr, "\nWatch dog time out.\n");
        remove_lockfile();
        exit(e);
 }
@@ -161,6 +163,7 @@ void sendcommand_die(void) {
 }
 
 
+
 /*
  * main
  */
@@ -169,6 +172,7 @@ int main(int argc, char **argv)
        int a;
        char cmd[SIZ];
        char buf[SIZ];
+       int watchdog = 5;
 
        int relh=0;
        int home=0;
@@ -178,9 +182,7 @@ int main(int argc, char **argv)
        struct timeval tv;
        int ret, err;
        int server_shutting_down = 0;
-
-       CtdlInitBase64Table();
-
+       
        strcpy(ctdl_home_directory, DEFAULT_PORT);
 
        strcpy(cmd, "");
@@ -195,8 +197,11 @@ 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 (!IsEmptyStr(cmd))
                                strcat(cmd, " ");
@@ -218,7 +223,7 @@ int main(int argc, char **argv)
                        ctdl_home_directory);
        fflush(stderr);
 
-       alarm(5);
+       alarm(watchdog);
        signal(SIGALRM, nq_cleanup); /* Set up a watchdog type timer in case we hang */
        
        np_attach_to_server(UDS, ctdl_home_directory);
@@ -240,7 +245,7 @@ int main(int argc, char **argv)
        if (buf[0] == '1') {
                while (CtdlIPC_chat_recv(ipc, buf), strcmp(buf, "000")) {
                        printf("%s\n", buf);
-                       alarm(5); /* Kick the watchdog timer */
+                       alarm(watchdog); /* Kick the watchdog timer */
                }
        } else if (buf[0] == '4') {
                do {
@@ -280,7 +285,7 @@ int main(int argc, char **argv)
                                        fflush (stdout);
                                }
                        }
-                       alarm(5); /* Kick the watchdog timer */
+                       alarm(watchdog); /* Kick the watchdog timer */
                } while (strcmp(buf, "000"));
                CtdlIPC_chat_send(ipc, "\n");
                CtdlIPC_chat_send(ipc, "000");