Use existing macros min() and max() more.

[nmh] / uip / inc.c

diff --git a/uip/inc.c b/uip/inc.c
index 0f7c4a0df1163283f2f999f60c86c7ad9ae15707..5ce18b624d0d772fcf0ac0e129ce035729d29344 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -1,6 +1,4 @@
-
-/*
- * inc.c -- incorporate messages from a maildrop into a folder
+/* inc.c -- incorporate messages from a maildrop into a folder
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -186,10 +184,12 @@ maildir_srt(const void *va, const void *vb)
 int
 main (int argc, char **argv)
 {
-    int chgflag = 1, trnflag = 1;
-    int noisy = 1, width = -1;
+    bool chgflag;
+    int trnflag = 1;
+    bool noisy;
+    int width = -1;
     int hghnum = 0, msgnum = 0;
-    int sasl = 0, tls = 0, noverify = 1;
+    bool sasl, tls, noverify;
     int incerr = 0; /* <0 if inc hits an error which means it should not truncate mailspool */
     char *cp, *maildir = NULL, *folder = NULL;
     char *format = NULL, *form = NULL;
@@ -234,6 +234,8 @@ main (int argc, char **argv)
     if (pophost && *pophost)
        host = pophost;
 
+    sasl = tls = false;
+    chgflag = noisy = noverify = true;
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {
@@ -261,10 +263,10 @@ main (int argc, char **argv)
                continue;
 
            case CHGSW:
-               chgflag++;
+                chgflag = true;
                continue;
            case NCHGSW:
-               chgflag = 0;
+                chgflag = false;
                continue;
 
            /*
@@ -295,10 +297,10 @@ main (int argc, char **argv)
                continue;
 
            case SILSW:
-               noisy = 0;
+                noisy = false;
                continue;
            case NSILSW:
-               noisy++;
+                noisy = true;
                continue;
 
            case FORMSW:
@@ -346,10 +348,10 @@ main (int argc, char **argv)
                continue;
        
            case SASLSW:
-               sasl++;
+                sasl = true;
                continue;
            case NOSASLSW:
-               sasl = 0;
+                sasl = false;
                continue;
        
            case SASLMECHSW:
@@ -358,19 +360,19 @@ main (int argc, char **argv)
                continue;
 
            case INITTLSSW:
-               tls++;
+                tls = true;
                continue;
 
            case NOTLSSW:
-               tls = 0;
+                tls = false;
                continue;
 
            case CERTVERSW:
-               noverify = 0;
+                noverify = false;
                continue;
 
            case NOCERTVERSW:
-               noverify++;
+                noverify = true;
                continue;
 
            case AUTHSERVICESW:
@@ -404,7 +406,7 @@ main (int argc, char **argv)
     if (host && !*host)
        host = NULL;
 
-    /* guarantee dropping group priveleges; we might not have done so earlier */
+    /* guarantee dropping group privileges; we might not have done so earlier */
     DROPGROUPPRIVS();
 
     /*
@@ -587,7 +589,7 @@ go_to_it:
     if (audfile) {
        int i;
        if ((i = stat (audfile, &st)) == NOTOK)
-           advise (NULL, "Creating Receive-Audit: %s", audfile);
+           inform("Creating Receive-Audit: %s", audfile);
        if ((aud = fopen (audfile, "a")) == NULL)
            adios (audfile, "unable to append to");
        else if (i == NOTOK)
@@ -762,15 +764,15 @@ go_to_it:
            case SCNERR:
                if (aud)
                    fputs ("inc aborted!\n", aud);
-               advise (NULL, "aborted!");      /* doesn't clean up locks! */
+               inform("aborted!");     /* doesn't clean up locks! */
                break;
 
            case SCNNUM:
-               advise (NULL, "BUG in %s, number out of range", invo_name);
+               inform("BUG in %s, number out of range", invo_name);
                break;
 
            default:
-               advise (NULL, "BUG in %s, scan() botch (%d)", invo_name, incerr);
+               inform("BUG in %s, scan() botch (%d)", invo_name, incerr);
                break;
 
            case SCNMSG:
@@ -917,7 +919,7 @@ go_to_it:
     if (inc_type == INC_FILE && Maildir == NULL) {
        if (trnflag) {
            if (stat (newmail, &st) != NOTOK && s1.st_mtime != st.st_mtime)
-               advise (NULL, "new messages have arrived!\007");
+               inform("new messages have arrived!\007");
            else {
                int newfd;
                if ((newfd = creat (newmail, 0600)) != NOTOK)
@@ -933,7 +935,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 +948,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;
        }
 
@@ -956,7 +958,7 @@ go_to_it:
 
        if (msgnum >= mp2->hghoff
                && !(mp2 = folder_realloc (mp2, mp2->lowoff, msgnum + 1))) {
-           advise (NULL, "unable to reallocate folder storage");
+           inform("unable to reallocate folder storage");
            goto skip;
        }