* The size constant "256" which shows up everywhere as a buffer size has now

[citadel.git] / citadel / messages.c

diff --git a/citadel/messages.c b/citadel/messages.c
index fd9fda48906f510771e0d17b2e04906d9619eafb..a89e55aba5c1d05d78d933a125cc9611f79595e5 100644 (file)
--- a/citadel/messages.c
+++ b/citadel/messages.c
@@ -29,7 +29,7 @@
 #include "snprintf.h"
 #endif
 
-#define MAXWORDBUF 256
+#define MAXWORDBUF SIZ
 #define MAXMSGS 512
 
 struct cittext {
@@ -78,7 +78,7 @@ extern int editor_pid;
 
 void ka_sigcatch(int signum)
 {
-       char buf[256];
+       char buf[SIZ];
        alarm(S_KEEPALIVE);
        signal(SIGALRM, ka_sigcatch);
        serv_puts("NOOP");
@@ -335,10 +335,10 @@ int read_message(
        long num,   /* message number */
        char pagin) /* 0 = normal read, 1 = read with pagination, 2 = header */
 {
-       char buf[256];
-       char m_subject[256];
-       char from[256], node[256], rfca[256];
-       char now[256];
+       char buf[SIZ];
+       char m_subject[SIZ];
+       char from[SIZ], node[SIZ], rfca[SIZ];
+       char now[SIZ];
        int format_type = 0;
        int fr = 0;
        int nhdr = 0;
@@ -589,9 +589,10 @@ void replace_string(char *filename, long int startpos)
  * Function to begin composing a new message
  */
 int make_message(char *filename,       /* temporary file name */
-                char *recipient,       /* NULL if it's not mail */
-                int anon_type, /* see MES_ types in header file */
-                int format_type, int mode)
+               char *recipient,        /* NULL if it's not mail */
+               int anon_type,          /* see MES_ types in header file */
+               int format_type,
+               int mode)
 {
        FILE *fp;
        int a, b, e_ex_code;
@@ -610,17 +611,20 @@ int make_message(char *filename,  /* temporary file name */
 
        if (room_flags & QR_ANONONLY) {
                printf(" ****");
-       } else {
+       }
+       else {
                printf(" %s from %s", datestr, fullname);
-               if (strlen(recipient) > 0)
+               if (strlen(recipient) > 0) {
                        printf(" to %s", recipient);
+               }
        }
        printf("\n");
 
        beg = 0L;
 
-       if (mode == 1)
+       if (mode == 1) {
                printf("(Press ctrl-d when finished)\n");
+       }
        if (mode == 0) {
                fp = fopen(filename, "r");
                if (fp != NULL) {
@@ -629,6 +633,12 @@ int make_message(char *filename,   /* temporary file name */
                        fclose(fp);
                } else {
                        fp = fopen(filename, "w");
+                       if (fp == NULL) {
+                               printf("*** Error opening temp file!\n"
+                                       "    %s: %s\n",
+                                       filename, strerror(errno));
+                       return(1);
+                       }
                        fclose(fp);
                }
        }
@@ -637,12 +647,24 @@ ME1:      switch (mode) {
 
        case 0:
                fp = fopen(filename, "r+");
+               if (fp == NULL) {
+                       printf("*** Error opening temp file!\n"
+                               "    %s: %s\n",
+                               filename, strerror(errno));
+                       return(1);
+               }
                citedit(fp);
                fclose(fp);
                goto MECR;
 
        case 1:
                fp = fopen(filename, "w");
+               if (fp == NULL) {
+                       printf("*** Error opening temp file!\n"
+                               "    %s: %s\n",
+                               filename, strerror(errno));
+                       return(1);
+               }
                do {
                        a = inkey();
                        if (a == 255)
@@ -740,7 +762,7 @@ MEABT2:     unlink(filename);
  */
 void transmit_message(FILE *fp)
 {
-       char buf[256];
+       char buf[SIZ];
        int ch, a;
        long msglen;
        time_t lasttick;
@@ -798,7 +820,7 @@ int entmsg(int is_reply,    /* nonzero if this was a <R>eply command */
                int c)          /* */
 {
        char buf[300];
-       char cmd[256];
+       char cmd[SIZ];
        int a, b;
        int need_recp = 0;
        int mode;
@@ -887,7 +909,20 @@ int entmsg(int is_reply,   /* nonzero if this was a <R>eply command */
                return (2);
        }
 
-       /* ...and transmit it to the server. */
+       /* Reopen the temp file that was created, so we can send it */
+       fp = fopen(temp, "r");
+
+       /* Yes, unlink it now, so it doesn't stick around if we crash */
+       unlink(temp);
+
+       if (fp == NULL) {
+               printf("*** Internal error while trying to save message!\n"
+                       "    %s: %s\n",
+                       temp, strerror(errno));
+               return(errno);
+       }
+
+       /* Transmit message to the server */
        sprintf(cmd, "ENT0 1|%s|%d|%d||", buf, b, mode);
        serv_puts(cmd);
        serv_gets(cmd);
@@ -895,13 +930,11 @@ int entmsg(int is_reply,  /* nonzero if this was a <R>eply command */
                printf("%s\n", &cmd[4]);
                return (1);
        }
-       fp = fopen(temp, "r");
-       if (fp != NULL) {
-               transmit_message(fp);
-               fclose(fp);
-       }
+
+       transmit_message(fp);
        serv_puts("000");
-       unlink(temp);
+
+       fclose(fp);
 
        highmsg = msg_arr[num_msgs - 1];
        num_msgs = 0;
@@ -920,14 +953,18 @@ int entmsg(int is_reply,  /* nonzero if this was a <R>eply command */
 
        /* now see if anyone else has posted in here */
        b = (-1);
-       for (a = 0; a < num_msgs; ++a)
-               if (msg_arr[a] > highmsg)
+       for (a = 0; a < num_msgs; ++a) {
+               if (msg_arr[a] > highmsg) {
                        ++b;
+               }
+       }
 
-       /* in the Mail> room, this algorithm always counts one message
-        * higher than in public rooms, so we decrement it by one */
-       if (need_recp)
+       /* In the Mail> room, this algorithm always counts one message
+        * higher than in public rooms, so we decrement it by one.
+        */
+       if (need_recp) {
                --b;
+       }
 
        if (b == 1) {
                printf("*** 1 additional message has been entered "
@@ -990,7 +1027,7 @@ void process_quote(void)
 void list_urls()
 {
        int i;
-       char cmd[256];
+       char cmd[SIZ];
 
        if (num_urls == 0) {
                printf("There were no URL's in the previous message.\n\n");
@@ -1025,9 +1062,9 @@ void readmsgs(
        int hold_color = 0;
        char prtfile[PATH_MAX];
        char pagin;
-       char cmd[256];
+       char cmd[SIZ];
        char targ[ROOMNAMELEN];
-       char filename[256];
+       char filename[SIZ];
 
        if (c < 0)
                b = (MAXMSGS - 1);
@@ -1371,7 +1408,7 @@ void edit_system_message(char *which_message)
  */
 void check_message_base(void)
 {
-       char buf[256];
+       char buf[SIZ];
 
        printf
            ("Please read the documentation before running this command.\n"