Cosmetic changes.

diff --git a/uip/send.c b/uip/send.c
index da401e6..a79e34f 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -49,11 +49,6 @@ static FILE *body_file;  /* body file pointer */
 static FILE *composition_file;  /* composition file pointer */
 
 /*
 static FILE *composition_file;  /* composition file pointer */
 
 /*

-** external prototypes
-*/
-char *getusername(void);
-
-/*

 ** static prototypes
 */
 static int sendsbr(char **, int, char *, struct stat *, int);
 ** static prototypes
 */
 static int sendsbr(char **, int, char *, struct stat *, int);

@@ -63,7 +58,6 @@ static int tmp_fd(void);
 static void anno(int, struct stat *);
 static void annoaux(int);
 static int sendaux(char **, int, char *, struct stat *);
 static void anno(int, struct stat *);
 static void annoaux(int);
 static int sendaux(char **, int, char *, struct stat *);

-

 static int attach(char *);
 static void clean_up_temporary_files(void);
 static int get_line(void);
 static int attach(char *);
 static void clean_up_temporary_files(void);
 static int get_line(void);

@@ -112,12 +106,15 @@ main(int argc, char **argv)
 {
        int msgp = 0, nfiles = 0, distsw = 0, vecp = 1;
        int msgnum, status;
 {
        int msgp = 0, nfiles = 0, distsw = 0, vecp = 1;
        int msgnum, status;

+       int in, out;

        char *cp, *maildir = NULL;
        char buf[BUFSIZ], **ap, **argp, **arguments;
        char *msgs[MAXARGS], *vec[MAXARGS];
        char *files[MAXARGS];
        struct msgs *mp;
        struct stat st;
        char *cp, *maildir = NULL;
        char buf[BUFSIZ], **ap, **argp, **arguments;
        char *msgs[MAXARGS], *vec[MAXARGS];
        char *files[MAXARGS];
        struct msgs *mp;
        struct stat st;

+       struct stat st2;
+

 
 #ifdef LOCALE
        setlocale(LC_ALL, "");
 
 #ifdef LOCALE
        setlocale(LC_ALL, "");

@@ -188,9 +185,10 @@ main(int argc, char **argv)
                        case ALIASW:
                        case FILTSW:
                                vec[vecp++] = --cp;
                        case ALIASW:
                        case FILTSW:
                                vec[vecp++] = --cp;

-                               if (!(cp = *argp++) || *cp == '-')
+                               if (!(cp = *argp++) || *cp == '-') {

                                        adios(NULL, "missing argument to %s",
                                                        argp[-2]);
                                        adios(NULL, "missing argument to %s",
                                                        argp[-2]);

+                               }

                                vec[vecp++] = cp;
                                continue;
 
                                vec[vecp++] = cp;
                                continue;
 

@@ -204,41 +202,38 @@ main(int argc, char **argv)
                }
        }
 
                }
        }
 

-       /*
-       ** check for "Aliasfile:" profile entry
-       */
+       /* check for "Aliasfile:" profile entry */

        if ((cp = context_find("Aliasfile"))) {
                char *dp = NULL;
 
        if ((cp = context_find("Aliasfile"))) {
                char *dp = NULL;
 

-               for (ap = brkstring(dp = getcpy(cp), " ", "\n"); ap && *ap;
-                               ap++) {
+               for (ap=brkstring(dp=getcpy(cp), " ", "\n"); ap && *ap; ap++) {

                        vec[vecp++] = "-alias";
                        vec[vecp++] = getcpy(etcpath(*ap));
                }
        }
 
                        vec[vecp++] = "-alias";
                        vec[vecp++] = getcpy(etcpath(*ap));
                }
        }
 

-       if (!msgp && !nfiles)
+       if (!msgp && !nfiles) {

                msgs[msgp++] = seq_cur;
                msgs[msgp++] = seq_cur;

+       }

        maildir = toabsdir(draftfolder);
 
        maildir = toabsdir(draftfolder);
 

-       if (chdir(maildir) == NOTOK)
+       if (chdir(maildir) == NOTOK) {

                adios(maildir, "unable to change directory to");
                adios(maildir, "unable to change directory to");

+       }

 
 

-       /* read folder and create message structure */
-       if (!(mp = folder_read(draftfolder)))
+       if (!(mp = folder_read(draftfolder))) {

                adios(NULL, "unable to read draft folder %s", draftfolder);
                adios(NULL, "unable to read draft folder %s", draftfolder);

-
-       /* check for empty folder */
-       if (mp->nummsg == 0)
+       }
+       if (mp->nummsg == 0) {

                adios(NULL, "no messages in draft folder %s", draftfolder);
                adios(NULL, "no messages in draft folder %s", draftfolder);

-
+       }

        /* parse all the message ranges/sequences and set SELECTED */
        for (msgnum = 0; msgnum < msgp; msgnum++) {
                if (!m_convert(mp, msgs[msgnum])) {
                        done(1);
                }
        }
        /* parse all the message ranges/sequences and set SELECTED */
        for (msgnum = 0; msgnum < msgp; msgnum++) {
                if (!m_convert(mp, msgs[msgnum])) {
                        done(1);
                }
        }

-       seq_setprev(mp);  /* set the previous-sequence */
+       seq_setprev(mp);

 
        for (msgp = 0, msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
                if (is_selected(mp, msgnum)) {
 
        for (msgp = 0, msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
                if (is_selected(mp, msgnum)) {

@@ -250,59 +245,63 @@ main(int argc, char **argv)
        mp->msgflags |= SEQMOD;
        seq_save(mp);
 
        mp->msgflags |= SEQMOD;
        seq_save(mp);
 

-       if (!(cp = getenv("SIGNATURE")) || !*cp)
-               if ((cp = context_find("signature")) && *cp)
+       if (!(cp = getenv("SIGNATURE")) || !*cp) {
+               if ((cp = context_find("signature")) && *cp) {

                        m_putenv("SIGNATURE", cp);
                        m_putenv("SIGNATURE", cp);

+               }
+       }

 
 

-       for (msgnum = 0; msgnum < nfiles; msgnum++)
-               if (stat(files[msgnum], &st) == NOTOK)
+       for (msgnum = 0; msgnum < nfiles; msgnum++) {
+               if (stat(files[msgnum], &st) == NOTOK) {

                        adios(files[msgnum], "unable to stat draft file");
                        adios(files[msgnum], "unable to stat draft file");

+               }
+       }

 
 

-       if ((annotext = getenv("mhannotate")) == NULL || *annotext == 0)
+       if (!(annotext = getenv("mhannotate")) || !*annotext) {

                annotext = NULL;
                annotext = NULL;

-       if (annotext && ((cp = getenv("mhinplace")) != NULL && *cp != 0))
+       }
+       if (annotext && ((cp = getenv("mhinplace")) && *cp)) {

                inplace = atoi(cp);
                inplace = atoi(cp);

-       if ((altmsg = getenv("mhaltmsg")) == NULL || *altmsg == 0)
+       }
+       if (!(altmsg = getenv("mhaltmsg")) || !*altmsg) {

                altmsg = NULL;  /* used by dist interface - see below */
                altmsg = NULL;  /* used by dist interface - see below */

+       }

 
 

-       if ((cp = getenv("mhdist")) && *cp && (distsw = atoi (cp)) && altmsg) {
+       if ((cp = getenv("mhdist")) && *cp && (distsw = atoi(cp)) && altmsg) {

                vec[vecp++] = "-dist";
                distfile = getcpy(m_mktemp2(altmsg, invo_name, NULL, NULL));
                if (link(altmsg, distfile) == NOTOK) {
                vec[vecp++] = "-dist";
                distfile = getcpy(m_mktemp2(altmsg, invo_name, NULL, NULL));
                if (link(altmsg, distfile) == NOTOK) {

-                       if (errno != EXDEV)
+                       if (errno != EXDEV) {

                                adios(distfile, "unable to link %s to",
                                                altmsg);
                                adios(distfile, "unable to link %s to",
                                                altmsg);

+                       }

                        free(distfile);
                        distfile = getcpy(m_mktemp2(NULL, invo_name,
                                        NULL, NULL));
                        free(distfile);
                        distfile = getcpy(m_mktemp2(NULL, invo_name,
                                        NULL, NULL));

-                       {
-                               int in, out;
-                               struct stat st;
-
-                               if ((in = open(altmsg, O_RDONLY)) == NOTOK)
-                                       adios(altmsg, "unable to open");
-                               fstat(in, &st);
-                               if ((out = creat(distfile,
-                                               (int) st.st_mode & 0777))
-                                               == NOTOK)
-                                       adios(distfile, "unable to write");
-                               cpydata(in, out, altmsg, distfile);
-                               close(in);
-                               close(out);
+                       if ((in = open(altmsg, O_RDONLY)) == NOTOK) {
+                               adios(altmsg, "unable to open");

                        }
                        }

+                       fstat(in, &st2);
+                       if ((out = creat(distfile, (int)st2.st_mode & 0777)) ==
+                                       NOTOK) {
+                               adios(distfile, "unable to write");
+                       }
+                       cpydata(in, out, altmsg, distfile);
+                       close(in);
+                       close(out);

                }
        } else {
                distfile = NULL;
        }
 
                }
        } else {
                distfile = NULL;
        }
 

-       if (altmsg == NULL || stat(altmsg, &st) == NOTOK) {
+       if (!altmsg || stat(altmsg, &st) == NOTOK) {

                st.st_mtime = 0;
                st.st_dev = 0;
                st.st_ino = 0;
        }
                st.st_mtime = 0;
                st.st_dev = 0;
                st.st_ino = 0;
        }

-       if (pushsw)
+       if (pushsw) {

                push();
                push();

-
+       }

        status = 0;
        vec[0] = mhbasename(postproc);
        closefds(3);
        status = 0;
        vec[0] = mhbasename(postproc);
        closefds(3);

@@ -318,21 +317,21 @@ main(int argc, char **argv)
                }
        }
 
                }
        }
 

-       context_save();  /* save the context file */
+       context_save();

        done(status);
        return 1;
 }
 
 
 /*
        done(status);
        return 1;
 }
 
 
 /*

-** send message back-end
+** message sending back-end

 */
 static int
 sendsbr(char **vec, int vecp, char *drft, struct stat *st, int rename_drft)
 {
        int status;
        char buffer[BUFSIZ];
 */
 static int
 sendsbr(char **vec, int vecp, char *drft, struct stat *st, int rename_drft)
 {
        int status;
        char buffer[BUFSIZ];

-       char *original_draft;  /* name of original draft file */
+       char *original_draft;

        char *p;  /* string pointer for building file name */
 
        /*
        char *p;  /* string pointer for building file name */
 
        /*

@@ -341,7 +340,6 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st, int rename_drft)
        ** MIME message if there are attachments.  We need the original
        ** name so that it can be renamed after the message is sent.
        */
        ** MIME message if there are attachments.  We need the original
        ** name so that it can be renamed after the message is sent.
        */

-

        original_draft = drft;
 
        /*
        original_draft = drft;
 
        /*

@@ -372,8 +370,9 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st, int rename_drft)
                if (rename_drft && status == OK &&
                                rename(original_draft, strncpy(buffer,
                                m_backup(original_draft), sizeof(buffer)))
                if (rename_drft && status == OK &&
                                rename(original_draft, strncpy(buffer,
                                m_backup(original_draft), sizeof(buffer)))

-                               == NOTOK)
+                               == NOTOK) {

                        advise(buffer, "unable to rename %s to", drft);
                        advise(buffer, "unable to rename %s to", drft);

+               }

                break;
 
        default:
                break;
 
        default:

@@ -382,8 +381,9 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st, int rename_drft)
        }
 
        done=exit;
        }
 
        done=exit;

-       if (distfile)
+       if (distfile) {

                unlink(distfile);
                unlink(distfile);

+       }

 
        /*
        ** Get rid of any temporary files that we created for attachments.
 
        /*
        ** Get rid of any temporary files that we created for attachments.

@@ -391,20 +391,18 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st, int rename_drft)
        ** leaves as a turd.  It looks confusing, but we use the body
        ** file name to help build the renamed composition file name.
        */
        ** leaves as a turd.  It looks confusing, but we use the body
        ** file name to help build the renamed composition file name.
        */

-

        if (drft == composition_file_name) {
                clean_up_temporary_files();
 
                if (strlen(composition_file_name) >=
        if (drft == composition_file_name) {
                clean_up_temporary_files();
 
                if (strlen(composition_file_name) >=

-                               sizeof (composition_file_name) - 6)
+                               sizeof (composition_file_name) - 6) {

                        advise(NULL, "unable to remove original composition file.");
                        advise(NULL, "unable to remove original composition file.");

-
-               else {
-                       if ((p = strrchr(composition_file_name, '/')) == NULL)
+               } else {
+                       if (!(p = strrchr(composition_file_name, '/'))) {

                                p = composition_file_name;
                                p = composition_file_name;

-                       else
+                       } else {

                                p++;
                                p++;

-
+                       }

                        strcpy(body_file_name, p);
                        *p++ = ',';
                        strcpy(p, body_file_name);
                        strcpy(body_file_name, p);
                        *p++ = ',';
                        strcpy(p, body_file_name);

@@ -420,38 +418,28 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st, int rename_drft)
 static int
 attach(char *draft_file_name)
 {
 static int
 attach(char *draft_file_name)
 {

-       char buf[MAXPATHLEN + 6];  /* miscellaneous buffer */
-       int c;  /* current character for body copy */
-       int has_attachment;  /* draft has at least one attachment */
-       int has_body;  /* draft has a message body */
+       char buf[MAXPATHLEN + 6];
+       int c;
+       int has_attachment;
+       int has_body;

        int non_ascii; /* msg body contains non-ASCII chars */
        int length;  /* length of attachment header field name */
        int non_ascii; /* msg body contains non-ASCII chars */
        int length;  /* length of attachment header field name */

-       char *p;  /* miscellaneous string pointer */
+       char *p;

 
 

-       /* Open up the draft file. */
-       if ((draft_file = fopen(draft_file_name, "r")) == (FILE *)0)
-               adios(NULL, "can't open draft file `%s'.",
-                               draft_file_name);
+       if (!(draft_file = fopen(draft_file_name, "r"))) {
+               adios(NULL, "can't open draft file `%s'.", draft_file_name);
+       }

 
 

-       /*
-       **  Allocate a buffer to hold the header components as they're read in.
-       **  This buffer might need to be quite large, so we grow it as needed.
-       */
+       /* We'll grow the buffer as needed. */

        field = (char *)mh_xmalloc(field_size = 256);
 
        /*
        ** Scan the draft file for an attachment header field name.
        field = (char *)mh_xmalloc(field_size = 256);
 
        /*
        ** Scan the draft file for an attachment header field name.

-       ** The existence of one indicates that the
-       ** draft has attachments.  Bail out if there are no attachments
-       ** because we're done.  Read to the end of the headers even if
-       ** we have no attachments.

        */
        length = strlen(attach_hdr);
        */
        length = strlen(attach_hdr);

-

        has_attachment = 0;
        has_attachment = 0;

-

        while (get_line() != EOF && *field != '\0' && *field != '-') {
        while (get_line() != EOF && *field != '\0' && *field != '-') {

-               if (strncasecmp(field, attach_hdr, length) == 0 &&
+               if (strncasecmp(field, attach_hdr, length)==0 &&

                                field[length] == ':') {
                        has_attachment = 1;
                }
                                field[length] == ':') {
                        has_attachment = 1;
                }

@@ -465,7 +453,6 @@ attach(char *draft_file_name)
        */
        has_body = 0;
        non_ascii = 0;
        */
        has_body = 0;
        non_ascii = 0;

-

        while (get_line() != EOF) {
                for (p = field; *p != '\0'; p++) {
                        if (*p != ' ' && *p != '\t') {
        while (get_line() != EOF) {
                for (p = field; *p != '\0'; p++) {
                        if (*p != ' ' && *p != '\t') {

@@ -475,15 +462,13 @@ attach(char *draft_file_name)
                                non_ascii = 1;
                        }
                }
                                non_ascii = 1;
                        }
                }

-               if (has_body && non_ascii)
-                       break;
+               if (has_body && non_ascii) {
+                       break;  /* that's been already enough information +/
+               }

        }
 
        }
 

-       /*
-       ** Bail out if there are no attachments and only ASCII text.
-       ** This means we don't need to convert it to MIME.
-       */

        if (!has_attachment && non_ascii==0) {
        if (!has_attachment && non_ascii==0) {

+               /* We don't need to convert it to MIME. */

                return DONE;
        }
 
                return DONE;
        }
 

@@ -499,9 +484,9 @@ attach(char *draft_file_name)
                        m_mktemp(toabsdir(invo_name), NULL, NULL),
                        sizeof (composition_file_name));
 
                        m_mktemp(toabsdir(invo_name), NULL, NULL),
                        sizeof (composition_file_name));
 

-       if (has_body)
+       if (has_body) {

                body_file = fopen(body_file_name, "w");
                body_file = fopen(body_file_name, "w");

-
+       }

        composition_file = fopen(composition_file_name, "w");
 
        if ((has_body && !body_file) || !composition_file) {
        composition_file = fopen(composition_file_name, "w");
 
        if ((has_body && !body_file) || !composition_file) {

@@ -509,11 +494,7 @@ attach(char *draft_file_name)
                adios(NULL, "unable to open all of the temporary files.");
        }
 
                adios(NULL, "unable to open all of the temporary files.");
        }
 

-       /*
-       ** Start at the beginning of the draft file.  Copy all
-       ** non-attachment header fields to the temporary composition file.
-       ** Then add the dashed line separator.
-       */
+       /* Copy non-attachment header fields to the temp composition file. */

        rewind(draft_file);
        while (get_line() != EOF && *field && *field != '-') {
                if (strncasecmp(field, attach_hdr, length) != 0 ||
        rewind(draft_file);
        while (get_line() != EOF && *field && *field != '-') {
                if (strncasecmp(field, attach_hdr, length) != 0 ||

@@ -551,11 +532,11 @@ attach(char *draft_file_name)
                                /* forwarded message */
                                fprintf(composition_file, "#forw [forwarded message(s)] %s\n", p);
                        } else {
                                /* forwarded message */
                                fprintf(composition_file, "#forw [forwarded message(s)] %s\n", p);
                        } else {

+                               /* regular attachment */

                                make_mime_composition_file_entry(p);
                        }
                }
        }
                                make_mime_composition_file_entry(p);
                        }
                }
        }

-

        fclose(composition_file);
 
        /*
        fclose(composition_file);
 
        /*

@@ -565,6 +546,7 @@ attach(char *draft_file_name)
        sprintf(buf, "%s %s", buildmimeproc, composition_file_name);
 
        if (system(buf) != 0) {
        sprintf(buf, "%s %s", buildmimeproc, composition_file_name);
 
        if (system(buf) != 0) {

+               /* some problem */

                clean_up_temporary_files();
                return (NOTOK);
        }
                clean_up_temporary_files();
                return (NOTOK);
        }

@@ -586,7 +568,7 @@ get_line(void)
 {
        int c;  /* current character */
        int n;  /* number of bytes in buffer */
 {
        int c;  /* current character */
        int n;  /* number of bytes in buffer */

-       char *p;  /* buffer pointer */
+       char *p;

 
        /*
        ** Get a line from the input file, growing the field buffer as
 
        /*
        ** Get a line from the input file, growing the field buffer as

@@ -594,22 +576,17 @@ get_line(void)
        ** buffer making it easy to do a string comparison on both the
        ** field name and the field body which might be a long path name.
        */
        ** buffer making it easy to do a string comparison on both the
        ** field name and the field body which might be a long path name.
        */

-

        for (n = 0, p = field; (c = getc(draft_file)) != EOF; *p++ = c) {
                if (c == '\n' && (c = getc(draft_file)) != ' ' && c != '\t') {
                        ungetc(c, draft_file);
                        c = '\n';
                        break;
                }
        for (n = 0, p = field; (c = getc(draft_file)) != EOF; *p++ = c) {
                if (c == '\n' && (c = getc(draft_file)) != ' ' && c != '\t') {
                        ungetc(c, draft_file);
                        c = '\n';
                        break;
                }

-

                if (++n >= field_size - 1) {
                if (++n >= field_size - 1) {

-                       field = (char *)mh_xrealloc((void *)field, field_size += 256);
-
+                       field = (char *)mh_xrealloc(field, field_size += 256);

                        p = field + n - 1;
                }
        }
                        p = field + n - 1;
                }
        }

-
-       /* NUL-terminate the field. */

        *p = '\0';
 
        return (c);
        *p = '\0';
 
        return (c);

@@ -664,8 +641,8 @@ make_mime_composition_file_entry(char *file_name)
 }
 
 /*
 }
 
 /*

-** Annotate original message, and
-** call `postproc' to send message.
+** The back-end of the message sending back-end.
+** Annotate original message, and call `postproc' to send message.

 */
 static int
 sendaux(char **vec, int vecp, char *drft, struct stat *st)
 */
 static int
 sendaux(char **vec, int vecp, char *drft, struct stat *st)

@@ -681,12 +658,14 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
        if (annotext && (fd2 = tmp_fd()) == NOTOK) {
                admonish(NULL, "unable to create file for annotation list");
        }
        if (annotext && (fd2 = tmp_fd()) == NOTOK) {
                admonish(NULL, "unable to create file for annotation list");
        }

-       if (distfile && distout(drft, distfile, backup) == NOTOK)
+       if (distfile && distout(drft, distfile, backup) == NOTOK) {

                done(1);
                done(1);

+       }

        vec[vecp] = NULL;
 
        vec[vecp] = NULL;
 

-       for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
+       for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) {

                sleep(5);
                sleep(5);

+       }

 
        switch (child_id) {
        case -1:
 
        switch (child_id) {
        case -1:

@@ -713,9 +692,7 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
                break;  /* NOT REACHED */
 
        default:
                break;  /* NOT REACHED */
 
        default:

-               /*
-               ** parent process -- wait for it
-               */
+               /* parent process -- wait for it */

                if ((status = pidwait(child_id, NOTOK)) == OK) {
                        if (annotext && fd2 != NOTOK)
                                anno(fd2, st);
                if ((status = pidwait(child_id, NOTOK)) == OK) {
                        if (annotext && fd2 != NOTOK)
                                anno(fd2, st);

@@ -731,13 +708,15 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
                        } else {
                                advise(NULL, "message not delivered to anyone");
                        }
                        } else {
                                advise(NULL, "message not delivered to anyone");
                        }

-                       if (annotext && fd2 != NOTOK)
+                       if (annotext && fd2 != NOTOK) {

                                close(fd2);
                                close(fd2);

+                       }

                        if (distfile) {
                                unlink(drft);
                        if (distfile) {
                                unlink(drft);

-                               if (rename(backup, drft) == NOTOK)
+                               if (rename(backup, drft) == NOTOK) {

                                        advise(drft, "unable to rename %s to",
                                                        backup);
                                        advise(drft, "unable to rename %s to",
                                                        backup);

+                               }

                        }
                }
                break;
                        }
                }
                break;

@@ -758,8 +737,9 @@ alert(char *file, int out)
        int i, in;
        char buf[BUFSIZ];
 
        int i, in;
        char buf[BUFSIZ];
 

-       for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
+       for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) {

                sleep(5);
                sleep(5);

+       }

 
        switch (child_id) {
        case NOTOK:
 
        switch (child_id) {
        case NOTOK:

@@ -785,8 +765,9 @@ alert(char *file, int out)
                                close(in);
                                strncpy(buf, "\n------- End of Unsent Draft\n", sizeof(buf));
                                write(out, buf, strlen(buf));
                                close(in);
                                strncpy(buf, "\n------- End of Unsent Draft\n", sizeof(buf));
                                write(out, buf, strlen(buf));

-                               if (rename(file, strncpy(buf, m_backup(file), sizeof(buf))) == NOTOK)
+                               if (rename(file, strncpy(buf, m_backup(file), sizeof(buf))) == NOTOK) {

                                        admonish(buf, "unable to rename %s to", file);
                                        admonish(buf, "unable to rename %s to", file);

+                               }

                        }
                }
                lseek(out, (off_t) 0, SEEK_SET);
                        }
                }
                lseek(out, (off_t) 0, SEEK_SET);

@@ -818,11 +799,13 @@ tmp_fd(void)
        if (tfile == NULL) return NOTOK;
        fchmod(fd, 0600);
 
        if (tfile == NULL) return NOTOK;
        fchmod(fd, 0600);
 

-       if (debugsw)
+       if (debugsw) {

                advise(NULL, "temporary file %s selected", tfile);
                advise(NULL, "temporary file %s selected", tfile);

-       else
-               if (unlink(tfile) == NOTOK)
+       } else {
+               if (unlink(tfile) == NOTOK) {

                        advise(tfile, "unable to remove");
                        advise(tfile, "unable to remove");

+               }
+       }

 
        return fd;
 }
 
        return fd;
 }

@@ -840,18 +823,21 @@ anno(int fd, struct stat *st)
                        st->st_mtime != st2.st_mtime ||
                        st->st_dev != st2.st_dev ||
                        st->st_ino != st2.st_ino)) {
                        st->st_mtime != st2.st_mtime ||
                        st->st_dev != st2.st_dev ||
                        st->st_ino != st2.st_ino)) {

-               if (debugsw)
+               if (debugsw) {

                        admonish(NULL, "$mhaltmsg mismatch");
                        admonish(NULL, "$mhaltmsg mismatch");

+               }

                return;
        }
 
        child_id = debugsw ? NOTOK : fork();
        switch (child_id) {
        case NOTOK:  /* oops */
                return;
        }
 
        child_id = debugsw ? NOTOK : fork();
        switch (child_id) {
        case NOTOK:  /* oops */

-               if (!debugsw)
+               if (!debugsw) {

                        advise(NULL, "unable to fork, so doing annotations by hand...");
                        advise(NULL, "unable to fork, so doing annotations by hand...");

-               if (cwd == NULL)
+               }
+               if (!cwd) {

                        cwd = getcpy(pwd());
                        cwd = getcpy(pwd());

+               }

                /* fall */
 
        case OK:
                /* fall */
 
        case OK:

@@ -864,8 +850,9 @@ anno(int fd, struct stat *st)
                SIGPROCMASK(SIG_BLOCK, &set, &oset);
 
                annoaux(fd);
                SIGPROCMASK(SIG_BLOCK, &set, &oset);
 
                annoaux(fd);

-               if (child_id == OK)
+               if (child_id == OK) {

                        _exit(0);
                        _exit(0);

+               }

 
                /* reset the signal mask */
                SIGPROCMASK(SIG_SETMASK, &oset, &set);
 
                /* reset the signal mask */
                SIGPROCMASK(SIG_SETMASK, &oset, &set);

@@ -889,33 +876,36 @@ annoaux(int fd)
        FILE *fp;
        struct msgs *mp;
 
        FILE *fp;
        struct msgs *mp;
 

-       if ((folder = getenv("mhfolder")) == NULL || *folder == 0) {
-               if (debugsw)
+       if (!(folder = getenv("mhfolder")) || !*folder) {
+               if (debugsw) {

                        admonish(NULL, "$mhfolder not set");
                        admonish(NULL, "$mhfolder not set");

+               }

                return;
        }
        maildir = toabsdir(folder);
        if (chdir(maildir) == NOTOK) {
                return;
        }
        maildir = toabsdir(folder);
        if (chdir(maildir) == NOTOK) {

-               if (debugsw)
+               if (debugsw) {

                        admonish(maildir, "unable to change directory to");
                        admonish(maildir, "unable to change directory to");

+               }

                return;
        }
        if (!(mp = folder_read(folder))) {
                return;
        }
        if (!(mp = folder_read(folder))) {

-               if (debugsw)
+               if (debugsw) {

                        admonish(NULL, "unable to read folder %s", folder);
                        admonish(NULL, "unable to read folder %s", folder);

+               }

                return;
        }
 
                return;
        }
 

-       /* check for empty folder */

        if (mp->nummsg == 0) {
        if (mp->nummsg == 0) {

-               if (debugsw)
+               if (debugsw) {

                        admonish(NULL, "no messages in %s", folder);
                        admonish(NULL, "no messages in %s", folder);

+               }

                goto oops;
        }
                goto oops;
        }

-

        if ((cp = getenv("mhmessages")) == NULL || *cp == 0) {
        if ((cp = getenv("mhmessages")) == NULL || *cp == 0) {

-               if (debugsw)
+               if (debugsw) {

                        admonish(NULL, "$mhmessages not set");
                        admonish(NULL, "$mhmessages not set");

+               }

                goto oops;
        }
        if (!debugsw  /* MOBY HACK... */
                goto oops;
        }
        if (!debugsw  /* MOBY HACK... */

@@ -924,46 +914,53 @@ annoaux(int fd)
                        && (fd2 = dup(fileno(stderr))) != NOTOK) {
                dup2(fd3, fileno(stderr));
                close(fd3);
                        && (fd2 = dup(fileno(stderr))) != NOTOK) {
                dup2(fd3, fileno(stderr));
                close(fd3);

-       } else
+       } else {

                fd2 = NOTOK;
                fd2 = NOTOK;

-       for (ap = brkstring(cp = getcpy(cp), " ", NULL); *ap; ap++)
+       }
+       for (ap = brkstring(cp = getcpy(cp), " ", NULL); *ap; ap++) {

                m_convert(mp, *ap);
                m_convert(mp, *ap);

+       }

        free(cp);
        free(cp);

-       if (fd2 != NOTOK)
+       if (fd2 != NOTOK) {

                dup2(fd2, fileno(stderr));
                dup2(fd2, fileno(stderr));

+       }

        if (mp->numsel == 0) {
        if (mp->numsel == 0) {

-               if (debugsw)
+               if (debugsw) {

                        admonish(NULL, "no messages to annotate");
                        admonish(NULL, "no messages to annotate");

+               }

                goto oops;
        }
 
        lseek(fd, (off_t) 0, SEEK_SET);
        if ((fp = fdopen(fd, "r")) == NULL) {
                goto oops;
        }
 
        lseek(fd, (off_t) 0, SEEK_SET);
        if ((fp = fdopen(fd, "r")) == NULL) {

-               if (debugsw)
+               if (debugsw) {

                        admonish(NULL, "unable to fdopen annotation list");
                        admonish(NULL, "unable to fdopen annotation list");

+               }

                goto oops;
        }
        cp = NULL;
                goto oops;
        }
        cp = NULL;

-       while (fgets(buffer, sizeof(buffer), fp) != NULL)
+       while (fgets(buffer, sizeof(buffer), fp) != NULL) {

                cp = add(buffer, cp);
                cp = add(buffer, cp);

+       }

        fclose(fp);
 
        fclose(fp);
 

-       if (debugsw)
+       if (debugsw) {

                advise(NULL, "annotate%s with %s: \"%s\"",
                                inplace ? " inplace" : "", annotext, cp);
                advise(NULL, "annotate%s with %s: \"%s\"",
                                inplace ? " inplace" : "", annotext, cp);

+       }

        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
                if (is_selected(mp, msgnum)) {
        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
                if (is_selected(mp, msgnum)) {

-                       if (debugsw)
+                       if (debugsw) {

                                advise(NULL, "annotate message %d", msgnum);
                                advise(NULL, "annotate message %d", msgnum);

+                       }

                        annotate(m_name(msgnum), annotext, cp, inplace,
                                        1, -2, 0);
                }
        }
                        annotate(m_name(msgnum), annotext, cp, inplace,
                                        1, -2, 0);
                }
        }

-

        free(cp);
 
 oops:
        free(cp);
 
 oops:

-       folder_free(mp);  /* free folder/message structure */
+       folder_free(mp);

 }
 
 
 }