X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/f9aee0f150e0d4bb93d1c8af5af2878423c81b04..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 5dae9fd7..7e01b050 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -330,7 +330,15 @@ get_content (FILE *in, char *file, int toplevel)
 	    continue;
 
 	case BODY:
-	    ct->c_begin = ftell (in) - strlen (buf);
+	    if (name[0] == ':') {
+		/* Special case:  no blank line between header and body.  The
+		   file position indicator is on the newline at the end of the
+		   line, but it needs to be one prior to the beginning of the
+		   line.  So subtract the length of the line, bufsz, plus 1. */
+		ct->c_begin = ftell (in) - (bufsz + 1);
+	    } else {
+		ct->c_begin = ftell (in) - (bufsz - 1);
+	    }
 	    break;
 
 	case FILEEOF:
@@ -649,11 +657,7 @@ get_ctinfo (char *cp, CT ct, int magic)
 		TYPE_FIELD, ct->c_file);
 	return NOTOK;
     }
-
-    /* down case the content type string */
-    for (dp = ci->ci_type; *dp; dp++)
-	if (isalpha((unsigned char) *dp) && isupper ((unsigned char) *dp))
-	    *dp = tolower ((unsigned char) *dp);
+    ToLower(ci->ci_type);
 
     while (isspace ((unsigned char) *cp))
 	cp++;
@@ -688,11 +692,7 @@ get_ctinfo (char *cp, CT ct, int magic)
 		TYPE_FIELD, ct->c_file, ci->ci_type);
 	return NOTOK;
     }
-
-    /* down case the content subtype string */
-    for (dp = ci->ci_subtype; *dp; dp++)
-	if (isalpha((unsigned char) *dp) && isupper ((unsigned char) *dp))
-	    *dp = tolower ((unsigned char) *dp);
+    ToLower(ci->ci_subtype);
 
 magic_skip:
     while (isspace ((unsigned char) *cp))
@@ -712,10 +712,8 @@ magic_skip:
      * Get any <Content-Id> given in buffer
      */
     if (magic && *cp == '<') {
-	if (ct->c_id) {
-	    free (ct->c_id);
-	    ct->c_id = NULL;
-	}
+        mh_xfree(ct->c_id);
+        ct->c_id = NULL;
 	if (!(dp = strchr(ct->c_id = ++cp, '>'))) {
 	    advise (NULL, "invalid ID in message %s", ct->c_file);
 	    return NOTOK;
@@ -1222,7 +1220,7 @@ end_part:
 		continue;
 	    *next = NULL;
 	    free_content (p);
-	    free ((char *) part);
+	    free(part);
 	}
     }
 
@@ -1834,7 +1832,7 @@ openBase64 (CT ct, char **file)
         for (i = 0; i < decoded_len; ++i) {
             putc (*decoded_p++, ce->ce_fp);
         }
-        free ((char *) decoded);
+        free(decoded);
         if (ferror (ce->ce_fp)) {
             content_error (ce->ce_file, ct, "error writing to");
             goto clean_up;
@@ -2742,8 +2740,7 @@ openMail (CT ct, char **file)
 
     /* showproc is for mhshow and mhstore, though mhlist -debug
      * prints it, too. */
-    if (ct->c_showproc)
-	free (ct->c_showproc);
+    mh_xfree(ct->c_showproc);
     ct->c_showproc = add ("true", NULL);
 
     fseek (ce->ce_fp, 0L, SEEK_SET);
@@ -3291,8 +3288,7 @@ parse_header_attrs (const char *filename, const char *fieldname,
 
 	/* down case the attribute name */
 	for (dp = cp; istoken ((unsigned char) *dp); dp++)
-	    if (isalpha((unsigned char) *dp) && isupper ((unsigned char) *dp))
-		*dp = tolower ((unsigned char) *dp);
+            *dp = tolower ((unsigned char) *dp);
 
 	for (up = dp; isspace ((unsigned char) *dp);)
 	    dp++;
@@ -3401,8 +3397,7 @@ parse_header_attrs (const char *filename, const char *fieldname,
 			   "field\n%*s(parameter %s)", filename, fieldname,
 			   strlen(invo_name) + 2, "", nameptr);
 		    free(nameptr);
-		    if (charset)
-			free(charset);
+                    mh_xfree(charset);
 		    return NOTOK;
 		}
 
@@ -3427,10 +3422,8 @@ parse_header_attrs (const char *filename, const char *fieldname,
 			       filename, fieldname, strlen(invo_name) + 2,
 			       "", nameptr);
 			free(nameptr);
-			if (charset)
-			    free(charset);
-			if (lang)
-			    free(lang);
+                        mh_xfree(charset);
+                        mh_xfree(lang);
 			return NOTOK;
 		    }
 		    vp += 2;
@@ -3473,10 +3466,8 @@ bad_quote:
 				filename, fieldname, strlen(invo_name) + 2, "",
 				nameptr);
 			free(nameptr);
-			if (charset)
-			    free(charset);
-			if (lang)
-			    free(lang);
+                        mh_xfree(charset);
+                        mh_xfree(lang);
 			return NOTOK;
 		    case '"':
 			break;
@@ -3584,11 +3575,9 @@ bad_quote:
 	     */
 
 	    if (index == 0 && encoded) {
-		if (pp->charset)
-		    free(pp->charset);
+                mh_xfree(pp->charset);
 	    	pp->charset = charset;
-		if (pp->lang)
-		    free(pp->lang);
+                mh_xfree(pp->lang);
 		pp->lang = lang;
 	    }
 	} else {
@@ -3688,8 +3677,7 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
 
 	if (strlen(params->pm_name) > CPERLIN) {
 	    advise(NULL, "Parameter name \"%s\" is too long", params->pm_name);
-	    if (paramout)
-		free(paramout);
+            mh_xfree(paramout);
 	    return NULL;
 	}
 
@@ -3726,8 +3714,7 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
 				 numchars, valoff);
 
 	    if (i == 0) {
-		if (paramout)
-		    free(paramout);
+                mh_xfree(paramout);
 		return NULL;
 	    }
 
@@ -3790,8 +3777,7 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
 	    		     strlen(params->pm_value + valoff), valoff);
 
 	if (i == 0) {
-	    if (paramout)
-		free(paramout);
+            mh_xfree(paramout);
 	    return NULL;
 	}
 
@@ -4243,6 +4229,10 @@ noiconv:
     q = buffer;
     bufsize = sizeof(buffer);
     for (p = pm->pm_value; *p != '\0' && bufsize > 1; p++, q++, bufsize--) {
+        /* FIXME: !iscntrl should perhaps be isprint as that allows all
+         * classes bar cntrl, whereas the cntrl class can include those
+         * in space and blank.
+         * http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap07.html */
 	if (isascii((unsigned char) *p) && !iscntrl((unsigned char) *p))
 	    *q = *p;
 	else