Changeset 364:efa46a89a622

Timestamp:

1998-08-20 15:32:34 (10 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

mutt-0-94

Message:

[patch-0.94.3.bl.other_types.1] This patch adds support
for the model MIME type. Additionally, along the lines of
"strict in what you generate, accepting in what you
receive", this patch will keep the name of major mime
types it doesn't recognize (instead of using x-unknown).

Files:

• BUGS (modified) (1 diff)
• attach.c (modified) (4 diffs)
• commands.c (modified) (1 diff)
• compose.c (modified) (1 diff)
• globals.h (modified) (1 diff)
• handler.c (modified) (8 diffs)
• lib.c (modified) (1 diff)
• mime.h (modified) (2 diffs)
• mutt.h (modified) (1 diff)
• parse.c (modified) (2 diffs)
• recvattach.c (modified) (1 diff)
• sendlib.c (modified) (1 diff)

BUGS

@@ -38 +38 @@
   it doesn't honor $tmpdir under some conditions if
   matching nametemplates exist.
+

attach.c

@@ -48 +48 @@
   rfc1524_entry *entry = rfc1524_new_entry ();
 
-  snprintf (type, sizeof (type), "%s/%s", TYPE (a->type), a->subtype);
+  snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
   if (rfc1524_mailcap_lookup (a, type, entry, M_COMPOSE))
   {
@@ -166 +166 @@
   rfc1524_entry *entry = rfc1524_new_entry ();
 
-  snprintf (type, sizeof (type), "%s/%s", TYPE (a->type), a->subtype);
+  snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
   if (rfc1524_mailcap_lookup (a, type, entry, M_EDIT))
   {
@@ -262 +262 @@
   use_mailcap = (flag == M_MAILCAP ||
                 (flag == M_REGULAR && mutt_needs_mailcap (a)));
-  snprintf (type, sizeof (type), "%s/%s", TYPE (a->type), a->subtype);
+  snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
   
   if (use_mailcap)
@@ -736 +736 @@
   FILE *ifp, *fpout;
 
-  snprintf (type, sizeof (type), "%s/%s", TYPE (a->type), a->subtype);
+  snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
 
   if (rfc1524_mailcap_lookup (a, type, NULL, M_PRINT)) 

commands.c

@@ -111 +111 @@
   FILE *fpout;
 
-  snprintf (buf, sizeof (buf), "%s/%s", TYPE (cur->content->type),
+  snprintf (buf, sizeof (buf), "%s/%s", TYPE (cur->content),
             cur->content->subtype);
 

compose.c

@@ -767 +767 @@
         CHECK_COUNT;
         snprintf (buf, sizeof (buf), "%s/%s",
-                  TYPE (idx[menu->current]->content->type),
+                  TYPE (idx[menu->current]->content),
                   idx[menu->current]->content->subtype);
         if (mutt_get_field ("Content-Type: ", buf, sizeof (buf), 0) == 0 && buf[0])

globals.h

@@ -126 +126 @@
 const char *Months[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "ERR" };
 
-const char *BodyTypes[] = { "x-unknown", "audio", "application", "image", "message", "multipart", "text", "video" };
+const char *BodyTypes[] = { "x-unknown", "audio", "application", "image", "message", "model", "multipart", "text", "video" };
 const char *BodyEncodings[] = { "x-unknown", "7bit", "8bit", "quoted-printable", "base64", "binary" };
 #else

handler.c

@@ -754 +754 @@
           (i > 0 && t->data[i-1] == '/' && t->data[i] == '*'))
       {
-        if (!strcasecmp(t->data, TYPE(b->type)))
+        if (!strcasecmp(t->data, TYPE(b)))
         {
           choice = b;
@@ -761 +761 @@
       else
       {
-        snprintf (buf, sizeof (buf), "%s/%s", TYPE (b->type), b->subtype);
+        snprintf (buf, sizeof (buf), "%s/%s", TYPE (b), b->subtype);
         if (!strcasecmp(t->data, buf))
         {
@@ -778 +778 @@
   while (b && !choice)
   {
-    snprintf (buf, sizeof (buf), "%s/%s", TYPE (b->type), b->subtype);
+    snprintf (buf, sizeof (buf), "%s/%s", TYPE (b), b->subtype);
     if (mutt_is_autoview (buf))
     {
@@ -898 +898 @@
   char type[STRING];
 
-  snprintf (type, sizeof (type), "%s/%s", TYPE (a->type), a->subtype);
+  snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
   if (mutt_is_autoview (type))
     return (rfc1524_mailcap_lookup (a, type, NULL, M_AUTOVIEW));
@@ -986 +986 @@
       snprintf (buffer, sizeof (buffer),
                 "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n",
-               TYPE (p->type), p->subtype, ENCODING (p->encoding), length);
+               TYPE (p), p->subtype, ENCODING (p->encoding), length);
       state_puts (buffer, s);
       if (!option (OPTWEED))
@@ -1032 +1032 @@
   pid_t thepid;
 
-  snprintf (type, sizeof (type), "%s/%s", TYPE (a->type), a->subtype);
+  snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
   rfc1524_mailcap_lookup (a, type, entry, M_AUTOVIEW);
 
@@ -1162 +1162 @@
   /* first determine which handler to use to process this part */
 
-  snprintf (type, sizeof (type), "%s/%s", TYPE (b->type), b->subtype);
+  snprintf (type, sizeof (type), "%s/%s", TYPE (b), b->subtype);
   if (mutt_is_autoview (type))
   {
@@ -1333 +1333 @@
   else if (s->flags & M_DISPLAY)
   {
-    fprintf (s->fpout, "[-- %s/%s is unsupported ", TYPE (b->type), b->subtype);
+    fprintf (s->fpout, "[-- %s/%s is unsupported ", TYPE (b), b->subtype);
     if (!option (OPTVIEWATTACH))
     {

lib.c

@@ -66 +66 @@
     safe_free ((void **) &b->filename);
     safe_free ((void **) &b->content);
+    safe_free ((void **) &b->xtype);
     safe_free ((void **) &b->subtype);
     safe_free ((void **) &b->description);

mime.h

@@ -25 +25 @@
   TYPEIMAGE,
   TYPEMESSAGE,
+  TYPEMODEL,
   TYPEMULTIPART,
   TYPETEXT,
@@ -65 +66 @@
 extern const char *BodyEncodings[];
 
-#define TYPE(X) BodyTypes[(X)]
+#define TYPE(X) ((X->type == TYPEOTHER) && (X->xtype != NULL) ? X->xtype : BodyTypes[(X->type)])
 #define ENCODING(X) BodyEncodings[(X)]

mutt.h

@@ -407 +407 @@
 typedef struct body
 {
+  char *xtype;                  /* content-type if x-unknown */
   char *subtype;                /* content-type subtype */
   PARAMETER *parameter;         /* parameters of the content-type */

parse.c

@@ -277 +277 @@
   ct->type = mutt_check_mime_type (s);
 
+  if (ct->type == TYPEOTHER)
+  {
+    ct->xtype = safe_strdup (s);
+  }
+
   if (ct->subtype == NULL)
   {
@@ -299 +304 @@
       ct->subtype = safe_strdup ("x-unknown");
   }
+
 }
 

recvattach.c

@@ -206 +206 @@
     case 'm':
       snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
-      snprintf (dest, destlen, fmt, TYPE (aptr->content->type));
+      snprintf (dest, destlen, fmt, TYPE (aptr->content));
       break;
     case 'M':

sendlib.c

@@ -366 +366 @@
   int tmplen;
   
-  fprintf (f, "Content-Type: %s/%s", TYPE (a->type), a->subtype);
+  fprintf (f, "Content-Type: %s/%s", TYPE (a), a->subtype);
 
   if (a->parameter)