add methods to control line folding

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35826 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -2,6 +2,8 @@
 
         * Source/GSHTTPURLHandle.m: Set content-length header in outgoing
         request if not already set.
+	* Headers/Additions/GNUstepBase/GSMime.h:
+        * Source/Additions/GSMime.m: Add methods to control line folding.
 
 2012-11-25 14:39-EST Gregory John Casamento <greg.casamento@gmail.com>
 

Headers/GNUstepBase/GSMime.h

@@ -104,6 +104,8 @@ extern "C" {
 - (NSDictionary*) parametersPreservingCase: (BOOL)preserve;
 - (NSMutableData*) rawMimeData;
 - (NSMutableData*) rawMimeDataPreservingCase: (BOOL)preserve;
+- (NSMutableData*) rawMimeDataPreservingCase: (BOOL)preserve
+                                    foldedAt: (NSUInteger)fold;
 - (void) setName: (NSString*)s;
 - (void) setObject: (id)o  forKey: (NSString*)k;
 - (void) setParameter: (NSString*)v forKey: (NSString*)k;
@@ -186,6 +188,7 @@ extern "C" {
 - (GSMimeHeader*) makeMessageID;
 - (NSMutableData*) rawMimeData;
 - (NSMutableData*) rawMimeData: (BOOL)isOuter;
+- (NSMutableData*) rawMimeData: (BOOL)isOuter foldedAt: (NSUInteger)fold;
 - (void) setContent: (id)newContent;
 - (void) setContent: (id)newContent
 	       type: (NSString*)type;

Source/Additions/GSMime.m

@@ -3607,20 +3607,11 @@ static NSCharacterSet	*tokenSet = nil;
   return [m makeImmutableCopyOnFail: YES];
 }
 
-/**
- * Returns the full text of the header, built from its component parts,
- * and including a terminating CR-LF
- */
-- (NSMutableData*) rawMimeData
-{
-  return [self rawMimeDataPreservingCase: NO];
-}
-
 static NSUInteger
 appendBytes(NSMutableData *m, NSUInteger offset, NSUInteger fold,
   const char *bytes, NSUInteger size)
 {
-  if (offset + size > fold && size + 8 <= fold)
+  if (fold > 0 && offset + size > fold && size + 8 <= fold)
     {
       NSUInteger  len = [m length];
 
@@ -3713,7 +3704,7 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
           d = wordData(sub);
           offset = appendBytes(m, offset, fold, [d bytes], [d length]);
         }
-      if (offset > fold)
+      if (fold > 0 && offset > fold)
         {
           *ok = NO;
         }
@@ -3721,30 +3712,45 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
   return offset;
 }
 
+/**
+ * Returns the full text of the header, built from its component parts,
+ * and including a terminating CR-LF
+ */
+- (NSMutableData*) rawMimeData
+{
+  return [self rawMimeDataPreservingCase: NO];
+}
+
+- (NSMutableData*) rawMimeDataPreservingCase: (BOOL)preserve
+{
+  // 78 is what the RFCs say we should limit length to.
+  return [self rawMimeDataPreservingCase: NO foldedAt: 78];
+}
+
 /**
  * Returns the full text of the header, built from its component parts,
  * and including a terminating CR-LF.<br />
  * If preserve is YES then we attempt to build the text using the same
  * case as it was originally parsed/set from, otherwise we use common
  * conventions of capitalising the header names and using lowercase
- * parameter names.
+ * parameter names.<br />
+ * If fold is greater than zero, lines with more than the specified
+ * number of characters are considered 'long' and are folded into
+ * multiple lines.
  */
 - (NSMutableData*) rawMimeDataPreservingCase: (BOOL)preserve
+                                    foldedAt: (NSUInteger)fold
 {
   NSMutableData	*md = [NSMutableData dataWithCapacity: 128];
   NSEnumerator	*e = [params keyEnumerator];
   NSString	*k;
   NSString	*n;
   NSData	*d;
-  NSUInteger	fold = 78;      // Maybe pass as a parameter in a later release?
   NSUInteger	offset = 0;
   BOOL		conv = YES;
   BOOL          ok = YES;
 
-  if (fold == 0)
-    {
-      fold = 78;        // This is what the RFCs say we should limit length to.
-    }
+  
   n = [self namePreservingCase: preserve];
   d = [n dataUsingEncoding: NSASCIIStringEncoding];
   if (preserve == YES)
@@ -3762,8 +3768,8 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
     }
   else
     {
-      NSUInteger  l = [d length];
-      char	buf[l];
+      NSUInteger        l = [d length];
+      char	        buf[l];
       NSUInteger	i = 0;
 
       /*
@@ -5654,6 +5660,25 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
  * <p>The isOuter flag denotes whether this document is the outermost
  * part of a MIME message, or is a part of a multipart message.
  * </p>
+ * <p>Long lines are folded at the default column.
+ * </p>
+ */
+- (NSMutableData*) rawMimeData: (BOOL)isOuter
+{
+  // 78 is the maximum line lengt specified by MIME RFCs
+  return [self rawMimeData: isOuter foldedAt: 78];
+}
+
+/**
+ * <p>Return an NSData object representing the MIME document as raw data
+ * ready to be sent via an email system.
+ * </p>
+ * <p>The isOuter flag denotes whether this document is the outermost
+ * part of a MIME message, or is a part of a multipart message.
+ * </p>
+ * <p>The fold number specifes the column at which lines are considered
+ * to be 'long', and get broken/folded.
+ * </p>
  * <p>During generation of the document this method will perform some
  * consistency checks and try to automatically generate missing header
  * information needed to build the mime data (eg. filling in the boundary
@@ -5662,7 +5687,7 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
  * fill in as much detail as possible before generating data.
  * </p>
  */
-- (NSMutableData*) rawMimeData: (BOOL)isOuter
+- (NSMutableData*) rawMimeData: (BOOL)isOuter foldedAt: (NSUInteger)fold
 {
   NSMutableArray	*partData = nil;
   NSMutableData		*md = [NSMutableData dataWithCapacity: 1024];
@@ -5714,14 +5739,14 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
 	{
 	  GSMimeDocument	*part = [content objectAtIndex: i];
 
-	  [partData addObject: [part rawMimeData: NO]];
+	  [partData addObject: [part rawMimeData: NO foldedAt: fold]];
 
 	  /*
 	   * If any part of a multipart document is not 7bit then
 	   * the document as a whole must not be 7bit either.
 	   * It is important to check this *after* the part has been
-	   * processed by -rawMimeData:, so we know that the encoding
-	   * set for the part is valid.
+	   * processed by -rawMimeData:foldedAt:, so we know that the
+           * encoding set for the part is valid.
 	   */
 	  if (contentIs7bit == YES)
 	    {
@@ -6030,7 +6055,7 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
   enumerator = [headers objectEnumerator];
   while ((hdr = [enumerator nextObject]) != nil)
     {
-      [md appendData: [hdr rawMimeData]];
+      [md appendData: [hdr rawMimeDataPreservingCase: NO foldedAt: fold]];
     }
 
   if (partData != nil)