SOURCES: metamail-suggestedname.patch - updated for mm 2.7.52

[dzeus]

Author: dzeus                        Date: Tue Oct  3 07:35:36 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for mm 2.7.52

---- Files affected:
SOURCES:
   metamail-suggestedname.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/metamail-suggestedname.patch
diff -u SOURCES/metamail-suggestedname.patch:1.2 SOURCES/metamail-suggestedname.patch:1.3
--- SOURCES/metamail-suggestedname.patch:1.2	Tue Mar 21 14:27:28 2006
+++ SOURCES/metamail-suggestedname.patch	Tue Oct  3 09:35:31 2006
@@ -1,30 +1,30 @@
---- mm2.7/src/src/metamail/metamail.c.orig	2006-03-20 14:07:16.689062000 +0100
-+++ mm2.7/src/src/metamail/metamail.c	2006-03-21 14:18:29.529062000 +0100
-@@ -67,6 +67,7 @@
+--- mm2.7/src/src/metamail/metamail.c.orig      2006-03-20 14:07:16.689062000 +0100
++++ mm2.7/src/src/metamail/metamail.c   2006-03-21 14:18:29.529062000 +0100
+@@ -66,6 +66,7 @@
+ int RunAsRootOK = 0;
  
  char *ContentType = NULL,
++    *ContentDisposition = NULL,
      *ContentEncoding = NULL,
-+	*ContentDisposition = NULL,
      *MailerName = "unknown",
      *MailSubject = "Mail message",
-     *MailFrom = "unknown sender",
 @@ -157,6 +158,7 @@
  
      ContentType = NULL;
      ContentEncoding = NULL;
-+	ContentDisposition = NULL;
++    ContentDisposition = NULL,
      MailSubject = "Mail message";
      MailFrom = "unknown sender";
      MailSummary = "non-text mail message";
-@@ -385,6 +387,7 @@
- 	Fname[0] = 0;
+@@ -386,6 +388,7 @@
+         Fname[0] = 0;
  
          suggestedname = FindParam("name");
 +	if (!suggestedname) suggestedname = FindParam("filename");
-         if (strlen(suggestedname) > NAME_MAX - 50)
-             suggestedname[NAME_MAX - 50] = '\0';
          if (!suggestedname) {
-@@ -574,7 +577,7 @@
+             MkTmpFileName(SugBuf);
+             suggestedname = SugBuf;
+@@ -577,7 +580,7 @@
                      /* strip leading white space */
                      while (*ContentType && isspace((unsigned char) *ContentType)) ++ContentType;
                      StripTrailingSpace(ContentType);
@@ -33,7 +33,7 @@
                      break;
                  case 'd':
  		    MightAskBeforeExecuting = 0;
-@@ -1237,6 +1240,7 @@
+@@ -1240,6 +1243,7 @@
  	BoundaryCt=0;
  	return -1;
      }
@@ -41,7 +41,7 @@
      for (s=mailheaders+oldbytes; *s; ++s) {
          if (*s == '\n' && (*(s+1) != ' ') && (*(s+1) != '\t')) {
  	    if (!ContentType && !lc2strncmp(s, "\ncontent-type:", 14)) {
-@@ -1259,7 +1263,7 @@
+@@ -1262,7 +1266,7 @@
  		    }
  		}
                  StripTrailingSpace(ContentType);
@@ -50,7 +50,7 @@
                  if (PrintHeads) maybephead(s+1);
              } else if (!ContentEncoding && !lc2strncmp(s, "\ncontent-transfer-encoding:", 27)) {
                  ContentEncoding = FreshHeaderCopy(s+27);
-@@ -1270,9 +1274,13 @@
+@@ -1273,9 +1277,13 @@
              } else if (!lc2strncmp(s, "\nfrom:", 6)) {
                  if (PrintHeads) maybephead(s+1);
                  MailFrom = FreshHeaderCopy(s+6);
@@ -58,14 +58,14 @@
 +            } else if (!lc2strncmp(s, "\ncontent-description:", 21)) {
                  if(PrintHeads) maybephead(s+1);
                  MailSubject = FreshHeaderCopy(s+21);
-+            } else if (!ContentDisposition && !lc2strncmp(s, "\ncontent-disposition:", 21)) {
-+                ContentDisposition = FreshHeaderCopy(s+21);
-+                StripTrailingSpace(ContentDisposition);
-+                ParseContentParameters(CParamsUsed, ContentDisposition);
++	    } else if (!ContentDisposition && !lc2strncmp(s, "\ncontent-disposition:", 21)) {
++		ContentDisposition = FreshHeaderCopy(s+21);
++		StripTrailingSpace(ContentDisposition);
++		ParseContentParameters(CParamsUsed, ContentDisposition);
              } else {
                  /* Print any with encoded variables */
                  char *dum = s;
-@@ -2111,12 +2119,13 @@
+@@ -2114,12 +2122,13 @@
  }        
  
  void
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/metamail-suggestedname.patch?r1=1.2&r2=1.3&f=u