X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b4b6a38aefa551bce57d1d5fbb31cf5430a40c21..39a9d9d85d0f2289d8c1257251311b7cf959c700:/uip/dropsbr.c

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index 937ff827..bf16b60f 100644
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -350,7 +350,7 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
 		     * Change the "Return-Path:" field (if in first line)
 		     * back to "From ".
 		     */
-                    if (HasPrefix(buffer, "Return-Path:")) {
+                    if (has_prefix(buffer, "Return-Path:")) {
 			char tmpbuffer[BUFSIZ];
 			char *tp, *ep, *fp;
 
@@ -361,7 +361,7 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
 			tp = dctime(dlocaltimenow());
 			snprintf (buffer, sizeof(buffer), "From %.*s  %s",
 				(int)(fp - ep), ep, tp);
-		    } else if (HasPrefix(buffer, "X-Envelope-From:")) {
+		    } else if (has_prefix(buffer, "X-Envelope-From:")) {
 			/*
 			 * Change the "X-Envelope-From:" field
 			 * (if first line) back to "From ".
@@ -372,7 +372,7 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
 			strncpy(tmpbuffer, buffer, sizeof(tmpbuffer));
 			ep = tmpbuffer + 17;
 			snprintf (buffer, sizeof(buffer), "From %s", ep);
-		    } else if (!HasPrefix(buffer, "From ")) {
+		    } else if (!has_prefix(buffer, "From ")) {
 			/*
 			 * If there is already a "From " line,
 			 * then leave it alone.  Else we add one.
@@ -391,7 +391,7 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
 		 * If this is not first line, and begins with
 		 * "From ", then prepend line with ">".
 		 */
-		if (j != 0 && HasPrefix(buffer, "From ")) {
+		if (j != 0 && has_prefix(buffer, "From ")) {
 		    if (write (md, ">", 1) < 0) {
 			advise (mailbox, "write");
 		    }
@@ -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;
     }