X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/aaf014c77a4fb19bdc33370f5b6af5b8497decf8..d404c6fa5232e0e8ed10ee90c261b50d60fd08ea:/uip/inc.c

diff --git a/uip/inc.c b/uip/inc.c
index 8a71eb22..83b6ec96 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -511,7 +511,7 @@ main (int argc, char **argv)
  	    qsort (Maildir, num_maildir_entries, sizeof(*Maildir), maildir_srt);
  	}
 
-	if ((cp = strdup(newmail)) == (char *)0)
+	if ((cp = strdup(newmail)) == NULL)
 	    adios (NULL, "error allocating memory to copy newmail");
 
 	newmail = cp;
@@ -527,7 +527,7 @@ main (int argc, char **argv)
 	folder = getfolder (0);
     maildir = m_maildir (folder);
 
-    if ((maildir_copy = strdup(maildir)) == (char *)0)
+    if ((maildir_copy = strdup(maildir)) == NULL)
         adios (maildir, "error allocating memory to copy maildir");
 
     if (!folder_exists(maildir)) {
@@ -634,12 +634,14 @@ go_to_it:
 
 	    msgnum++;
 	    if (packfile) {
+                size_t len;
+
 		fseek (pf, 0L, SEEK_CUR);
 		pos = ftell (pf);
 		size = 0;
-		if (fwrite (mmdlm1, 1, strlen (mmdlm1), pf) < strlen (mmdlm1)) {
+                len = strlen(mmdlm1);
+		if (fwrite(mmdlm1, 1, len, pf) < len)
 		    advise (mmdlm1, "fwrite");
-		}
 		start = ftell (pf);
 
 		if (pop_retr (i, pop_pack) == NOTOK)
@@ -651,7 +653,7 @@ go_to_it:
 		    adios (packfile, "write error on");
 		fseek (pf, start, SEEK_SET);
 	    } else {
-		cp = getcpy (m_name (msgnum));
+		cp = mh_xstrdup(m_name (msgnum));
 		if ((pf = fopen (cp, "w+")) == NULL)
 		    adios (cp, "unable to write");
 		chmod (cp, m_gmprot ());
@@ -693,10 +695,12 @@ go_to_it:
 	    charstring_free (scanl);
 
 	    if (packfile) {
+                size_t len;
+
 		fseek (pf, stop, SEEK_SET);
-		if (fwrite (mmdlm2, 1, strlen (mmdlm2), pf) < strlen (mmdlm1)) {
+                len = strlen(mmdlm2);
+		if (fwrite(mmdlm2, 1, len, pf) < len)
 		    advise (mmdlm2, "fwrite");
-		}
 		if (fflush (pf) || ferror (pf)) {
 		    int e = errno;
 		    pop_quit ();
@@ -767,7 +771,7 @@ go_to_it:
 		 */
 
 		(void)snprintf(b, sizeof (b), "%s/%d", maildir_copy, msgnum + 1);
-		(void)ext_hook("add-hook", b, (char *)0);
+		(void)ext_hook("add-hook", b, NULL);
 
 		if (aud)
 		    fputs (charstring_buffer (scanl), aud);
@@ -796,7 +800,7 @@ go_to_it:
 	    msgnum++;
 
 	    sp = Maildir[i].filename;
-	    cp = getcpy (m_name (msgnum));
+	    cp = mh_xstrdup(m_name (msgnum));
 	    pf = NULL;
 	    if (!trnflag || link(sp, cp) == -1) {
 		static char buf[65536];
@@ -848,7 +852,7 @@ go_to_it:
 		 */
 
 		(void)snprintf(b, sizeof (b), "%s/%d", maildir_copy, msgnum + 1);
-		(void)ext_hook("add-hook", b, (char *)0);
+		(void)ext_hook("add-hook", b, NULL);
 
 		if (aud)
 		    fputs (charstring_buffer (scanl), aud);