Added support for Content-Disposition header (RFC 2183) to

[nmh] / uip / mhstoresbr.c

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index b978dbfb3c304f7c262dc4f50aa9f6c9b9c7a4f4..56214167b0de6f677ec2de9f209f0ae4e7e65acb 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -1021,7 +1021,7 @@ static void
 get_storeproc (CT ct)
 {
     char **ap, **ep, *cp;
 get_storeproc (CT ct)
 {
     char **ap, **ep, *cp;

-    CI ci = &ct->c_ctinfo;
+    CI ci;

 
     /*
      * If the storeproc has already been defined,
 
     /*
      * If the storeproc has already been defined,


@@ -1031,13 +1031,44 @@ get_storeproc (CT ct)
     if (ct->c_storeproc)
        return;
 
     if (ct->c_storeproc)
        return;
 

+    /*
+     * If there's a Content-Disposition header and it has a filename,
+     * use that (RFC-2183).
+     */
+    if (ct->c_dispo) {
+       char *cp = strchr (ct->c_dispo, ';');
+       CI ci = calloc (1, sizeof *ci);
+       int status;
+       int found_filename = 0;
+
+       if (cp  &&  parse_header_attrs (ct->c_file, strlen (invo_name) + 2, &cp,
+                                        ci, &status) == OK) {
+           for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
+               if (! strcasecmp (*ap, "filename")
+                   && *(cp = *ep) != '/'
+                   && *cp != '.'
+                   && *cp != '|'
+                   && *cp != '!'
+                   && !strchr (cp, '%')) {
+                   ct->c_storeproc = add (cp, NULL);
+                   found_filename = 1;
+               }
+               free (*ap);
+           }
+       }
+
+       free (ci);
+       if (found_filename) return;
+    }
+

     /*
      * Check the attribute/value pairs, for the attribute "name".
      * If found, do a few sanity checks and copy the value into
      * the storeproc.
      */
     /*
      * Check the attribute/value pairs, for the attribute "name".
      * If found, do a few sanity checks and copy the value into
      * the storeproc.
      */

+    ci = &ct->c_ctinfo;

     for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
     for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {

-       if (!mh_strcasecmp (*ap, "name")
+       if (! strcasecmp (*ap, "name")

            && *(cp = *ep) != '/'
            && *cp != '.'
            && *cp != '|'
            && *(cp = *ep) != '/'
            && *cp != '.'
            && *cp != '|'