X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1c91be5784ddebaa6a54f1f2c42a8016f10af6de..c87ca5cca:/uip/dropsbr.c?ds=sidebyside

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index 915e71e6..f6d67a08 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;
 
@@ -160,7 +164,7 @@ 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));
+    pp = (struct drop *) mh_xcalloc ((size_t) (len = MAXFOLDER), sizeof(*dp));
     if (pp == NULL) {
 	if (noisy)
 	    admonish (NULL, "unable to allocate drop storage");
@@ -237,9 +241,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 +304,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 +396,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,7 +504,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));
+    dp = (struct drop *) mh_xcalloc ((size_t) (msgp + 1), sizeof(*dp));
     if (dp == NULL) {
 	close (md);
 	return 0;