[ViewVC] Diff of: cvs/Convert-UUlib/uulib/uuencode.c

Comparing Convert-UUlib/uulib/uuencode.c (file contents):
Revision 1.1 by root, Mon Jun 11 19:48:58 2001 UTC vs.
Revision 1.2 by root, Mon Jun 11 20:42:37 2001 UTC

 /*
  * This file is part of uudeview, the simple and friendly multi-part multi-
- * file uudecoder  program  (c)  1994 by Frank Pilhofer. The author may be
+ * file uudecoder  program  (c) 1994-2001 by Frank Pilhofer. The author may
- * contacted by his email address,          fp@informatik.uni-frankfurt.de
+ * be contacted at fp@fpx.de
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
 #endif
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
-#include <uulib.h>
+#include <uudeview.h>
 #include <uuint.h>
 #include <fptools.h>
 #include <uustring.h>
 /* for braindead systems */
 #else
 #define SEEK_SET 0
 #endif
 #endif
-char * uuencode_id = "$Id: uuencode.c,v 1.1 2001/06/11 19:48:58 root Exp $";
+char * uuencode_id = "$Id: uuencode.c,v 1.2 2001/06/11 20:42:37 root Exp $";
 #if 0
 /*
  * the End-Of-Line string. MIME enforces CRLF, so that's what we use. Some
  * implementations of uudecode will complain about a missing end line, since
 #define CTE_BINHEX	"x-binhex"
 #define CTE_TYPE(y)	(((y)==B64ENCODED) ? "Base64"  : \
 			 ((y)==UU_ENCODED) ? CTE_UUENC : \
 			 ((y)==XX_ENCODED) ? CTE_XXENC : \
+                         ((y)==PT_ENCODED) ? "8bit" : \
+                         ((y)==QP_ENCODED) ? "quoted-printable" : \
 			 ((y)==BH_ENCODED) ? CTE_BINHEX : "x-oops")
 /*
  * encoding tables
  */
   'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
   'J', 'K', 'L', 'M', 'N', 'P', 'Q', 'R',
   'S', 'T', 'U', 'V', 'X', 'Y', 'Z', '[',
   '`', 'a', 'b', 'c', 'd', 'e', 'f', 'h',
   'i', 'j', 'k', 'l', 'm', 'p', 'q', 'r'
 };
+unsigned char HexEncodeTable[16] = {
+  '0', '1', '2', '3', '4', '5', '6', '7',
+  '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
+};
 typedef struct {
   char *extension;
   char *mimetype;
 } mimemap;
 	{ "mov",  "video/quicktime"  }, /* Apple Quicktime             */
 	{ "qt",   "video/quicktime"  }, /* Also infrequently used      */
 	{ "mpeg", "video/mpeg"       }, /* Motion Picture Expert Group */
 	{ "mpg",  "video/mpeg"       },
 	{ "mp2",  "video/mpeg"       }, /* dito, MPEG-2 encoded files  */
-	{ "mp3",  "video/mpeg"       }, /* dito, MPEG-3 encoded files  */
+	{ "mp3",  "audio/mpeg"       }, /* dito, MPEG-3 encoded files  */
 	{ "ps",   "application/postscript" }, /* Postscript Language   */
 	{ "zip",  "application/zip"  }, /* ZIP archive                 */
 	{ "doc",  "application/msword"},/* assume Microsoft Word       */
 	{ NULL,   NULL               }
 };
   int index, count;
   long line=0;
   size_t llen;
   if (outfile==NULL || infile==NULL ||
-      (encoding!=UU_ENCODED&&encoding!=XX_ENCODED&&encoding!=B64ENCODED)) {
+      (encoding!=UU_ENCODED&&encoding!=XX_ENCODED&&encoding!=B64ENCODED&&
+       encoding!=PT_ENCODED&&encoding!=QP_ENCODED)) {
     UUMessage (uuencode_id, __LINE__, UUMSG_ERROR,
 	       uustring (S_PARM_CHECK), "UUEncodeStream()");
     return UURET_ILLVAL;
   }
+  /*
+   * Special handling for plain text and quoted printable. Text is
+   * read line oriented.
+   */
+  if (encoding == PT_ENCODED || encoding == QP_ENCODED) {
+    while (!feof (infile) && (linperfile <= 0 || line < linperfile)) {
+      if (FP_fgets (itemp, 255, infile) == NULL) {
+	break;
+      }
+      itemp[255] = '\0';
+      count = strlen (itemp);
+      llen = 0;
+      optr = otemp;
+      /*
+       * Busy Callback
+       */
+      if (UUBUSYPOLL(ftell(infile)-progress.foffset,progress.fsize)) {
+	UUMessage (uuencode_id, __LINE__, UUMSG_NOTE,
+		   uustring (S_ENCODE_CANCEL));
+	return UURET_CANCEL;
+      }
+      if (encoding == PT_ENCODED) {
+	/*
+	 * If there is a line feed, replace by eolstring
+	 */
+	if (count > 0 && itemp[count-1] == '\n') {
+	  itemp[--count] = '\0';
+	  if (fwrite (itemp, 1, count, outfile) != count ||
+	      fwrite ((char *) eolstring, 1,
+		      strlen(eolstring), outfile) != strlen (eolstring)) {
+	    return UURET_IOERR;
+	  }
+	}
+	else {
+	  if (fwrite (itemp, 1, count, outfile) != llen) {
+	    return UURET_IOERR;
+	  }
+	}
+      }
+      else if (encoding == QP_ENCODED) {
+	for (index=0; index<count; index++) {
+	  if (llen == 0 && itemp[index] == '.') {
+	    /*
+	     * Special rule: encode '.' at the beginning of a line, so
+	     * that some mailers aren't confused.
+	     */
+	    *optr++ = '=';
+	    *optr++ = HexEncodeTable[itemp[index] >> 4];
+	    *optr++ = HexEncodeTable[itemp[index] & 0x0f];
+	    llen += 3;
+	  }
+	  else if ((itemp[index] >= 33 && itemp[index] <= 60) ||
+		   (itemp[index] >= 62 && itemp[index] <= 126) ||
+		   itemp[index] == 9 || itemp[index] == 32) {
+	    *optr++ = itemp[index];
+	    llen++;
+	  }
+	  else if (itemp[index] == '\n') {
+	    /*
+	     * If the last character before EOL was a space or tab,
+	     * we must encode it. If llen > 74, there's no space to do
+	     * that, so generate a soft line break instead.
+	     */
+	    if (index>0 && (itemp[index-1] == 9 || itemp[index-1] == 32)) {
+	      *(optr-1) = '=';
+	      if (llen <= 74) {
+		*optr++ = HexEncodeTable[itemp[index-1] >> 4];
+		*optr++ = HexEncodeTable[itemp[index-1] & 0x0f];
+		llen += 2;
+	      }
+	    }
+	    if (fwrite (otemp, 1, llen, outfile) != llen ||
+		fwrite ((char *) eolstring, 1,
+			strlen(eolstring), outfile) != strlen (eolstring)) {
+	      return UURET_IOERR;
+	    }
+	    /*
+	     * Fix the soft line break condition from above
+	     */
+	    if (index>0 && (itemp[index-1] == 9 || itemp[index-1] == 32) &&
+		*(optr-1) == '=') {
+	      otemp[0] = '=';
+	      otemp[1] = HexEncodeTable[itemp[index-1] >> 4];
+	      otemp[2] = HexEncodeTable[itemp[index-1] & 0x0f];
+	      if (fwrite (otemp, 1, 3, outfile) != 3 ||
+		  fwrite ((char *) eolstring, 1,
+			  strlen(eolstring), outfile) != strlen (eolstring)) {
+		return UURET_IOERR;
+	      }
+	    }
+	    optr = otemp;
+	    llen = 0;
+	  }
+	  else {
+	    *optr++ = '=';
+	    *optr++ = HexEncodeTable[itemp[index] >> 4];
+	    *optr++ = HexEncodeTable[itemp[index] & 0x0f];
+	    llen += 3;
+	  }
+	  /*
+	   * Lines must be shorter than 76 characters (not counting CRLF).
+	   * If the line grows longer than that, we must include a soft
+	   * line break.
+	   */
+	  if (itemp[index+1] != 0 && itemp[index+1] != '\n' &&
+	      (llen >= 75 ||
+	       !((itemp[index+1] >= 33 && itemp[index+1] <= 60) ||
+		 (itemp[index+1] >= 62 && itemp[index+1] <= 126)) &&
+	       llen >= 73)) {
+	    *optr++ = '=';
+	    llen++;
+	    if (fwrite (otemp, 1, llen, outfile) != llen ||
+		fwrite ((char *) eolstring, 1,
+			strlen(eolstring), outfile) != strlen (eolstring)) {
+	      return UURET_IOERR;
+	    }
+	    optr = otemp;
+	    llen = 0;
+	  }
+	}
+      }
+      line++;
+    }
+    return UURET_OK;
+  }
+  /*
+   * Handling for binary encodings
+   */
   /*
    * select charset
    */
   table = etables[encoding];
   if (table==NULL || bpl[encoding]==0) {
     UUMessage (uuencode_id, __LINE__, UUMSG_ERROR,
-	       uustring (S_PARM_CHECK), "UUEncodeStream()");
+               uustring (S_PARM_CHECK), "UUEncodeStream()");
     return UURET_ILLVAL;
   }
   while (!feof (infile) && (linperfile <= 0 || line < linperfile)) {
     if ((count = fread (itemp, 1, bpl[encoding], infile)) != bpl[encoding]) {
       if (count == 0)
 	break;
       else if (ferror (infile))
 	return UURET_IOERR;
     }
     optr = otemp;
     llen = 0;
     /*
      * Busy Callback
     }
     /*
      * for UU and XX, encode the number of bytes as first character
      */
     if (encoding == UU_ENCODED || encoding == XX_ENCODED) {
       *optr++ = table[count];
       llen++;
     }
+    /*
+     * Main encoding
+     */
+    if (encoding == UU_ENCODED || encoding == XX_ENCODED ||
+	encoding == B64ENCODED) {
-    for (index=0; index<=count-3; index+=3, llen+=4) {
+      for (index=0; index<=count-3; index+=3, llen+=4) {
-      *optr++ = table[itemp[index] >> 2];
+	*optr++ = table[itemp[index] >> 2];
-      *optr++ = table[((itemp[index  ] & 0x03) << 4) | (itemp[index+1] >> 4)];
+	*optr++ = table[((itemp[index  ] & 0x03) << 4)|(itemp[index+1] >> 4)];
-      *optr++ = table[((itemp[index+1] & 0x0f) << 2) | (itemp[index+2] >> 6)];
+	*optr++ = table[((itemp[index+1] & 0x0f) << 2)|(itemp[index+2] >> 6)];
-      *optr++ = table[  itemp[index+2] & 0x3f];
+	*optr++ = table[  itemp[index+2] & 0x3f];
+      }
     }
     /*
      * Special handling for incomplete lines
      */
     if (index != count) {
       if (encoding == B64ENCODED) {
 	if (count - index == 2) {
 	  *optr++ = table[itemp[index] >> 2];
 	  *optr++ = table[((itemp[index  ] & 0x03) << 4) |
 	  *optr++ = '=';
 	  *optr++ = '=';
 	}
 	llen += 4;
       }
-      else {
+      else if (encoding == UU_ENCODED || encoding == XX_ENCODED) {
 	if (count - index == 2) {
 	  *optr++ = table[itemp[index] >> 2];
 	  *optr++ = table[((itemp[index  ] & 0x03) << 4) |
 			  ( itemp[index+1] >> 4)];
 	  *optr++ = table[((itemp[index+1] & 0x0f) << 2)];
 	  *optr++ = table[0];
 	}
 	llen += 4;
       }
     }
     /*
      * end of line
      */
     tptr = eolstring;
     while (*tptr)
       *optr++ = *tptr++;
   char *ptr;
   if (outfile==NULL ||
       (infile == NULL && infname==NULL) ||
       (outfname==NULL && infname==NULL) ||
-      (encoding!=UU_ENCODED&&encoding!=XX_ENCODED&&encoding!=B64ENCODED)) {
+      (encoding!=UU_ENCODED&&encoding!=XX_ENCODED&&encoding!=B64ENCODED&&
+       encoding!=PT_ENCODED&&encoding!=QP_ENCODED)) {
     UUMessage (uuencode_id, __LINE__, UUMSG_ERROR,
 	       uustring (S_PARM_CHECK), "UUEncodeMulti()");
     return UURET_ILLVAL;
   }
       while (miter->extension && FP_stricmp (ptr+1, miter->extension) != 0)
 	miter++;
       mimetype = miter->mimetype;
     }
   }
+  if (mimetype == NULL && (encoding == PT_ENCODED || encoding == QP_ENCODED)) {
+    mimetype = "text/plain";
+  }
   /*
    * print sub-header
    */
   fprintf (outfile, "Content-Type: %s%s",
   char *ptr;
   int res;
   if ((outfname==NULL&&infname==NULL) || partno<=0 ||
       (infile == NULL&&infname==NULL) || outfile==NULL ||
-      (encoding!=UU_ENCODED&&encoding!=XX_ENCODED&&encoding!=B64ENCODED)) {
+      (encoding!=UU_ENCODED&&encoding!=XX_ENCODED&&encoding!=B64ENCODED&&
+       encoding!=PT_ENCODED&&encoding!=QP_ENCODED)) {
     UUMessage (uuencode_id, __LINE__, UUMSG_ERROR,
 	       uustring (S_PARM_CHECK), "UUEncodePartial()");
     return UURET_ILLVAL;
   }
 	while (miter->extension && FP_stricmp (ptr+1, miter->extension) != 0)
 	  miter++;
 	mimetype = miter->mimetype;
       }
     }
+    if (mimetype == NULL && (encoding==PT_ENCODED || encoding==QP_ENCODED)) {
+      mimetype = "text/plain";
+    }
     /*
      * print sub-header
      */
     fprintf (outfile, "MIME-Version: 1.0%s", eolstring);
     fprintf (outfile, "%c%s",
 	     (encoding==UU_ENCODED) ? UUEncodeTable[0] : XXEncodeTable[0],
 	     eolstring);
     fprintf (outfile, "end%s", eolstring);
   }
   /*
    * empty line at end does no harm
    */
+  if (encoding != PT_ENCODED && encoding != QP_ENCODED) {
-  fprintf (outfile, "%s", eolstring);
+    fprintf (outfile, "%s", eolstring);
+  }
   if (infile==NULL) {
     if (res != UURET_OK) {
       progress.action = 0;
       fclose (theifile);
   int res;
   if (outfile==NULL ||
       (infile == NULL&&infname==NULL) ||
       (outfname==NULL&&infname==NULL) ||
-      (encoding!=UU_ENCODED&&encoding!=XX_ENCODED&&encoding!=B64ENCODED)) {
+      (encoding!=UU_ENCODED&&encoding!=XX_ENCODED&&encoding!=B64ENCODED&&
+       encoding!=PT_ENCODED&&encoding!=QP_ENCODED)) {
     UUMessage (uuencode_id, __LINE__, UUMSG_ERROR,
 	       uustring (S_PARM_CHECK), "UUEncodeToStream()");
     return UURET_ILLVAL;
   }
   FILE *theifile, *outfile;
   struct stat finfo;
   if ((diskname==NULL&&infname==NULL) ||
       (outfname==NULL&&infname==NULL) || (infile==NULL&&infname==NULL) ||
-      (encoding!=UU_ENCODED&&encoding!=XX_ENCODED&&encoding!=B64ENCODED)) {
+      (encoding!=UU_ENCODED&&encoding!=XX_ENCODED&&encoding!=B64ENCODED&&
+       encoding!=PT_ENCODED&&encoding!=QP_ENCODED)) {
     UUMessage (uuencode_id, __LINE__, UUMSG_ERROR,
 	       uustring (S_PARM_CHECK), "UUEncodeToFile()");
     return UURET_ILLVAL;
   }
 		char *infname, int encoding,
 		char *outfname, int filemode,
 		char *destination, char *from,
 		char *subject, int isemail)
 {
+  return UUE_PrepSingleExt (outfile, infile,
+			    infname, encoding,
+			    outfname, filemode,
+			    destination, from,
+			    subject, NULL,
+			    isemail);
+}
+int UUEXPORT
+UUE_PrepSingleExt (FILE *outfile, FILE *infile,
+		   char *infname, int encoding,
+		   char *outfname, int filemode,
+		   char *destination, char *from,
+		   char *subject, char *replyto,
+		   int isemail)
+{
   mimemap *miter=mimetable;
   char *subline, *oname;
   char *mimetype, *ptr;
   int res, len;
   if ((outfname==NULL&&infname==NULL) || (infile==NULL&&infname==NULL) ||
-      (encoding!=UU_ENCODED&&encoding!=XX_ENCODED&&encoding!=B64ENCODED)) {
+      (encoding!=UU_ENCODED&&encoding!=XX_ENCODED&&encoding!=B64ENCODED&&
+       encoding!=PT_ENCODED&&encoding!=QP_ENCODED)) {
     UUMessage (uuencode_id, __LINE__, UUMSG_ERROR,
 	       uustring (S_PARM_CHECK), "UUE_PrepSingle()");
     return UURET_ILLVAL;
   }
     mimetype = miter->mimetype;
   }
   else
     mimetype = NULL;
+  if (mimetype == NULL && (encoding == PT_ENCODED || encoding == QP_ENCODED)) {
+    mimetype = "text/plain";
+  }
   if ((subline = (char *) malloc (len)) == NULL) {
     UUMessage (uuencode_id, __LINE__, UUMSG_ERROR,
 	       uustring (S_OUT_OF_MEMORY), len);
     return UURET_NOMEM;
   }
   if (subject)
     sprintf (subline, "%s (001/001) - [ %s ]", subject, oname);
   else
     sprintf (subline, "[ %s ] (001/001)", oname);
-  fprintf (outfile, "Subject: %s%s", subline, eolstring);
   if (from) {
     fprintf (outfile, "From: %s%s", from, eolstring);
   }
   if (destination) {
     fprintf (outfile, "%s: %s%s",
 	     (isemail)?"To":"Newsgroups",
 	     destination, eolstring);
   }
+  fprintf (outfile, "Subject: %s%s", subline, eolstring);
+  if (replyto) {
+    fprintf (outfile, "Reply-To: %s%s", replyto, eolstring);
+  }
   fprintf (outfile, "MIME-Version: 1.0%s", eolstring);
   fprintf (outfile, "Content-Type: %s; name=\"%s\"%s",
 	   (mimetype)?mimetype:"Application/Octet-Stream",
 	   UUFNameFilter ((outfname)?outfname:infname),
 	   eolstring);
 		 char *outfname, int filemode,
 		 int partno, long linperfile, long filesize,
 		 char *destination, char *from, char *subject,
 		 int isemail)
 {
+  return UUE_PrepPartialExt (outfile, infile,
+			     infname, encoding,
+			     outfname, filemode,
+			     partno, linperfile, filesize,
+			     destination,
+			     from, subject, NULL,
+			     isemail);
+}
+int UUEXPORT
+UUE_PrepPartialExt (FILE *outfile, FILE *infile,
+		    char *infname, int encoding,
+		    char *outfname, int filemode,
+		    int partno, long linperfile, long filesize,
+		    char *destination,
+		    char *from, char *subject, char *replyto,
+		    int isemail)
+{
   static int numparts, themode;
   static char mimeid[64];
   static FILE *theifile;
   struct stat finfo;
   char *subline, *oname;
   long thesize;
   int res, len;
   if ((outfname==NULL&&infname==NULL) || (infile==NULL&&infname==NULL) ||
-      (encoding!=UU_ENCODED&&encoding!=XX_ENCODED&&encoding!=B64ENCODED)) {
+      (encoding!=UU_ENCODED&&encoding!=XX_ENCODED&&encoding!=B64ENCODED&&
+       encoding!=PT_ENCODED&&encoding!=QP_ENCODED)) {
     UUMessage (uuencode_id, __LINE__, UUMSG_ERROR,
 	       uustring (S_PARM_CHECK), "UUE_PrepPartial()");
     return UURET_ILLVAL;
   }
      * if there's one part only, don't use Message/Partial
      */
     if (numparts == 1) {
       if (infile==NULL) fclose (theifile);
-      return UUE_PrepSingle (outfile, infile, infname, encoding,
+      return UUE_PrepSingleExt (outfile, infile, infname, encoding,
-			     outfname, filemode, destination,
+				outfname, filemode, destination,
-			     from, subject, isemail);
+				from, subject, replyto, isemail);
     }
     /*
      * we also need a unique ID
      */
 	     subject, partno, numparts, oname);
   else
     sprintf (subline, "[ %s ] (%03d/%03d)",
 	     oname, partno, numparts);
-  fprintf (outfile, "Subject: %s%s", subline, eolstring);
   if (from) {
     fprintf (outfile, "From: %s%s", from, eolstring);
   }
   if (destination) {
     fprintf (outfile, "%s: %s%s",
 	     (isemail)?"To":"Newsgroups",
 	     destination, eolstring);
   }
+  fprintf (outfile, "Subject: %s%s", subline, eolstring);
+  if (replyto) {
+    fprintf (outfile, "Reply-To: %s%s", replyto, eolstring);
+  }
   fprintf (outfile, "MIME-Version: 1.0%s", eolstring);
   fprintf (outfile, "Content-Type: Message/Partial; number=%d; total=%d;%s",
 	   partno, numparts, eolstring);
   fprintf (outfile, "\tid=\"%s\"%s",
 	   mimeid, eolstring);

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing Convert-UUlib/uulib/uuencode.c (file contents): Revision 1.1 by root, Mon Jun 11 19:48:58 2001 UTC vs. Revision 1.2 by root, Mon Jun 11 20:42:37 2001 UTC

Diff Legend

Comparing Convert-UUlib/uulib/uuencode.c (file contents):
Revision 1.1 by root, Mon Jun 11 19:48:58 2001 UTC vs.
Revision 1.2 by root, Mon Jun 11 20:42:37 2001 UTC