File nmh-warnings.patch of Package nmh

Overview Repositories Revisions Requests Users Attributes Meta

File nmh-warnings.patch of Package nmh

--- h/nmh.h
+++ h/nmh.h
@@ -113,9 +113,13 @@
 #include <signal.h>
  
 #define bcmp(b1,b2,length)      memcmp(b1, b2, length)
+#ifndef bcopy
 #define bcopy(b1,b2,length)     memcpy (b2, b1, length)
+#endif
 #define bcpy(b1,b2,length)      memcmp (b1, b2, length)
+#ifndef bzero
 #define bzero(b,length)         memset (b, 0, length)
+#endif
 
 #ifdef HAVE_KILLPG
 # define KILLPG(pgrp,sig) killpg(pgrp,sig);
--- sbr/addrsbr.c
+++ sbr/addrsbr.c
@@ -105,6 +105,7 @@
     note = ap->note;
     if (ap->err && *ap->err)
 	strncpy (err, ap->err, sizeof(err));
+    err[sizeof(err)-1] = '\0';
 
     return adr;
 }
@@ -119,7 +120,7 @@
     char *dp;
 #endif /* not DUMB */
 
-    if (err && err[0]) {
+    if (err[0]) {
 	if (eresult)
 	    strcpy (eresult, err);
 	else
--- sbr/getans.c
+++ sbr/getans.c
@@ -30,9 +30,8 @@
     SIGNAL_HANDLER istat = NULL;
     char *cp, **cpp;
 
-    if (!(setjmp (sigenv))) {
-	istat = SIGNAL (SIGINT, intrser);
-    } else {
+    istat = SIGNAL (SIGINT, intrser);
+    if (setjmp (sigenv)) {
 	SIGNAL (SIGINT, istat);
 	return NULL;
     }
--- uip/inc.c
+++ uip/inc.c
@@ -545,7 +545,7 @@
 	    adios (NULL, "no mail to incorporate");
 
 	if ((cp = strdup(newmail)) == (char *)0)
-	    adios (maildir, "error allocating memory to copy newmail");
+	    adios (newmail, "error allocating memory to copy newmail");
 
 	newmail = cp;
     }
@@ -582,6 +582,19 @@
     if (!(mp = folder_read (folder)))
 	adios (NULL, "unable to read folder %s", folder);
 
+#ifdef MHE
+    if (context_find ("mhe")) {
+	cp = concat (maildir, "/++", NULL);
+	i = stat (cp, &st);
+	if ((mhe = fopen (cp, "a")) == NULL)
+	    admonish (cp, "unable to append to");
+	else
+	    if (i == NOTOK)
+		chmod (cp, m_gmprot ());
+	free (cp);
+    }
+#endif /* MHE */
+
 #ifdef POP
 go_to_it:
 #endif /* POP */
@@ -632,19 +645,6 @@
 #endif /* POP */
     }
 
-#ifdef MHE
-    if (context_find ("mhe")) {
-	cp = concat (maildir, "/++", NULL);
-	i = stat (cp, &st);
-	if ((mhe = fopen (cp, "a")) == NULL)
-	    admonish (cp, "unable to append to");
-	else
-	    if (i == NOTOK)
-		chmod (cp, m_gmprot ());
-	free (cp);
-    }
-#endif /* MHE */
-
     /* Get new format string */
     nfs = new_fs (form, format, FORMAT);
 
--- uip/mhbuildsbr.c
+++ uip/mhbuildsbr.c
@@ -3706,10 +3706,10 @@
 scan_content (CT ct)
 {
     int len;
-    int check8bit, contains8bit = 0;	  /* check if contains 8bit data                */
-    int checklinelen, linelen = 0;	  /* check for long lines                       */
-    int checkboundary, boundaryclash = 0; /* check if clashes with multipart boundary   */
-    int checklinespace, linespace = 0;	  /* check if any line ends with space          */
+    int check8bit = 0, contains8bit = 0;	  /* check if contains 8bit data                */
+    int checklinelen = 0, linelen = 0;	  /* check for long lines                       */
+    int checkboundary = 0, boundaryclash = 0; /* check if clashes with multipart boundary   */
+    int checklinespace = 0, linespace = 0;	  /* check if any line ends with space          */
     int checkebcdic, ebcdicunsafe = 0;	  /* check if contains ebcdic unsafe characters */
     unsigned char *cp, buffer[BUFSIZ];
     struct text *t;

Places

File nmh-warnings.patch of Package nmh

Places