X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5cb3431b8210554b89425d60b3c0aa4f521b7414..c687e5bdd1da1a27b72cc9a4e94a1a2641fcf0d5:/uip/inc.c

diff --git a/uip/inc.c b/uip/inc.c
index b32b3e1f..8650b8b0 100644
--- 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
@@ -524,9 +522,7 @@ main (int argc, char **argv)
  	    qsort (Maildir, num_maildir_entries, sizeof(*Maildir), maildir_srt);
  	}
 
-	if ((cp = strdup(newmail)) == NULL)
-	    adios (NULL, "error allocating memory to copy newmail");
-
+	cp = mh_xstrdup(newmail);
 	newmail = cp;
     }
 
@@ -539,9 +535,7 @@ main (int argc, char **argv)
     if (!folder)
 	folder = getfolder (0);
     maildir = m_maildir (folder);
-
-    if ((maildir_copy = strdup(maildir)) == NULL)
-        adios (maildir, "error allocating memory to copy maildir");
+    maildir_copy = mh_xstrdup(maildir);
 
     if (!folder_exists(maildir)) {
         /* If the folder doesn't exist, and we're given the -silent flag,
@@ -591,7 +585,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)
@@ -690,7 +684,7 @@ go_to_it:
 		trnflag = 0;
 		noisy++;
 		/* advise (cp, "unable to read"); already advised */
-		/* fall thru */
+		/* FALLTHRU */
 
 	    case SCNERR:
 	    case SCNNUM:
@@ -766,15 +760,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:
@@ -851,7 +845,7 @@ go_to_it:
 		trnflag = 0;
 		noisy++;
 		/* advise (cp, "unable to read"); already advised */
-		/* fall thru */
+		/* FALLTHRU */
 
 	    case SCNERR:
 	    case SCNNUM:
@@ -921,7 +915,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)
@@ -937,7 +931,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
@@ -950,7 +944,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;
 	}
 
@@ -960,7 +954,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;
 	}