Change admonish(NULL, "foo") to inform("foo, continuing...").

Removes more uses of the ad... functions with unneeded parameters.
Puts the "continuing" at the call site rather than the reader having to
remember it's being magically appended.  (Some calls were passing
"foo\n" that would result in "foo\n, continuing...\n" appearing.)

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 5ad8769..f63848b 100644 (file)
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -301,12 +301,12 @@ ismymbox (struct mailname *np)
            localmailbox++;
 
            if ((cp = getname(am)) == NULL) {
-               admonish (NULL, "Unable to find address in local-mailbox");
+               inform("Unable to find address in local-mailbox, continuing...");
                return 0;
            }
 
            if ((mq.m_next = getm (cp, NULL, 0, NULL, 0)) == NULL) {
-               admonish (NULL, "invalid entry in local-mailbox: %s", cp);
+                inform("invalid entry in local-mailbox: %s, continuing...", cp);
                return 0;
            }
 
@@ -323,7 +323,7 @@ ismymbox (struct mailname *np)
            oops = 0;
            while ((cp = getname (am))) {
                if ((mp->m_next = getm (cp, NULL, 0, NULL, 0)) == NULL) {
-                   admonish (NULL, "illegal address: %s", cp);
+                   inform("illegal address: %s, continuing...", cp);
                    oops++;
                } else {
                    mp = mp->m_next;

diff --git a/sbr/context_del.c b/sbr/context_del.c
index 37cbce0..b359cb7 100644 (file)
--- a/sbr/context_del.c
+++ b/sbr/context_del.c
@@ -23,7 +23,7 @@ context_del (char *key)
     for (np = m_defs, pp = NULL; np; pp = np, np = np->n_next) {
        if (!strcasecmp (np->n_name ? np->n_name : "", key ? key : "")) {
            if (!np->n_context)
-               admonish (NULL, "bug: context_del(key=\"%s\")", np->n_name);
+               inform("bug: context_del(key=\"%s\"), continuing...", np->n_name);
            if (pp)
                pp->n_next = np->n_next;
            else

diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index 99f8ef3..0e7d45c 100644 (file)
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -38,7 +38,7 @@ context_replace (char *key, char *value)
        if (!strcasecmp (np->n_name ? np->n_name : "", key ? key : "")) {
            if (strcmp (value, np->n_field)) {
                if (!np->n_context)
-                   admonish (NULL, "bug: context_replace(key=\"%s\",value=\"%s\")", key, value);
+                   inform("bug: context_replace(key=\"%s\",value=\"%s\"), continuing...", key, value);
                 mh_xfree(np->n_field);
                np->n_field = mh_xstrdup(value);
                ctxflags |= CTXMOD;

diff --git a/sbr/credentials.c b/sbr/credentials.c
index d8e4d2e..32bc792 100644 (file)
--- a/sbr/credentials.c
+++ b/sbr/credentials.c
@@ -38,7 +38,7 @@ init_credentials_file () {
                     credentials_file =
                         concat (mypath ? mypath : ".", "/", filename, NULL);
                     if (stat (credentials_file, &st) != OK) {
-                        admonish (NULL, "unable to find credentials file %s",
+                        inform("unable to find credentials file %s, continuing...",
                                   filename);
                     }
                 }
@@ -79,7 +79,7 @@ nmh_get_credentials (const char *host, const char *user)
          */
         creds->user = user == NULL ? NULL : mh_xstrdup(user);
     } else {
-        admonish (NULL, "unknown credentials style %s", cred_style);
+        inform("unknown credentials style %s, continuing...", cred_style);
         return NULL;
     }
 

diff --git a/sbr/datetime.c b/sbr/datetime.c
index ba64e4d..03a58ab 100644 (file)
--- a/sbr/datetime.c
+++ b/sbr/datetime.c
@@ -321,9 +321,8 @@ rrule_clock (const char *rrule, const char *starttime, const char *zone,
 
 fail:
     if (clock == 0) {
-        admonish (NULL,
-                  "Unsupported RRULE format: %s, assume local timezone",
-                  rrule);
+        inform("Unsupported RRULE format: %s, assume local timezone, continuing...",
+           rrule);
     }
 
     return clock;

diff --git a/sbr/encode_rfc2047.c b/sbr/encode_rfc2047.c
index d964cbd..2d9dde3 100644 (file)
--- a/sbr/encode_rfc2047.c
+++ b/sbr/encode_rfc2047.c
@@ -289,7 +289,7 @@ field_encode_quoted(const char *name, char **value, const char *charset,
     if (q == NULL) {
        /* This should never happen, but just in case.  Found by
           clang static analyzer. */
-       admonish (NULL, "null output encoding for %s", *value);
+       inform("null output encoding for %s, continuing...", *value);
        return 1;
     }
     *q++ = '?';

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index 5b72113..b92f699 100644 (file)
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -52,7 +52,7 @@ readconfig (struct node **npp, FILE *ib, const char *file, int ctx)
     m_getfld_state_t gstate = 0;
 
     if (npp == NULL && (npp = opp) == NULL) {
-       admonish (NULL, "bug: readconfig called but pump not primed");
+       inform("bug: readconfig called but pump not primed, continuing...");
        return;
     }
 
@@ -142,9 +142,9 @@ readconfig (struct node **npp, FILE *ib, const char *file, int ctx)
                struct node *np2;
                for (np2 = np->n_next; np2; np2 = np2->n_next) {
                    if (! strcasecmp (np->n_name, np2->n_name)) {
-                       admonish (NULL, "multiple \"%s\" profile components "
-                                       "in %s, ignoring \"%s\"",
-                                 np->n_name, defpath, np2->n_field);
+                       inform("multiple \"%s\" profile components in %s, "
+                           "ignoring \"%s\", continuing...",
+                           np->n_name, defpath, np2->n_field);
                    }
                }
            }

diff --git a/sbr/utils.c b/sbr/utils.c
index 7e4dd3c..7731c9b 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -105,7 +105,7 @@ pwd(void)
     static char curwd[PATH_MAX];
 
     if (!getcwd (curwd, PATH_MAX)) {
-        admonish (NULL, "unable to determine working directory");
+        inform("unable to determine working directory, continuing...");
         if (!mypath || !*mypath
                 || (strcpy (curwd, mypath), chdir (curwd)) == -1) {
             strcpy (curwd, "/");
@@ -505,8 +505,8 @@ nmh_init(const char *argv0, int read_context) {
     }
 
     if (! setlocale (LC_ALL, locale)) {
-        admonish (NULL, "setlocale failed, check your LC_ALL, LC_CTYPE, and "
-                 "LANG environment variables");
+        inform("setlocale failed, check your LC_ALL, LC_CTYPE, and LANG "
+           "environment variables, continuing...");
     }
 
     return status;

diff --git a/uip/burst.c b/uip/burst.c
index ab2a9e5..a9bb173 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -180,7 +180,7 @@ main (int argc, char **argv)
            } else {
                if (numburst == 0) {
                    if (!quietsw)
-                       admonish (NULL, "message %d not in digest format",
+                       inform("message %d not in digest format, continuing...",
                                  msgnum);
                }  /* this pair of braces was missing before 1999-07-15 */
                else

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index baf8268..bf16b60 100644 (file)
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -652,7 +652,7 @@ map_chk (char *file, int fd, struct drop *dp, long pos, int noisy)
 
     if (read (fd, (char *) &tmpd, sizeof(*dp)) != sizeof(*dp)) {
 #ifdef notdef
-       admonish (NULL, "%s: missing or partial index", file);
+       inform("%s: missing or partial index, continuing...", file);
 #endif /* notdef */
        return NOTOK;
     }
@@ -667,22 +667,21 @@ map_chk (char *file, int fd, struct drop *dp, long pos, int noisy)
     
     if (dp->d_size != DRVRSN) {
        if (noisy)
-           admonish (NULL, "%s: version mismatch (%d != %d)", file,
+           inform("%s: version mismatch (%d != %d), continuing...", file,
                                dp->d_size, DRVRSN);
        return NOTOK;
     }
 
     if (dp->d_stop != pos) {
        if (noisy && pos != (long) 0)
-           admonish (NULL,
-                   "%s: pointer mismatch or incomplete index (%ld!=%ld)", 
-                   file, dp->d_stop, (long) pos);
+           inform("%s: pointer mismatch or incomplete index (%ld!=%ld), "
+               "continuing...", file, dp->d_stop, (long) pos);
        return NOTOK;
     }
 
     if ((long) ((dp->d_id + 1) * sizeof(*dp)) != (long) lseek (fd, (off_t) 0, SEEK_END)) {
        if (noisy)
-           admonish (NULL, "%s: corrupt index(1)", file);
+           inform("%s: corrupt index(1), continuing...", file);
        return NOTOK;
     }
 
@@ -693,7 +692,7 @@ map_chk (char *file, int fd, struct drop *dp, long pos, int noisy)
            || (ntohl(dl->d_stop) != dp->d_stop
                && ntohl(dl->d_stop) + count != dp->d_stop)) {
        if (noisy)
-           admonish (NULL, "%s: corrupt index(2)", file);
+           inform("%s: corrupt index(2), continuing...", file);
        return NOTOK;
     }
 

diff --git a/uip/folder.c b/uip/folder.c
index 10c9290..edc1545 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -335,7 +335,7 @@ main (int argc, char **argv)
         */
        if (!argfolder) {
            if (msg)
-               admonish (NULL, "no folder given for message %s", msg);
+               inform("no folder given for message %s, continuing...", msg);
            readonly_folders (); /* do any readonly folders */
            strncpy (folder, (cp = context_find (pfolder)) ? cp : "", sizeof(folder));
            crawl_folders (".", get_folder_info_callback, NULL);
@@ -407,7 +407,7 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
         * create message structure and get folder info
         */
        if (!(mp = folder_read (fold, fpack))) {
-           admonish (NULL, "unable to read folder %s", fold);
+           inform("unable to read folder %s, continuing...", fold);
            *crawl_children = FALSE;
            return 0;
        }
@@ -612,7 +612,7 @@ sfold (struct msgs *mp, char *msg)
        return 0;
 
     if (mp->numsel > 1) {
-       admonish (NULL, "only one message at a time!");
+       inform("only one message at a time!, continuing...");
        return 0;
     }
     seq_setprev (mp);          /* set the previous-sequence     */

diff --git a/uip/inc.c b/uip/inc.c
index b6d8e36..1dea263 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -933,7 +933,7 @@ go_to_it:
     }
 
     if (msgnum == hghnum) {
-       admonish (NULL, "no messages incorporated");
+       inform("no messages incorporated, continuing...");
     } else {
        /*
         * Lock the sequence file now, and loop to set the right flags
@@ -946,7 +946,7 @@ go_to_it:
        context_replace (pfolder, folder);      /* update current folder */
 
        if ((mp2 = folder_read(folder, 1)) == NULL) {
-           admonish(NULL, "Unable to reread folder %s", folder);
+           inform("Unable to reread folder %s, continuing...", folder);
            goto skip;
        }
 

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 9b733e8..623f474 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -405,7 +405,7 @@ finish_field:
        CT p;
 
        if (user_content (in, buf, &p, infile) == DONE) {
-           admonish (NULL, "ignoring spurious #end");
+           inform("ignoring spurious #end, continuing...");
            continue;
        }
        if (!p)
@@ -1123,7 +1123,7 @@ use_forw:
            pp = &part->mp_next;
            part->mp_part = p;
        }
-       admonish (NULL, "premature end-of-file, missing #end");
+       inform("premature end-of-file, missing #end, continuing...");
        return OK;
     }
 
@@ -2069,13 +2069,13 @@ set_disposition (CT ct) {
 
         if (cp  &&  strcasecmp (cp, "attachment")  &&
             strcasecmp (cp, "inline")) {
-            admonish (NULL, "configuration problem: %s-disposition-%s%s%s "
-                      "specifies '%s' but only 'attachment' and 'inline' are "
-                      "allowed", invo_name,
-                      ct->c_ctinfo.ci_type,
-                      ct->c_ctinfo.ci_subtype ? "/" : "",
-                      ct->c_ctinfo.ci_subtype ? ct->c_ctinfo.ci_subtype : "",
-                      cp);
+            inform("configuration problem: %s-disposition-%s%s%s specifies "
+               "'%s' but only 'attachment' and 'inline' are allowed, "
+               "continuing...", invo_name,
+               ct->c_ctinfo.ci_type,
+               ct->c_ctinfo.ci_subtype ? "/" : "",
+               ct->c_ctinfo.ci_subtype ? ct->c_ctinfo.ci_subtype : "",
+               cp);
         }
 
         if (!cp)
@@ -2248,7 +2248,7 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m,
 
     if ((status = show_content_aux (ct, 0, convert_command, NULL, NULL)) !=
         OK) {
-        admonish (NULL, "store of %s content failed", type);
+        inform("store of %s content failed, continuing...", type);
     }
     free (convert_command);
 
@@ -2258,9 +2258,8 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m,
 
     if (extract_headers (reply_ct, reply_file, &reply_fp) == NOTOK) {
         free (reply_file);
-        admonish (NULL,
-                  "failed to extract headers from convert output in %s",
-                  reply_file);
+        inform("failed to extract headers from convert output in %s, "
+           "continuing...", reply_file);
         return;
     }
 
@@ -2271,7 +2270,7 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m,
         if ((fd = open (reply_file, O_RDONLY)) == NOTOK  ||
             scan_input (fd, &eightbit) == NOTOK) {
             free (reply_file);
-            admonish (NULL, "failed to read %s", reply_file);
+            inform("failed to read %s, continuing...", reply_file);
             return;
         } 
         (void) close (fd);
@@ -2440,7 +2439,7 @@ extract_headers (CT ct, char *reply_file, FILE **reply_fp) {
         n = strlen (buffer);
 
         if (get_ctinfo (buffer + 14, ct, 0) != OK) {
-            admonish (NULL, "unable to get content info for reply");
+            inform("unable to get content info for reply, continuing...");
             goto failed_to_extract_ct;
         }
 

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 5a77701..4cf2014 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -1628,7 +1628,7 @@ decode_part (CT ct) {
     (void) m_unlink (tmp_decoded);
     free (tmp_decoded);
     if (fclose (file)) {
-        admonish (NULL, "unable to close temporary file %s", tempfile);
+        inform("unable to close temporary file %s, continuing...", tempfile);
     }
 
     return status;
@@ -2301,7 +2301,7 @@ strip_crs (CT ct, int *message_mods) {
                 }
 
                 if (close (fd)) {
-                    admonish (NULL, "unable to write temporary file %s",
+                    inform("unable to write temporary file %s, continuing...",
                               stripped_content_file);
                     (void) m_unlink (stripped_content_file);
                     status = NOTOK;
@@ -2716,15 +2716,15 @@ write_content (CT ct, const char *input_filename, char *outfile, FILE *outfp,
                                expand filename to absolute path. */
                             int file = ct->c_file  &&  ct->c_file[0] == '/';
 
-                            admonish (NULL, "unable to rename %s %s to %s",
+                            inform("unable to rename %s %s to %s, continuing...",
                                       file ? "file" : "message", outfile,
                                       infile);
                             status = NOTOK;
                         }
                     }
                 } else {
-                    admonish (NULL, "unable to remove input file %s, "
-                              "not modifying it", infile);
+                    inform("unable to remove input file %s, "
+                       "not modifying it, continuing...", infile);
                     (void) m_unlink (outfile);
                     status = NOTOK;
                 }

diff --git a/uip/mhical.c b/uip/mhical.c
index 27f7c9f..d18d601 100644 (file)
--- a/uip/mhical.c
+++ b/uip/mhical.c
@@ -399,13 +399,14 @@ convert_common (contentline *clines, act action) {
 
     if ((node = find_contentline (clines, "VERSION", 0))) {
         if (! node->value) {
-            admonish (NULL, "Version property is missing value, assume 2.0");
+            inform("Version property is missing value, assume 2.0, continuing...");
             node->value = mh_xstrdup ("2.0");
         }
 
         if (strcmp (node->value, "2.0")) {
-            admonish (NULL, "supports the Version 2.0 specified by RFC 5545 "
-                            "but iCalendar object has Version %s", node->value);
+            inform("supports the Version 2.0 specified by RFC 5545 "
+               "but iCalendar object has Version %s, continuing...",
+               node->value);
             node->value = mh_xstrdup ("2.0");
         }
     }
@@ -460,10 +461,10 @@ convert_common (contentline *clines, act action) {
                 free (node->value);
                 node->value = mh_xstrdup (buf);
             } else {
-                admonish (NULL, "strftime unable to format current time");
+                inform("strftime unable to format current time, continuing...");
             }
         } else {
-            admonish (NULL, "gmtime_r failed on current time");
+            inform("gmtime_r failed on current time, continuing...");
         }
     }
 

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 2be9760..03d7ae3 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -413,7 +413,7 @@ get_content (FILE *in, char *file, int toplevel)
            ucmp = !strcasecmp (cp, VRSN_VALUE);
            *dp = c;
            if (!ucmp) {
-               admonish (NULL, "message %s has unknown value for %s: field (%s)",
+               inform("message %s has unknown value for %s: field (%s), continuing...",
                ct->c_file, VRSN_FIELD, cp);
            }
            if (!ct->c_vrsn) {
@@ -1103,13 +1103,12 @@ InitMultiPart (CT ct)
        while (bp >= cte && isspace ((unsigned char) *bp)) *bp-- = '\0';
        for (bp = cte; *bp && isblank ((unsigned char) *bp); ++bp) continue;
 
-       admonish (NULL,
-                 "\"%s/%s\" type in message %s must be encoded in\n"
-                 "7bit, 8bit, or binary, per RFC 2045 (6.4).  "
-                  "mhfixmsg -fixcte can fix it, or\n"
-                  "manually edit the file and change the \"%s\"\n"
-                 "Content-Transfer-Encoding to one of those.  For now",
-                 ci->ci_type, ci->ci_subtype, ct->c_file, bp);
+       inform("\"%s/%s\" type in message %s must be encoded in\n"
+           "7bit, 8bit, or binary, per RFC 2045 (6.4).  "
+           "mhfixmsg -fixcte can fix it, or\n"
+           "manually edit the file and change the \"%s\"\n"
+           "Content-Transfer-Encoding to one of those.  For now, continuing...",
+           ci->ci_type, ci->ci_subtype, ct->c_file, bp);
        free (cte);
 
        return NOTOK;
@@ -1398,9 +1397,9 @@ InitMessage (CT ct)
     CI ci = &ct->c_ctinfo;
 
     if ((ct->c_encoding != CE_7BIT) && (ct->c_encoding != CE_8BIT)) {
-       admonish (NULL,
-                 "\"%s/%s\" type in message %s should be encoded in 7bit or 8bit",
-                 ci->ci_type, ci->ci_subtype, ct->c_file);
+       inform("\"%s/%s\" type in message %s should be encoded in "
+           "7bit or 8bit, continuing...", ci->ci_type, ci->ci_subtype,
+           ct->c_file);
        return NOTOK;
     }
 

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 3db2348..d820667 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -370,7 +370,7 @@ show_content_aux (CT ct, int alternate, char *cp, char *cracked, struct format *
                 return NOTOK;
         } else {
             char *charset = content_charset (ct);
-            admonish (NULL, "unable to convert character set%s%s from %s",
+            inform("unable to convert character set%s%s from %s, continuing...",
                       ct->c_partno  ?  " of part "  :  "",
                       ct->c_partno  ?  ct->c_partno  :  "",
                       charset);
@@ -385,7 +385,7 @@ show_content_aux (CT ct, int alternate, char *cp, char *cracked, struct format *
 
     if (parse_display_string (ct, cp, &xstdin, &xlist, file, buffer,
                              sizeof(buffer) - 1, 0)) {
-       admonish (NULL, "Buffer overflow constructing show command!\n");
+       inform("Buffer overflow constructing show command, continuing...");
        return NOTOK;
     }
 
@@ -720,7 +720,7 @@ show_multi_aux (CT ct, int alternate, char *cp, struct format *fmt)
 
     if (parse_display_string (ct, cp, &xstdin, &xlist, file,
                              buffer, sizeof(buffer) - 1, 1)) {
-       admonish (NULL, "Buffer overflow constructing show command!\n");
+       inform("Buffer overflow constructing show command, continuing...");
        return NOTOK;
     }
 
@@ -943,8 +943,7 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist,
                    /* This will get confused if there are multiple %{}'s,
                       but its real purpose is to avoid doing bad things
                       above if a closing brace wasn't found. */
-                   admonish(NULL,
-                            "no closing brace for display string escape %s",
+                   inform("no closing brace for display string escape %s, continuing...",
                             cp);
                }
                break;

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index ab8ab2e..9c1c790 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -368,8 +368,7 @@ store_partial (CT ct, mhstoreinfo_t info)
        pm = (struct partial *) p->c_ctparams;
        if (pm->pm_marked != cur) {
            if (pm->pm_marked == cur - 1) {
-               admonish (NULL,
-                         "duplicate part %d of %d part multipart message",
+               inform("duplicate part %d of %d part multipart message, continuing...",
                          pm->pm_marked, hi);
                continue;
            }

diff --git a/uip/picksbr.c b/uip/picksbr.c
index c8444e0..e6108ef 100644 (file)
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -810,7 +810,7 @@ advance (char *alp, char *aep)
                return 0;
 
            default: 
-               admonish (NULL, "advance() botch -- you lose big");
+               inform("advance() botch -- you lose big, continuing...");
                return 0;
        }
 }

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 7a96658..b255afa 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -129,7 +129,7 @@ main (int argc, char **argv)
        sleep (5);
     switch (child_id) {
        case NOTOK: 
-           admonish (NULL, "unable to fork");
+           inform("unable to fork, continuing...");
            /* FALLTHRU */
        case OK: 
            execvp (program, vec);

diff --git a/uip/rmf.c b/uip/rmf.c
index ebe88fe..2d581a1 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -176,7 +176,7 @@ rmf (char *folder)
                        || has_prefix(dp->d_name, BACKUP_PREFIX))
                    break;
 
-               admonish (NULL, "file \"%s/%s\" not deleted",
+               inform("file \"%s/%s\" not deleted, continuing...",
                        folder, dp->d_name);
                others++;
                continue;
@@ -231,7 +231,8 @@ rma (char *folder)
                && *(np->n_name + j) == '-'
                && strcmp (cp, np->n_name + j + 1) == 0) {
            if (!np->n_context)
-               admonish (NULL, "bug: context_del(key=\"%s\")", np->n_name);
+               inform("bug: context_del(key=\"%s\"), continuing...",
+                   np->n_name);
            if (pp) {
                pp->n_next = np->n_next;
                np = pp;

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 1acb7dc..191f562 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -432,8 +432,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;
@@ -610,7 +610,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;
     }
 
@@ -664,7 +664,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);
@@ -675,20 +675,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... */
@@ -707,14 +707,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;

diff --git a/uip/sortm.c b/uip/sortm.c
index bd223bc..8aee4a9 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -390,7 +390,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
        case LENERR:
        case FMTERR:
            if (state == LENERR || state == FMTERR) {
-               admonish (NULL, "format error in message %d (header #%d)",
+               inform("format error in message %d (header #%d), continuing...",
                      msg, compnum);
                check_failed = 1;
            }