test-nocreate: Don't use run_test and run_prog together.

[nmh] / uip / post.c

diff --git a/uip/post.c b/uip/post.c
index d40f55efb1b1d18df07b17f652228b2f07c925b8..9940fa71f3e6700b07edf5479a969cb85bce0667 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -750,7 +750,7 @@ main (int argc, char **argv)
        if (partno)
            printf ("Partial Message #%s Processed\n", partno);
        else
-           printf ("Message Processed\n");
+           puts("Message Processed");
     }
 
     done (0);
@@ -785,7 +785,7 @@ putfmt (char *name, char *str, int *eai, FILE *out)
            If it does, enable EAI support. */
         if (contains8bit(str, NULL)) {
             if (verbose) {
-                printf ("EAI/SMTPUTF8 enabled\n");
+                puts("EAI/SMTPUTF8 enabled");
             }
 
             /* Enable SMTPUTF8. */
@@ -804,8 +804,7 @@ putfmt (char *name, char *str, int *eai, FILE *out)
               should never have reached this point.  Warn about any
               that are non-empty. */
            if (strcmp (str, "\n")) {
-               char *newline = strchr (str, '\n');
-               if (newline) *newline = '\0';
+                TrimSuffixC(str, '\n');
                if (! whomsw) {
                    advise (NULL, "ignoring header line -- %s: %s", name, str);
                }
@@ -1042,7 +1041,7 @@ putfmt (char *name, char *str, int *eai, FILE *out)
         * Strip off any trailing newlines
         */
 
-       while (strlen(fullfrom) > 0 && fullfrom[strlen(fullfrom) - 1] == '\n') {
+       while (*fullfrom && fullfrom[strlen(fullfrom) - 1] == '\n') {
            fullfrom[strlen(fullfrom) - 1] = '\0';
        }
     }
@@ -1334,7 +1333,7 @@ pl (void)
     printf ("\n\t-- Folder Copies --\nfcc:\t");
     for (i = 0; i < fccind; i++)
        printf ("%s%s", fccfold[i], i + 1 < fccind ? ",\n\t" : "");
-    printf ("\n");
+    putchar('\n');
 }
 
 
@@ -1528,7 +1527,7 @@ find_prefix (void)
     if ((in = fopen (tmpfil, "r")) == NULL)
        adios (tmpfil, "unable to re-open");
 
-    while (fgets (buffer, sizeof(buffer) - 1, in))
+    while (fgets (buffer, sizeof buffer, in))
        if (buffer[0] == '-' && buffer[1] == '-') {
            char *cp;
 
@@ -1573,7 +1572,7 @@ do_addresses (int bccque, int talk)
     for (lp = localaddrs.m_next; lp; lp = lp->m_next)
        if (lp->m_bcc ? bccque : !bccque) {
            if (talk && !state)
-               printf ("  -- Local Recipients --\n");
+               puts("  -- Local Recipients --");
            do_an_address (lp, talk);
            state++;
        }
@@ -1582,7 +1581,7 @@ do_addresses (int bccque, int talk)
     for (lp = uuaddrs.m_next; lp; lp = lp->m_next)
        if (lp->m_bcc ? bccque : !bccque) {
            if (talk && !state)
-               printf ("  -- UUCP Recipients --\n");
+               puts("  -- UUCP Recipients --");
            do_an_address (lp, talk);
            state++;
        }
@@ -1591,7 +1590,7 @@ do_addresses (int bccque, int talk)
     for (lp = netaddrs.m_next; lp; lp = lp->m_next)
        if (lp->m_bcc ? bccque : !bccque) {
            if (talk && !state)
-               printf ("  -- Network Recipients --\n");
+               puts("  -- Network Recipients --");
            do_an_address (lp, talk);
            state++;
        }
@@ -1624,7 +1623,7 @@ post (char *file, int bccque, int talk, int eai, char *envelope,
            printf (" -- Posting for %s Recipients --\n",
                    bccque ? "Blind" : "Sighted");
        else
-           printf (" -- Posting for All Recipients --\n");
+           puts(" -- Posting for All Recipients --");
     }
 
     sigon ();
@@ -1700,7 +1699,7 @@ post (char *file, int bccque, int talk, int eai, char *envelope,
                printf (" -- %s Recipient Copies Posted --\n",
                        bccque ? "Blind" : "Sighted");
             else
-               printf (" -- Recipient Copies Posted --\n");
+               puts(" -- Recipient Copies Posted --");
         }
 
         fflush (stdout);
@@ -1732,25 +1731,25 @@ verify_all_addresses (int talk, int eai, char *envelope, int oauth_flag,
     }
 
     if (talk && !whomsw)
-       printf (" -- Address Verification --\n");
+       puts(" -- Address Verification --");
     if (talk && localaddrs.m_next)
-       printf ("  -- Local Recipients --\n");
+       puts("  -- Local Recipients --");
     for (lp = localaddrs.m_next; lp; lp = lp->m_next)
        do_an_address (lp, talk);
 
     if (talk && uuaddrs.m_next)
-       printf ("  -- UUCP Recipients --\n");
+       puts("  -- UUCP Recipients --");
     for (lp = uuaddrs.m_next; lp; lp = lp->m_next)
        do_an_address (lp, talk);
 
     if (talk && netaddrs.m_next)
-       printf ("  -- Network Recipients --\n");
+       puts("  -- Network Recipients --");
     for (lp = netaddrs.m_next; lp; lp = lp->m_next)
        do_an_address (lp, talk);
 
     chkadr ();
     if (talk && !whomsw)
-       printf (" -- Address Verification Successful --\n");
+       puts(" -- Address Verification Successful --");
 
     if (!whomsw || checksw)
        sm_end (DONE);
@@ -1802,7 +1801,7 @@ do_an_address (struct mailname *lp, int talk)
                         lp->m_type != UUCPHOST ? lp->m_path : NULL)) {
        case RP_OK: 
            if (talk)
-               printf ("address ok\n");
+               puts("address ok");
            break;
 
        case RP_NO: 
@@ -1912,11 +1911,11 @@ p_refile (char *file)
        return;
 
     if (verbose)
-       printf (" -- Filing Folder Copies --\n");
+       puts(" -- Filing Folder Copies --");
     for (i = 0; i < fccind; i++)
        fcc (file, fccfold[i]);
     if (verbose)
-       printf (" -- Folder Copies Filed --\n");
+       puts(" -- Folder Copies Filed --");
 }
 
 
@@ -1971,7 +1970,7 @@ fcc (char *file, char *folder)
                pidstatus (status, verbose ? stdout : stderr, NULL);
            } else {
                if (verbose)
-                   printf ("folder ok\n");
+                   puts("folder ok");
            }
     }