SOURCES: metamail-suggestedname.patch - updated for 2.7+debian-51

[qboosh]

Author: qboosh                       Date: Tue Mar 21 13:27:34 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 2.7+debian-51

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

---- Diffs:

================================================================
Index: SOURCES/metamail-suggestedname.patch
diff -u SOURCES/metamail-suggestedname.patch:1.1 SOURCES/metamail-suggestedname.patch:1.2
--- SOURCES/metamail-suggestedname.patch:1.1	Fri Feb 14 13:02:05 2003
+++ SOURCES/metamail-suggestedname.patch	Tue Mar 21 14:27:28 2006
@@ -1,6 +1,6 @@
---- mm2.7.old/src/metamail/metamail.c	Fri Feb 14 09:55:44 2003
-+++ mm2.7/src/metamail/metamail.c	Fri Feb 14 10:51:56 2003
-@@ -155,6 +155,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
+@@ -67,6 +67,7 @@
  
  char *ContentType = NULL,
      *ContentEncoding = NULL,
@@ -8,7 +8,7 @@
      *MailerName = "unknown",
      *MailSubject = "Mail message",
      *MailFrom = "unknown sender",
-@@ -264,6 +265,7 @@
+@@ -157,6 +158,7 @@
  
      ContentType = NULL;
      ContentEncoding = NULL;
@@ -16,15 +16,15 @@
      MailSubject = "Mail message";
      MailFrom = "unknown sender";
      MailSummary = "non-text mail message";
-@@ -521,6 +523,7 @@
-         FILE *fp;
-         int ans = 0, octetstream, ecode=0;
+@@ -385,6 +387,7 @@
+ 	Fname[0] = 0;
+ 
          suggestedname = FindParam("name");
-+		if (!suggestedname) suggestedname = FindParam("filename");
++	if (!suggestedname) suggestedname = FindParam("filename");
+         if (strlen(suggestedname) > NAME_MAX - 50)
+             suggestedname[NAME_MAX - 50] = '\0';
          if (!suggestedname) {
-             MkTmpFileName(SugBuf);
-             suggestedname = SugBuf;
-@@ -777,7 +780,7 @@
+@@ -574,7 +577,7 @@
                      /* strip leading white space */
                      while (*ContentType && isspace((unsigned char) *ContentType)) ++ContentType;
                      StripTrailingSpace(ContentType);
@@ -33,7 +33,7 @@
                      break;
                  case 'd':
  		    MightAskBeforeExecuting = 0;
-@@ -1582,6 +1585,7 @@
+@@ -1237,6 +1240,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)) {
-@@ -1604,7 +1608,7 @@
+@@ -1259,7 +1263,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);
-@@ -1615,9 +1619,13 @@
+@@ -1270,9 +1274,13 @@
              } else if (!lc2strncmp(s, "\nfrom:", 6)) {
                  if (PrintHeads) maybephead(s+1);
                  MailFrom = FreshHeaderCopy(s+6);
@@ -65,7 +65,7 @@
              } else {
                  /* Print any with encoded variables */
                  char *dum = s;
-@@ -2579,12 +2587,13 @@
+@@ -2111,12 +2119,13 @@
  }        
  
  void
================================================================

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