Make sure we include space in the list of characters we need to encode in

[nmh] / uip / mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 043effdc755106550378e31f4c3d591ef8134430..c381bb8583f298a066de0609069ef994ddf8e61e 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -138,6 +138,7 @@ static int openURL (CT, char **);
 static size_t param_len(PM, int, size_t, int *);
 static size_t encode_param(PM, char *, size_t, size_t, size_t, int);
 static size_t normal_param(PM, char *, size_t, size_t, size_t);
 static size_t param_len(PM, int, size_t, int *);
 static size_t encode_param(PM, char *, size_t, size_t, size_t, int);
 static size_t normal_param(PM, char *, size_t, size_t, size_t);

+static int get_dispo (char *, CT, int);

 
 struct str2init str2cts[] = {
     { "application", CT_APPLICATION, InitApplication },
 
 struct str2init str2cts[] = {
     { "application", CT_APPLICATION, InitApplication },


@@ -513,7 +514,8 @@ get_content (FILE *in, char *file, int toplevel)
        }
        else if (!strcasecmp (hp->name, DISPO_FIELD)) {
        /* Get Content-Disposition field */
        }
        else if (!strcasecmp (hp->name, DISPO_FIELD)) {
        /* Get Content-Disposition field */

-           ct->c_dispo = add (hp->value, ct->c_dispo);
+           if (get_dispo(hp->value, ct, 0) == NOTOK)
+               goto out;

        }
 
 next_header:
        }
 
 next_header:


@@ -679,7 +681,6 @@ extract_name_value (char *name_suffix, char *value) {
 int
 get_ctinfo (char *cp, CT ct, int magic)
 {
 int
 get_ctinfo (char *cp, CT ct, int magic)
 {

-    int        i;

     char *dp;
     char c;
     CI ci;
     char *dp;
     char c;
     CI ci;


@@ -836,7 +837,7 @@ magic_skip:
      * Get any {Content-Disposition} given in buffer.
      */
     if (magic && *cp == '{') {
      * Get any {Content-Disposition} given in buffer.
      */
     if (magic && *cp == '{') {

-        ct->c_dispo = ++cp;
+        ++cp;

        for (dp = cp + strlen (cp) - 1; dp >= cp; dp--)
            if (*dp == '}')
                break;
        for (dp = cp + strlen (cp) - 1; dp >= cp; dp--)
            if (*dp == '}')
                break;


@@ -848,10 +849,10 @@ magic_skip:
        
        c = *dp;
        *dp = '\0';
        
        c = *dp;
        *dp = '\0';

-       if (*ct->c_dispo)
-           ct->c_dispo = concat (ct->c_dispo, "\n", NULL);
-       else
-           ct->c_dispo = NULL;
+
+       if (get_dispo(cp, ct, 1) != OK)
+           return NOTOK;
+

        *dp++ = c;
        cp = dp;
 
        *dp++ = c;
        cp = dp;
 


@@ -922,10 +923,83 @@ magic_skip:
         }
        else
            advise (NULL,
         }
        else
            advise (NULL,

-                   "extraneous information in message %s's %s: field\n%*.*s(%s)",
-                    ct->c_file, TYPE_FIELD, i, i, "", cp);
+                   "extraneous information in message %s's %s: field\n%*s(%s)",
+                    ct->c_file, TYPE_FIELD, strlen(invo_name) + 2, "", cp);
+    }
+
+    return OK;
+}
+
+
+/*
+ * Parse out a Content-Disposition header.  A lot of this is cribbed from
+ * get_ctinfo().
+ */
+static int
+get_dispo (char *cp, CT ct, int buildflag)
+{
+    char *dp, *dispoheader;
+    char c;
+    int status;
+
+    /*
+     * Save the whole copy of the Content-Disposition header, unless we're
+     * processing a mhbuild directive.  A NULL c_dispo will be a flag to
+     * mhbuild that the disposition header needs to be generated at that
+     * time.
+     */
+
+    dispoheader = cp = add(cp, NULL);
+
+    while (isspace ((unsigned char) *cp))      /* trim leading spaces */
+       cp++;
+
+    /* change newlines to spaces */
+    for (dp = strchr(cp, '\n'); dp; dp = strchr(dp, '\n'))
+       *dp++ = ' ';
+
+    /* trim trailing spaces */
+    for (dp = cp + strlen (cp) - 1; dp >= cp; dp--)
+       if (!isspace ((unsigned char) *dp))
+           break;
+    *++dp = '\0';
+
+    if (debugsw)
+       fprintf (stderr, "%s: %s\n", DISPO_FIELD, cp);
+
+    if (*cp == '(' && get_comment (ct->c_file, DISPO_FIELD, &cp, NULL) ==
+                                                       NOTOK) {
+       free(dispoheader);
+       return NOTOK;

     }
 
     }
 

+    for (dp = cp; istoken (*dp); dp++)
+       continue;
+    c = *dp, *dp = '\0';
+    ct->c_dispo_type = add (cp, NULL); /* store disposition type */
+    *dp = c, cp = dp;
+
+    if (*cp == '(' && get_comment (ct->c_file, DISPO_FIELD, &cp, NULL) == NOTOK)
+       return NOTOK;
+
+    if ((status = parse_header_attrs (ct->c_file, DISPO_FIELD, &cp,
+                                     &ct->c_dispo_first, &ct->c_dispo_last,
+                                     NULL)) != OK) {
+       if (status == NOTOK) {
+           free(dispoheader);
+           return NOTOK;
+       }
+    } else if (*cp) {
+       advise (NULL,
+               "extraneous information in message %s's %s: field\n%*s(%s)",
+                    ct->c_file, DISPO_FIELD, strlen(invo_name) + 2, "", cp);
+    }
+
+    if (buildflag)
+       free(dispoheader);
+    else
+       ct->c_dispo = dispoheader;
+

     return OK;
 }
 
     return OK;
 }
 


@@ -3286,7 +3360,7 @@ parse_header_attrs (const char *filename, const char *fieldname,
 
        /* Now store the attribute value. */
 
 
        /* Now store the attribute value. */
 

-       pm->pm_value = vp = pm->pm_name + (dp - cp);
+       vp = pm->pm_name + (dp - cp);

 
        if (*dp == '"') {
            for (cp = ++dp, dp = vp;;) {
 
        if (*dp == '"') {
            for (cp = ++dp, dp = vp;;) {


@@ -3321,6 +3395,7 @@ bad_quote:
                continue;
            *dp = '\0';
        }
                continue;
            *dp = '\0';
        }

+       pm->pm_value = getcpy(vp); 

        if (!*vp) {
            advise (NULL,
                    "invalid parameter in message %s's %s: "
        if (!*vp) {
            advise (NULL,
                    "invalid parameter in message %s's %s: "


@@ -3361,7 +3436,7 @@ char *
 output_params(size_t initialwidth, PM params, int *offsetout)
 {
     char *paramout = NULL;
 output_params(size_t initialwidth, PM params, int *offsetout)
 {
     char *paramout = NULL;

-    char line[CPERLIN * 2], *p, *q;
+    char line[CPERLIN * 2], *q;

     int curlen, index, eightbit, encode, i;
     size_t valoff;
 
     int curlen, index, eightbit, encode, i;
     size_t valoff;
 


@@ -3388,7 +3463,7 @@ output_params(size_t initialwidth, PM params, int *offsetout)
 
        while (curlen + 8 > CPERLIN - 1) {
            int curvallen = strlen(params->pm_value + valoff) -
 
        while (curlen + 8 > CPERLIN - 1) {
            int curvallen = strlen(params->pm_value + valoff) -

-                               (initialwidth + curlen - (CPERLIN - 1));
+                               (curlen + 8 - (CPERLIN - 1));

 
            *q++ = ';';
            *q++ = '\n';
 
            *q++ = ';';
            *q++ = '\n';


@@ -3485,7 +3560,8 @@ output_params(size_t initialwidth, PM params, int *offsetout)
            q += snprintf(q, sizeof(line) - (q - line), "%s*%d",
                          params->pm_name, index);
        } else {
            q += snprintf(q, sizeof(line) - (q - line), "%s*%d",
                          params->pm_name, index);
        } else {

-           q = strncpy(q, params->pm_name, sizeof(line) - (q - line));
+           strncpy(q, params->pm_name, sizeof(line) - (q - line));
+           q += strlen(q);

        }
 
        if (eightbit)
        }
 
        if (eightbit)


@@ -3667,7 +3743,7 @@ static size_t
 normal_param(PM pm, char *output, size_t len, size_t valuelen,
             size_t valueoff)
 {
 normal_param(PM pm, char *output, size_t len, size_t valuelen,
             size_t valueoff)
 {

-    size_t outlen = 0, n;
+    size_t outlen = 0;

     char *endptr = output + len, *p;
 
     *output++ = '=';
     char *endptr = output + len, *p;
 
     *output++ = '=';


@@ -3715,7 +3791,7 @@ add_param(PM *first, PM *last, const char *name, const char *value)
     memset(pm, 0, sizeof(*pm));
 
     pm->pm_name = getcpy(name);
     memset(pm, 0, sizeof(*pm));
 
     pm->pm_name = getcpy(name);

-    pm->pm_value = getcpy(name);
+    pm->pm_value = getcpy(value);

 
     if (*first) {
        (*last)->pm_next = pm;
 
     if (*first) {
        (*last)->pm_next = pm;