X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhparse.c;h=8cfa89980ee9e37d8fee9a61104ab107124f5aaa;hb=e69044f7624abe5cb2cb796d528c0cc5f29515f7;hp=e151062c488236a3c8c497fc7b2cd231e3587d55;hpb=88b27ae07f694e90637c2a852b754539c2f70172;p=mmh

diff --git a/uip/mhparse.c b/uip/mhparse.c
index e151062..8cfa899 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -22,8 +22,6 @@
 
 extern int debugsw;
 
-extern int endian;	/* mhmisc.c     */
-
 extern pid_t xpid;	/* mhshowsbr.c  */
 
 /* cache policies */
@@ -48,11 +46,7 @@ struct k2v SubText[] = {
     { NULL,       TEXT_UNKNOWN }    /* this one must be last! */
 };
 
-struct k2v Charset[] = {
-    { "us-ascii",   CHARSET_USASCII },
-    { "iso-8859-1", CHARSET_LATIN },
-    { NULL,         CHARSET_UNKNOWN }  /* this one must be last! */
-};
+/* Charset[] removed -- yozo.  Mon Oct  8 01:03:41 JST 2012 */
 
 /*
  * Structures for MULTIPART messages
@@ -85,16 +79,12 @@ struct k2v SubApplication[] = {
 };
 
 
-/* ftpsbr.c */
-int ftp_get (char *, char *, char *, char *, char *, char *, int, int);
-
 /* mhcachesbr.c */
 int find_cache (CT, int, int *, char *, char *, int);
 
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
-int make_intermediates (char *);
 void content_error (char *, CT, char *, ...);
 
 /* mhfree.c */
@@ -1083,14 +1073,8 @@ InitText (CT ct)
 
     /* check if content specified a character set */
     if (*ap) {
-	/* match character set or set to CHARSET_UNKNOWN */
-	for (kv = Charset; kv->kv_key; kv++) {
-	    if (!mh_strcasecmp (*ep, kv->kv_key)) {
-		chset = *ep;
-		break;
-	    }
-	}
-	t->tx_charset = kv->kv_value;
+	chset = *ep;
+	t->tx_charset = CHARSET_SPECIFIED;
     } else {
 	t->tx_charset = CHARSET_UNSPECIFIED;
     }
@@ -1731,9 +1715,9 @@ static int
 openBase64 (CT ct, char **file)
 {
     int	bitno, cc, digested;
-    int fd, len, skip;
-    unsigned long bits;
-    unsigned char value, *b, *b1, *b2, *b3;
+    int fd, len, skip, own_ct_fp = 0;
+    uint32_t bits;
+    unsigned char value, b;
     unsigned char *cp, *ep;
     char buffer[BUFSIZ];
     /* sbeck -- handle suffixes */
@@ -1741,11 +1725,6 @@ openBase64 (CT ct, char **file)
     CE ce;
     MD5_CTX mdContext;
 
-    b  = (unsigned char *) &bits;
-    b1 = &b[endian > 0 ? 1 : 2];
-    b2 = &b[endian > 0 ? 2 : 1];
-    b3 = &b[endian > 0 ? 3 : 0];
-
     ce = ct->c_cefile;
     if (ce->ce_fp) {
 	fseek (ce->ce_fp, 0L, SEEK_SET);
@@ -1780,8 +1759,8 @@ openBase64 (CT ct, char **file)
     }
     if (cp != NULL && *cp != '\0') {
         if (ce->ce_unlink) {
-            // Temporary file already exists, so we rename to
-            // version with extension.
+            /* Temporary file already exists, so we rename to
+               version with extension. */
             char *file_org = strdup(ce->ce_file);
             ce->ce_file = add (cp, ce->ce_file);
             if (rename(file_org, ce->ce_file)) {
@@ -1802,9 +1781,12 @@ openBase64 (CT ct, char **file)
     if ((len = ct->c_end - ct->c_begin) < 0)
 	adios (NULL, "internal error(1)");
 
-    if (!ct->c_fp && (ct->c_fp = fopen (ct->c_file, "r")) == NULL) {
-	content_error (ct->c_file, ct, "unable to open for reading");
-	return NOTOK;
+    if (! ct->c_fp) {
+	if ((ct->c_fp = fopen (ct->c_file, "r")) == NULL) {
+	    content_error (ct->c_file, ct, "unable to open for reading");
+	    return NOTOK;
+	}
+	own_ct_fp = 1;
     }
     
     if ((digested = ct->c_digested))
@@ -1851,17 +1833,20 @@ openBase64 (CT ct, char **file)
 		    bits |= value << bitno;
 test_end:
 		    if ((bitno -= 6) < 0) {
-			putc ((char) *b1, ce->ce_fp);
+		    	b = (bits >> 16) & 0xff;
+			putc ((char) b, ce->ce_fp);
 			if (digested)
-			    MD5Update (&mdContext, b1, 1);
+			    MD5Update (&mdContext, &b, 1);
 			if (skip < 2) {
-			    putc ((char) *b2, ce->ce_fp);
+			    b = (bits >> 8) & 0xff;
+			    putc ((char) b, ce->ce_fp);
 			    if (digested)
-				MD5Update (&mdContext, b2, 1);
+				MD5Update (&mdContext, &b, 1);
 			    if (skip < 1) {
-				putc ((char) *b3, ce->ce_fp);
+			    	b = bits & 0xff;
+				putc ((char) b, ce->ce_fp);
 				if (digested)
-				    MD5Update (&mdContext, b3, 1);
+				    MD5Update (&mdContext, &b, 1);
 			    }
 			}
 
@@ -1916,9 +1901,17 @@ self_delimiting:
 
 ready_to_go:
     *file = ce->ce_file;
+    if (own_ct_fp) {
+      fclose (ct->c_fp);
+      ct->c_fp = NULL;
+    }
     return fileno (ce->ce_fp);
 
 clean_up:
+    if (own_ct_fp) {
+      fclose (ct->c_fp);
+      ct->c_fp = NULL;
+    }
     free_encoding (ct, 0);
     return NOTOK;
 }
@@ -1958,7 +1951,7 @@ InitQuoted (CT ct)
 static int
 openQuoted (CT ct, char **file)
 {
-    int	cc, digested, len, quoted;
+    int	cc, digested, len, quoted, own_ct_fp = 0;
     unsigned char *cp, *ep;
     char buffer[BUFSIZ];
     unsigned char mask;
@@ -2001,8 +1994,8 @@ openQuoted (CT ct, char **file)
     }
     if (cp != NULL && *cp != '\0') {
         if (ce->ce_unlink) {
-            // Temporary file already exists, so we rename to
-            // version with extension.
+            /* Temporary file already exists, so we rename to
+               version with extension. */
             char *file_org = strdup(ce->ce_file);
             ce->ce_file = add (cp, ce->ce_file);
             if (rename(file_org, ce->ce_file)) {
@@ -2020,17 +2013,15 @@ openQuoted (CT ct, char **file)
 	return NOTOK;
     }
 
-    if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
-	content_error (ce->ce_file, ct, "unable to fopen for reading/writing");
-	return NOTOK;
-    }
-
     if ((len = ct->c_end - ct->c_begin) < 0)
 	adios (NULL, "internal error(2)");
 
-    if (!ct->c_fp && (ct->c_fp = fopen (ct->c_file, "r")) == NULL) {
-	content_error (ct->c_file, ct, "unable to open for reading");
-	return NOTOK;
+    if (! ct->c_fp) {
+	if ((ct->c_fp = fopen (ct->c_file, "r")) == NULL) {
+	    content_error (ct->c_file, ct, "unable to open for reading");
+	    return NOTOK;
+	}
+	own_ct_fp = 1;
     }
 
     if ((digested = ct->c_digested))
@@ -2152,10 +2143,18 @@ openQuoted (CT ct, char **file)
 
 ready_to_go:
     *file = ce->ce_file;
+    if (own_ct_fp) {
+      fclose (ct->c_fp);
+      ct->c_fp = NULL;
+    }
     return fileno (ce->ce_fp);
 
 clean_up:
     free_encoding (ct, 0);
+    if (own_ct_fp) {
+      fclose (ct->c_fp);
+      ct->c_fp = NULL;
+    }
     return NOTOK;
 }
 
@@ -2178,7 +2177,7 @@ Init7Bit (CT ct)
 int
 open7Bit (CT ct, char **file)
 {
-    int	cc, fd, len;
+    int	cc, fd, len, own_ct_fp = 0;
     char buffer[BUFSIZ];
     /* sbeck -- handle suffixes */
     char *cp;
@@ -2219,8 +2218,8 @@ open7Bit (CT ct, char **file)
     }
     if (cp != NULL && *cp != '\0') {
         if (ce->ce_unlink) {
-            // Temporary file already exists, so we rename to
-            // version with extension.
+            /* Temporary file already exists, so we rename to
+               version with extension. */
             char *file_org = strdup(ce->ce_file);
             ce->ce_file = add (cp, ce->ce_file);
             if (rename(file_org, ce->ce_file)) {
@@ -2288,9 +2287,12 @@ open7Bit (CT ct, char **file)
     if ((len = ct->c_end - ct->c_begin) < 0)
 	adios (NULL, "internal error(3)");
 
-    if (!ct->c_fp && (ct->c_fp = fopen (ct->c_file, "r")) == NULL) {
-	content_error (ct->c_file, ct, "unable to open for reading");
-	return NOTOK;
+    if (! ct->c_fp) {
+	if ((ct->c_fp = fopen (ct->c_file, "r")) == NULL) {
+	    content_error (ct->c_file, ct, "unable to open for reading");
+	    return NOTOK;
+	}
+	own_ct_fp = 1;
     }
 
     lseek (fd = fileno (ct->c_fp), (off_t) ct->c_begin, SEEK_SET);
@@ -2327,10 +2329,18 @@ open7Bit (CT ct, char **file)
 
 ready_to_go:
     *file = ce->ce_file;
+    if (own_ct_fp) {
+      fclose (ct->c_fp);
+      ct->c_fp = NULL;
+    }
     return fileno (ce->ce_fp);
 
 clean_up:
     free_encoding (ct, 0);
+    if (own_ct_fp) {
+      fclose (ct->c_fp);
+      ct->c_fp = NULL;
+    }
     return NOTOK;
 }
 
@@ -2554,7 +2564,8 @@ openFTP (CT ct, char **file)
 
     if (e->eb_flags) {
 	user = "anonymous";
-	snprintf (buffer, sizeof(buffer), "%s@%s", getusername (), LocalName ());
+	snprintf (buffer, sizeof(buffer), "%s@%s", getusername (),
+		  LocalName (1));
 	pass = buffer;
     } else {
 	ruserpass (e->eb_site, &username, &password);
@@ -2795,15 +2806,10 @@ static int
 readDigest (CT ct, char *cp)
 {
     int	bitno, skip;
-    unsigned long bits;
+    uint32_t bits;
     char *bp = cp;
     unsigned char *dp, value, *ep;
-    unsigned char *b, *b1, *b2, *b3;
 
-    b  = (unsigned char *) &bits,
-    b1 = &b[endian > 0 ? 1 : 2],
-    b2 = &b[endian > 0 ? 2 : 1],
-    b3 = &b[endian > 0 ? 3 : 0];
     bitno = 18;
     bits = 0L;
     skip = 0;
@@ -2825,11 +2831,11 @@ test_end:
 		if ((bitno -= 6) < 0) {
 		    if (dp + (3 - skip) > ep)
 			goto invalid_digest;
-		    *dp++ = *b1;
+		    *dp++ = (bits >> 16) & 0xff;
 		    if (skip < 2) {
-			*dp++ = *b2;
+			*dp++ = (bits >> 8) & 0xff;
 			if (skip < 1)
-			    *dp++ = *b3;
+			    *dp++ = bits & 0xff;
 		    }
 		    bitno = 18;
 		    bits = 0L;