X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhmisc.c;h=c32157fe9b2124b5d8e707e7a471a911a44d7602;hp=7a2313922f2ee9ed994902d55792cac502c69ad9;hb=a485ed478abbd599d8c9aab48934e7a26733ecb1;hpb=f480c03187724e54e5391ee61b810827da319a6c

diff --git a/uip/mhmisc.c b/uip/mhmisc.c
index 7a23139..c32157f 100644
--- a/uip/mhmisc.c
+++ b/uip/mhmisc.c
@@ -1,4 +1,3 @@
-
 /*
  * mhparse.c -- misc routines to process MIME messages
  *
@@ -23,7 +22,7 @@ int ntype = 0;
 char *parts[NPARTS + 1];
 char *types[NTYPES + 1];
 
-int endian = 0;		/* little or big endian */
+int endian = 0;  /* little or big endian */
 int userrs = 0;
 
 static char *errs = NULL;
@@ -43,93 +42,93 @@ void flush_errors (void);
 int
 part_ok (CT ct, int sP)
 {
-    char **ap;
-    int len;
+	char **ap;
+	int len;
 
-    if (npart == 0 || (ct->c_type == CT_MULTIPART && (sP || ct->c_subtype)))
-	return 1;
+	if (npart == 0 || (ct->c_type == CT_MULTIPART && (sP || ct->c_subtype)))
+		return 1;
 
-    for (ap = parts; *ap; ap++) {
-        len = strlen(*ap);
-        if (!strncmp (*ap, ct->c_partno, len) &&
-                (!ct->c_partno[len] || ct->c_partno[len] == '.' ))
-            return 1;
-    }
+	for (ap = parts; *ap; ap++) {
+		len = strlen(*ap);
+		if (!strncmp (*ap, ct->c_partno, len) &&
+				(!ct->c_partno[len] || ct->c_partno[len] == '.' ))
+			return 1;
+	}
 
-    return 0;
+	return 0;
 }
 
 
 int
 type_ok (CT ct, int sP)
 {
-    char **ap;
-    char buffer[BUFSIZ];
-    CI ci = &ct->c_ctinfo;
+	char **ap;
+	char buffer[BUFSIZ];
+	CI ci = &ct->c_ctinfo;
 
-    if (ntype == 0 || (ct->c_type == CT_MULTIPART && (sP || ct->c_subtype)))
-	return 1;
+	if (ntype == 0 || (ct->c_type == CT_MULTIPART && (sP || ct->c_subtype)))
+		return 1;
 
-    snprintf (buffer, sizeof(buffer), "%s/%s", ci->ci_type, ci->ci_subtype);
-    for (ap = types; *ap; ap++)
-	if (!mh_strcasecmp (*ap, ci->ci_type) || !mh_strcasecmp (*ap, buffer))
-	    return 1;
+	snprintf (buffer, sizeof(buffer), "%s/%s", ci->ci_type, ci->ci_subtype);
+	for (ap = types; *ap; ap++)
+		if (!mh_strcasecmp (*ap, ci->ci_type) || !mh_strcasecmp (*ap, buffer))
+			return 1;
 
-    return 0;
+	return 0;
 }
 
 
 void
 set_endian (void)
 {
-    union {
-	long l;
-	char c[sizeof(long)];
-    } un;
-
-    un.l = 1;
-    endian = un.c[0] ? -1 : 1;
-    if (debugsw)
-	fprintf (stderr, "%s endian architecture\n",
-		endian > 0 ? "big" : "little");
+	union {
+		long l;
+		char c[sizeof(long)];
+	} un;
+
+	un.l = 1;
+	endian = un.c[0] ? -1 : 1;
+	if (debugsw)
+		fprintf (stderr, "%s endian architecture\n",
+				endian > 0 ? "big" : "little");
 }
 
 
 int
 make_intermediates (char *file)
 {
-    char *cp;
+	char *cp;
 
-    for (cp = file + 1; (cp = strchr(cp, '/')); cp++) {
-	struct stat st;
+	for (cp = file + 1; (cp = strchr(cp, '/')); cp++) {
+		struct stat st;
 
-	*cp = '\0';
-	if (stat (file, &st) == NOTOK) {
-	    int answer;
-	    char *ep;
-	    if (errno != ENOENT) {
-		advise (file, "error on directory");
+		*cp = '\0';
+		if (stat (file, &st) == NOTOK) {
+			int answer;
+			char *ep;
+			if (errno != ENOENT) {
+				advise (file, "error on directory");
 losing_directory:
+				*cp = '/';
+				return NOTOK;
+			}
+
+			ep = concat ("Create directory \"", file, "\"? ", NULL);
+			answer = getanswer (ep);
+			free (ep);
+
+			if (!answer)
+				goto losing_directory;
+			if (!makedir (file)) {
+				advise (NULL, "unable to create directory %s", file);
+				goto losing_directory;
+			}
+		}
+
 		*cp = '/';
-		return NOTOK;
-	    }
-
-	    ep = concat ("Create directory \"", file, "\"? ", NULL);
-	    answer = getanswer (ep);
-	    free (ep);
-
-	    if (!answer)
-		goto losing_directory;
-	    if (!makedir (file)) {
-		advise (NULL, "unable to create directory %s", file);
-		goto losing_directory;
-	    }
 	}
 
-	*cp = '/';
-    }
-
-    return OK;
+	return OK;
 }
 
 
@@ -140,98 +139,98 @@ losing_directory:
 void
 content_error (char *what, CT ct, char *fmt, ...)
 {
-    va_list arglist;
-    int	i, len, buflen;
-    char *bp, buffer[BUFSIZ];
-    CI ci;
+	va_list arglist;
+	int i, len, buflen;
+	char *bp, buffer[BUFSIZ];
+	CI ci;
+
+	bp = buffer;
+	buflen = sizeof(buffer);
+
+	if (userrs && invo_name && *invo_name) {
+		snprintf (bp, buflen, "%s: ", invo_name);
+		len = strlen (bp);
+		bp += len;
+		buflen -= len;
+	}
 
-    bp = buffer;
-    buflen = sizeof(buffer);
+	va_start (arglist, fmt);
 
-    if (userrs && invo_name && *invo_name) {
-	snprintf (bp, buflen, "%s: ", invo_name);
+	vsnprintf (bp, buflen, fmt, arglist);
 	len = strlen (bp);
 	bp += len;
 	buflen -= len;
-    }
 
-    va_start (arglist, fmt);
+	ci = &ct->c_ctinfo;
 
-    vsnprintf (bp, buflen, fmt, arglist);
-    len = strlen (bp);
-    bp += len;
-    buflen -= len;
+	if (what) {
+		char *s;
 
-    ci = &ct->c_ctinfo;
+		if (*what) {
+			snprintf (bp, buflen, " %s: ", what);
+			len = strlen (bp);
+			bp += len;
+			buflen -= len;
+		}
 
-    if (what) {
-	char *s;
+		if ((s = strerror (errno)))
+			snprintf (bp, buflen, "%s", s);
+		else
+			snprintf (bp, buflen, "Error %d", errno);
 
-	if (*what) {
-	    snprintf (bp, buflen, " %s: ", what);
-	    len = strlen (bp);
-	    bp += len;
-	    buflen -= len;
+		len = strlen (bp);
+		bp += len;
+		buflen -= len;
 	}
 
-	if ((s = strerror (errno)))
-	    snprintf (bp, buflen, "%s", s);
-	else
-	    snprintf (bp, buflen, "Error %d", errno);
+	i = strlen (invo_name) + 2;
 
+	/* Now add content type and subtype */
+	snprintf (bp, buflen, "\n%*.*s(content %s/%s", i, i, "",
+		ci->ci_type, ci->ci_subtype);
 	len = strlen (bp);
 	bp += len;
 	buflen -= len;
-    }
 
-    i = strlen (invo_name) + 2;
-
-    /* Now add content type and subtype */
-    snprintf (bp, buflen, "\n%*.*s(content %s/%s", i, i, "",
-	ci->ci_type, ci->ci_subtype);
-    len = strlen (bp);
-    bp += len;
-    buflen -= len;
+	/* Now add the message/part number */
+	if (ct->c_file) {
+		snprintf (bp, buflen, " in message %s", ct->c_file);
+		len = strlen (bp);
+		bp += len;
+		buflen -= len;
+
+		if (ct->c_partno) {
+			snprintf (bp, buflen, ", part %s", ct->c_partno);
+			len = strlen (bp);
+			bp += len;
+			buflen -= len;
+		}
+	}
 
-    /* Now add the message/part number */
-    if (ct->c_file) {
-	snprintf (bp, buflen, " in message %s", ct->c_file);
+	snprintf (bp, buflen, ")");
 	len = strlen (bp);
 	bp += len;
 	buflen -= len;
 
-	if (ct->c_partno) {
-	    snprintf (bp, buflen, ", part %s", ct->c_partno);
-	    len = strlen (bp);
-	    bp += len;
-	    buflen -= len;
+	if (userrs) {
+		*bp++ = '\n';
+		*bp = '\0';
+		buflen--;
+
+		errs = add (buffer, errs);
+	} else {
+		advise (NULL, "%s", buffer);
 	}
-    }
-
-    snprintf (bp, buflen, ")");
-    len = strlen (bp);
-    bp += len;
-    buflen -= len;
-
-    if (userrs) {
-	*bp++ = '\n';
-	*bp = '\0';
-	buflen--;
-
-	errs = add (buffer, errs);
-    } else {
-	advise (NULL, "%s", buffer);
-    }
 }
 
 
 void
 flush_errors (void)
 {
-    if (errs) {
-	fflush (stdout);
-	fprintf (stderr, "%s", errs);
-	free (errs);
-	errs = NULL;
-    }
+	if (errs) {
+		fflush (stdout);
+		fprintf (stderr, "%s", errs);
+		free (errs);
+		errs = NULL;
+	}
 }