- pass -Wcast-qual to gcc

[citadel.git] / citadel / sendcommand.c

diff --git a/citadel/sendcommand.c b/citadel/sendcommand.c
index b2c70005fe1bdbf4392f7f22b2345ccde90d3993..01b4d5730ca459694722f7bae7ae8c7206784c6a 100644 (file)
--- a/citadel/sendcommand.c
+++ b/citadel/sendcommand.c
@@ -14,21 +14,30 @@
 #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>
 #include "citadel.h"
 #include "tools.h"
 #include "ipc.h"
+#include "server.h"
+#include "dynloader.h"
 #include "config.h"
 
 #define LOCKFILE "/tmp/LCK.sendcommand"
 
-struct config config;
-extern int home_specified;
-
-
 /*
  * make sure only one copy of sendcommand runs at a time, using lock files
  */
@@ -93,8 +102,8 @@ void logoff(int e)
  */
 void np_attach_to_server(void)
 {
-       char hostbuf[256], portbuf[256];
-       char buf[256];
+       char hostbuf[SIZ], portbuf[SIZ];
+       char buf[SIZ];
        char *args[] =
        {"sendcommand", NULL};
 
@@ -102,7 +111,7 @@ void np_attach_to_server(void)
        attach_to_server(1, args, hostbuf, portbuf);
        serv_gets(buf);
        fprintf(stderr, "%s\n", &buf[4]);
-       sprintf(buf, "IPGM %d", config.c_ipgm_secret);
+       snprintf(buf, sizeof buf, "IPGM %d", config.c_ipgm_secret);
        serv_puts(buf);
        serv_gets(buf);
        fprintf(stderr, "%s\n", &buf[4]);
@@ -119,8 +128,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);
 
@@ -148,6 +157,7 @@ int main(int argc, char **argv)
        signal(SIGTERM, cleanup);
 
        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);
@@ -163,7 +173,7 @@ int main(int argc, char **argv)
                }
        } else if (buf[0] == '4') {
                do {
-                       if (fgets(buf, 255, stdin) == NULL)
+                       if (fgets(buf, sizeof buf, stdin) == NULL)
                                strcpy(buf, "000");
                        if (strlen(buf) > 0)
                                if (buf[strlen(buf) - 1] == '\n')