sbr/vector.c: Use new BVEC_BITS_BITS macro.

[nmh] / uip / sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 497c868b2bbfb229ae8f603b7a9da5ffc3e0db7a..a7c398afbb2f92e2e43c1316c75270228a9bf825 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -1,6 +1,4 @@
-
-/*
- * sendsbr.c -- routines to help WhatNow/Send along
+/* sendsbr.c -- routines to help WhatNow/Send along
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -286,7 +284,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
 
     nparts = 1;
     pos = start;
-    while (fgets (buffer, sizeof(buffer) - 1, in)) {
+    while (fgets (buffer, sizeof buffer, in)) {
        long len;
 
        if ((pos += (len = strlen (buffer))) > CPERMSG) {
@@ -356,7 +354,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
        for (;;) {
            long len;
 
-           if (!fgets (buffer, sizeof(buffer) - 1, in)) {
+           if (!fgets (buffer, sizeof buffer, in)) {
                if (partno == nparts)
                    break;
                adios (NULL, "premature eof");
@@ -432,8 +430,8 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st)
            snprintf (buf, sizeof(buf), "%d", fd2);
            vec[vecp++] = buf;
        } else {
-           admonish (NULL, "unable to create temporary file in %s "
-                      "for annotation list", get_temp_dir());
+           inform("unable to create temporary file in %s for "
+               "annotation list, continuing...", get_temp_dir());
        }
     }
     vec[vecp++] = drft;
@@ -484,7 +482,7 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st)
                alert (drft, fd);
                close (fd);
            } else {
-               advise (NULL, "message not delivered to anyone");
+               inform("message not delivered to anyone");
            }
            if (annotext && fd2 != NOTOK)
                close (fd2);
@@ -522,6 +520,7 @@ alert (char *file, int out)
        case NOTOK:
            /* oops -- fork error */
            advise ("fork", "unable to");
+           /* FALLTHRU */
 
        case OK:
            /* child process -- send it */
@@ -586,7 +585,7 @@ tmp_fd (void)
     if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) return NOTOK;
 
     if (debugsw)
-       advise (NULL, "temporary file %s selected", tfile);
+       inform("temporary file %s selected", tfile);
     else
        if (m_unlink (tfile) == NOTOK)
            advise (tfile, "unable to remove");
@@ -609,7 +608,7 @@ anno (int fd, struct stat *st)
                || st->st_dev != st2.st_dev
                || st->st_ino != st2.st_ino)) {
        if (debugsw)
-           admonish (NULL, "$mhaltmsg mismatch");
+           inform("$mhaltmsg mismatch, continuing...");
        return;
     }
 
@@ -617,10 +616,10 @@ anno (int fd, struct stat *st)
     switch (child_id) {
        case NOTOK:             /* oops */
            if (!debugsw)
-               advise (NULL,
-                           "unable to fork, so doing annotations by hand...");
+               inform("unable to fork, so doing annotations by hand...");
            if (cwd == NULL)
                cwd = mh_xstrdup(pwd ());
+           /* FALLTHRU */
 
        case OK:
            /* block a few signals */
@@ -663,7 +662,7 @@ annoaux (int fd)
 
     if ((folder = getenv ("mhfolder")) == NULL || *folder == 0) {
        if (debugsw)
-           admonish (NULL, "$mhfolder not set");
+           inform("$mhfolder not set, continuing...");
        return;
     }
     maildir = m_maildir (folder);
@@ -674,20 +673,20 @@ annoaux (int fd)
     }
     if (!(mp = folder_read (folder, 0))) {
        if (debugsw)
-           admonish (NULL, "unable to read folder %s", folder);
+           inform("unable to read folder %s, continuing...", folder);
        return;
     }
 
     /* check for empty folder */
     if (mp->nummsg == 0) {
        if (debugsw)
-           admonish (NULL, "no messages in %s", folder);
+           inform("no messages in %s, continuing...", folder);
        goto oops;
     }
 
     if ((cp = getenv ("mhmessages")) == NULL || *cp == 0) {
        if (debugsw)
-           admonish (NULL, "$mhmessages not set");
+           inform("$mhmessages not set, continuing...");
        goto oops;
     }
     if (!debugsw                       /* MOBY HACK... */
@@ -706,14 +705,14 @@ annoaux (int fd)
        dup2 (fd2, fileno (stderr));
     if (mp->numsel == 0) {
        if (debugsw)
-           admonish (NULL, "no messages to annotate");
+           inform("no messages to annotate, continuing...");
        goto oops;
     }
 
     lseek (fd, (off_t) 0, SEEK_SET);
     if ((fp = fdopen (fd, "r")) == NULL) {
        if (debugsw)
-           admonish (NULL, "unable to fdopen annotation list");
+           inform("unable to fdopen annotation list, continuing...");
        goto oops;
     }
     cp = NULL;
@@ -722,12 +721,12 @@ annoaux (int fd)
     fclose (fp);
 
     if (debugsw)
-       advise (NULL, "annotate%s with %s: \"%s\"",
+       inform("annotate%s with %s: \"%s\"",
                inplace ? " inplace" : "", annotext, cp);
     for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
        if (is_selected(mp, msgnum)) {
            if (debugsw)
-               advise (NULL, "annotate message %d", msgnum);
+               inform("annotate message %d", msgnum);
             annotate (m_name (msgnum), annotext, cp, inplace, 1, -2, 0);
        }
     }