X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/19bf8698eeb0ab3d7694232af115fa3f007d5c7b..182be454d9028f166fcfb0f2c41104c59641a826:/uip/dropsbr.c

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index 915e71e6..0d87a06d 100644
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -80,8 +80,12 @@ mbx_open (char *file, int mbx_style, uid_t uid, gid_t gid, mode_t mode)
 	 * The stat failed.  So we make sure file
 	 * has right ownership/modes
 	 */
-	chown (file, uid, gid);
-	chmod (file, mode);
+	if (chown (file, uid, gid) < 0) {
+	    advise (file, "chown");
+	}
+	if (chmod (file, mode) < 0) {
+	    advise (file, "chmod");
+	}
     } else if (st.st_size > (off_t) 0) {
 	int status;
 
@@ -152,7 +156,7 @@ mbx_chk_mmdf (int fd)
 
 
 int
-mbx_read (FILE *fp, long pos, struct drop **drops, int noisy)
+mbx_read (FILE *fp, long pos, struct drop **drops)
 {
     register int len, size;
     register long ld1, ld2;
@@ -160,12 +164,8 @@ mbx_read (FILE *fp, long pos, struct drop **drops, int noisy)
     char buffer[BUFSIZ];
     register struct drop *cp, *dp, *ep, *pp;
 
-    pp = (struct drop *) calloc ((size_t) (len = MAXFOLDER), sizeof(*dp));
-    if (pp == NULL) {
-	if (noisy)
-	    admonish (NULL, "unable to allocate drop storage");
-	return NOTOK;
-    }
+    len = MAXFOLDER;
+    pp = mh_xcalloc(len, sizeof *pp);
 
     ld1 = (long) strlen (mmdlm1);
     ld2 = (long) strlen (mmdlm2);
@@ -237,9 +237,9 @@ mbx_write(char *mailbox, int md, FILE *fp, int id, long last,
     fseek (fp, pos, SEEK_SET);
     while (fgets (buffer, sizeof(buffer), fp) && (pos < stop)) {
 	i = strlen (buffer);
-	for (j = 0; (j = stringdex (mmdlm1, buffer)) >= 0; buffer[j]++)
+	for ( ; (j = stringdex (mmdlm1, buffer)) >= 0; buffer[j]++)
 	    continue;
-	for (j = 0; (j = stringdex (mmdlm2, buffer)) >= 0; buffer[j]++)
+	for ( ; (j = stringdex (mmdlm2, buffer)) >= 0; buffer[j]++)
 	    continue;
 	if (write (md, buffer, i) != i)
 	    return NOTOK;
@@ -300,13 +300,9 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
                    termination. */
                 buffer[i] = '\0';
 
-		for (j = 0;
-			(j = stringdex (mmdlm1, buffer)) >= 0;
-			buffer[j]++)
+		for ( ;	(j = stringdex (mmdlm1, buffer)) >= 0; buffer[j]++)
 		    continue;
-		for (j = 0;
-			(j = stringdex (mmdlm2, buffer)) >= 0;
-			buffer[j]++)
+		for ( ;	(j = stringdex (mmdlm2, buffer)) >= 0; buffer[j]++)
 		    continue;
 		if (write (md, buffer, i) != i)
 		    return NOTOK;
@@ -396,7 +392,9 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
 		 * "From ", then prepend line with ">".
 		 */
 		if (j != 0 && strncmp (buffer, "From ", 5) == 0) {
-		    write (md, ">", 1);
+		    if (write (md, ">", 1) < 0) {
+			advise (mailbox, "write");
+		    }
 		    size++;
 		}
 		i = strlen (buffer);
@@ -502,12 +500,7 @@ map_read (char *file, long pos, struct drop **drops, int noisy)
     }
 
     msgp = mp->d_id;
-    dp = (struct drop *) calloc ((size_t) (msgp + 1), sizeof(*dp));
-    if (dp == NULL) {
-	close (md);
-	return 0;
-    }
-
+    dp = mh_xcalloc(msgp + 1, sizeof *dp);
     memcpy((char *) dp, (char *) mp, sizeof(*dp));
 
     lseek (md, (off_t) sizeof(*mp), SEEK_SET);
@@ -574,7 +567,7 @@ map_write (char *mailbox, int md, int id, long last, off_t start,
 	    return NOTOK;
 	}
 
-	switch (i = mbx_read (fp, 0, &rp, noisy)) {
+	switch (i = mbx_read (fp, 0, &rp)) {
 	    case NOTOK:
 		fclose (fp);
 		mbx_close (file, fd);