fix all the <time.h> vs. <sys/time.h> issues, hopefully

[citadel.git] / citadel / sendcommand.c

diff --git a/citadel/sendcommand.c b/citadel/sendcommand.c
index 2de7706d5d509fe09587f976c702bac1ad297736..8c7f63e5307970636a03d19cb7872891e4c9764c 100644 (file)
--- a/citadel/sendcommand.c
+++ b/citadel/sendcommand.c
@@ -1,5 +1,8 @@
 /*
  * $Id$
+ *
+ * Command-line utility to transmit a server command.
+ *
  */
 
 
@@ -11,7 +14,18 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <signal.h>
 #include <errno.h>
 #include <limits.h>
@@ -20,7 +34,7 @@
 #include "ipc.h"
 #include "config.h"
 
-#define LOCKFILE "/var/lock/LCK.sendcommand"
+#define LOCKFILE "/tmp/LCK.sendcommand"
 
 struct config config;
 extern int home_specified;
@@ -29,25 +43,27 @@ extern int home_specified;
 /*
  * make sure only one copy of sendcommand runs at a time, using lock files
  */
-int set_lockfile(void) {
+int set_lockfile(void)
+{
        FILE *lfp;
        int onppid;
 
-       if ((lfp = fopen(LOCKFILE,"r")) != NULL) {
-                fscanf(lfp,"%d",&onppid);
-                fclose(lfp);
-               if (!kill(onppid, 0) || errno == EPERM) return 1;
-               }
-
-       lfp=fopen(LOCKFILE,"w");
-       fprintf(lfp,"%ld\n",(long)getpid());
-       fclose(lfp);
-       return(0);
+       if ((lfp = fopen(LOCKFILE, "r")) != NULL) {
+               fscanf(lfp, "%d", &onppid);
+               fclose(lfp);
+               if (!kill(onppid, 0) || errno == EPERM)
+                       return 1;
        }
+       lfp = fopen(LOCKFILE, "w");
+       fprintf(lfp, "%ld\n", (long) getpid());
+       fclose(lfp);
+       return (0);
+}
 
-void remove_lockfile(void) {
+void remove_lockfile(void)
+{
        unlink(LOCKFILE);
-       }
+}
 
 /*
  * Why both cleanup() and nq_cleanup() ?  Notice the alarm() call in
@@ -60,17 +76,18 @@ void nq_cleanup(int e)
 {
        remove_lockfile();
        exit(e);
-       }
+}
 
 void cleanup(int e)
 {
        static int nested = 0;
 
        alarm(30);
-       signal(SIGALRM,nq_cleanup);
-       if (nested++ < 1) serv_puts("QUIT");
+       signal(SIGALRM, nq_cleanup);
+       if (nested++ < 1)
+               serv_puts("QUIT");
        nq_cleanup(e);
-       }
+}
 
 /*
  * This is implemented as a function rather than as a macro because the
@@ -80,31 +97,30 @@ void cleanup(int e)
 void logoff(int e)
 {
        cleanup(e);
-       }
+}
 
 /*
  * Connect sendcommand to the Citadel server running on this computer.
  */
-void np_attach_to_server(void) {
-       char hostbuf[256], portbuf[256];
-       char buf[256];
-       char portname[8];
-       char *args[] = { "sendcommand", NULL, NULL, NULL } ;
+void np_attach_to_server(void)
+{
+       char hostbuf[SIZ], portbuf[SIZ];
+       char buf[SIZ];
+       char *args[] =
+       {"sendcommand", NULL};
 
        fprintf(stderr, "Attaching to server...\n");
-       sprintf(portname, "%d", config.c_port_number);
-       args[2] = portname;
-       attach_to_server(3, args, hostbuf, portbuf);
+       attach_to_server(1, args, hostbuf, portbuf);
        serv_gets(buf);
-       fprintf(stderr, "%s\n",&buf[4]);
-       sprintf(buf,"IPGM %d", config.c_ipgm_secret);
+       fprintf(stderr, "%s\n", &buf[4]);
+       sprintf(buf, "IPGM %d", config.c_ipgm_secret);
        serv_puts(buf);
        serv_gets(buf);
-       fprintf(stderr, "%s\n",&buf[4]);
-       if (buf[0]!='2') {
+       fprintf(stderr, "%s\n", &buf[4]);
+       if (buf[0] != '2') {
                cleanup(2);
-               }
        }
+}
 
 
 
@@ -114,8 +130,8 @@ void np_attach_to_server(void) {
 int main(int argc, char **argv)
 {
        int a;
-       char cmd[256];
-       char buf[256];
+       char cmd[SIZ];
+       char buf[SIZ];
 
        strcpy(bbs_home_directory, BBSDIR);
 
@@ -123,26 +139,27 @@ int main(int argc, char **argv)
        /*
         * Change directories if specified
         */
-       for (a=1; a<argc; ++a) {
+       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]);
                        home_specified = 1;
-                       }
-               else {
-                       if (strlen(cmd)>0) strcat(cmd, " ");
+               } else {
+                       if (strlen(cmd) > 0)
+                               strcat(cmd, " ");
                        strcat(cmd, argv[a]);
-                       }
                }
+       }
 
        get_config();
 
-       signal(SIGINT,cleanup);
-       signal(SIGQUIT,cleanup);
-       signal(SIGHUP,cleanup);
-       signal(SIGTERM,cleanup);
+       signal(SIGINT, cleanup);
+       signal(SIGQUIT, cleanup);
+       signal(SIGHUP, cleanup);
+       signal(SIGTERM, cleanup);
 
-       fprintf(stderr, "sendcommand: started.  pid=%ld\n",(long)getpid());
+       fprintf(stderr, "sendcommand: started.  pid=%ld\n", (long) getpid());
+       fprintf(stderr, "Running from %s\n", bbs_home_directory);
        fflush(stderr);
        np_attach_to_server();
        fflush(stderr);
@@ -152,19 +169,26 @@ int main(int argc, char **argv)
        serv_gets(buf);
        fprintf(stderr, "%s\n", buf);
 
-       if (buf[0]=='1') {
+       if (buf[0] == '1') {
                while (serv_gets(buf), strcmp(buf, "000")) {
                        printf("%s\n", buf);
-                       }
                }
-       else if (buf[0]=='4') {
+       } else if (buf[0] == '4') {
                do {
-                       if (fgets(buf, 255, stdin)==NULL) strcpy(buf, "000");
-                       if (strcmp(buf, "000")) serv_puts(buf);
-                       } while (strcmp(buf, "000"));
-               }
-
+                       if (fgets(buf, sizeof buf, stdin) == NULL)
+                               strcpy(buf, "000");
+                       if (strlen(buf) > 0)
+                               if (buf[strlen(buf) - 1] == '\n')
+                                       buf[strlen(buf) - 1] = 0;
+                       if (strlen(buf) > 0)
+                               if (buf[strlen(buf) - 1] == '\r')
+                                       buf[strlen(buf) - 1] = 0;
+                       if (strcmp(buf, "000"))
+                               serv_puts(buf);
+               } while (strcmp(buf, "000"));
+               serv_puts("000");
+       }
        fprintf(stderr, "sendcommand: processing ended.\n");
        cleanup(0);
        return 0;
-       }
+}