X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhparse.c;h=4c3a19460b0cdfe27214b23568e651457bf28e3e;hb=1888a6885e0c4049755578814462cad4259e85df;hp=ea78b42c4644fbe358cf95ac92b35ec557d96d0b;hpb=ca34fbd0a5204d47ad019f64ef03d21ebd3397fd;p=mmh

diff --git a/uip/mhparse.c b/uip/mhparse.c
index ea78b42..4c3a194 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -12,7 +12,6 @@
 #include <h/signals.h>
 #include <h/md5.h>
 #include <errno.h>
-#include <setjmp.h>
 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
@@ -86,16 +85,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 */
@@ -1732,7 +1727,7 @@ static int
 openBase64 (CT ct, char **file)
 {
     int	bitno, cc, digested;
-    int fd, len, skip;
+    int fd, len, skip, own_ct_fp = 0;
     unsigned long bits;
     unsigned char value, *b, *b1, *b2, *b3;
     unsigned char *cp, *ep;
@@ -1781,8 +1776,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)) {
@@ -1803,9 +1798,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))
@@ -1917,9 +1915,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;
 }
@@ -1959,7 +1965,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;
@@ -2002,8 +2008,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)) {
@@ -2021,17 +2027,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))
@@ -2153,10 +2157,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;
 }
 
@@ -2179,7 +2191,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;
@@ -2220,8 +2232,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)) {
@@ -2289,9 +2301,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);
@@ -2328,10 +2343,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;
 }
 
@@ -2472,8 +2495,7 @@ InitFTP (CT ct)
 static int
 openFTP (CT ct, char **file)
 {
-    int	cachetype, fd;
-    volatile int caching;
+    int	cachetype, caching, fd;
     int len, buflen;
     char *bp, *ftp, *user, *pass;
     char buffer[BUFSIZ], cachefile[BUFSIZ];
@@ -2556,7 +2578,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);
@@ -2606,7 +2629,7 @@ openFTP (CT ct, char **file)
 
 	fflush (stdout);
 
-	for (i = 0; (child_id = vfork ()) == NOTOK && i < 5; i++)
+	for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
 	    sleep (5);
 	switch (child_id) {
 	    case NOTOK:
@@ -2748,7 +2771,7 @@ openMail (CT ct, char **file)
     vec[vecp++] = e->eb_body;
     vec[vecp] = NULL;
 
-    for (i = 0; (child_id = vfork ()) == NOTOK && i < 5; i++)
+    for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
 	sleep (5);
     switch (child_id) {
 	case NOTOK: