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

Comparing Convert-UUlib/uulib/uuscan.c (file contents):
Revision 1.3.2.1 by root, Sun Mar 31 19:51:30 2002 UTC vs.
Revision 1.3.2.2 by root, Sun Mar 31 19:52:08 2002 UTC

 #include <uudeview.h>
 #include <uuint.h>
 #include <fptools.h>
 #include <uustring.h>
-char * uuscan_id = "$Id: uuscan.c,v 1.3.2.1 2002/03/31 19:51:30 root Exp $";
+char * uuscan_id = "$Id: uuscan.c,v 1.3.2.2 2002/03/31 19:52:08 root Exp $";
 /*
  * Header fields we recognize as such. See RFC822. We add "From ",
  * the usual marker for a beginning of a new message, and a couple
  * of usual MDA, News and MIME headers.
   }
   else {
     /*
      * nothing interesting
      */
-    variable = NULL;
+    return theheaders;
   }
   /*
    * okay, so extract the actual data
    */
   char *line=uuscan_sdline, *bhds1=uuscan_sdbhds1, *bhds2=uuscan_sdbhds2;
   static char *ptr, *p2, *p3=NULL, *bhdsp, bhl;
   int isb64[10], isuue[10], isxxe[10], isbhx[10], iscnt;
   int cbb64, cbuue, cbxxe, cbbhx;
   int bhflag=0, vflag, haddh=0, hadct=0;
-  int bhrpc=0, bhnf=0, c, hcount, lcount, blen;
+  int bhrpc=0, bhnf=0, c, hcount, lcount, blen=0;
   int encoding=0, dflag=0, ctline=42;
   int dontcare=0, hadnl=0;
-  long preheaders, oldposition;
+  long preheaders=0, oldposition;
+  long yefilesize=0, yepartends=0;
   size_t dcc, bhopc;
   *errcode = UURET_OK;
   (void) UUDecodeLine (NULL, NULL, 0);          /* init */
   bhdsp = bhds2;
   if (boundary)
     blen = strlen (boundary);
   while (!feof (datei)) {
     oldposition = ftell (datei);
-    if (_FP_fgets (line, 255, datei) == NULL)
+    if (_FP_fgets (line, 299, datei) == NULL)
       break;
     if (ferror (datei))
       break;
-    line[255] = '\0'; /* For Safety of string functions */
+    line[299] = '\0'; /* For Safety of string functions */
     /*
      * Make Busy Polls
      */
 	result->filename[strlen(result->filename)-1] = '\0';
       continue;
     }
-    if ((strncmp (line, "end", 3) == 0) && result->uudet != BH_ENCODED) {
+    if ((strncmp (line, "end", 3) == 0) &&
+	result->uudet != BH_ENCODED &&
+	result->uudet != YENC_ENCODED) {
       if (result->uudet == B64ENCODED && result->begin)
 	result->uudet = XX_ENCODED;
       if (result->uudet != B64ENCODED) {
 	result->end = 1;
     /*
      * Detect a UUDeview-Style header
      */
-    if (_FP_strnicmp (line, "_=_ Part ", 9) == 0) {
+    if (_FP_strnicmp (line, "_=_ Part ", 9) == 0 &&
+	result->uudet != YENC_ENCODED) {
       if (result->uudet) {
 	fseek (datei, oldposition, SEEK_SET);
 	break;
       }
       result->partno = atoi (line + 8);
     /*
      * Some reduced MIME handling. Only use if boundary == NULL. Also
      * accept the "X-Orcl-Content-Type" used by some braindead program.
      */
-    if (boundary == NULL && !ismime && !uu_more_mime) {
+    if (boundary == NULL && !ismime && !uu_more_mime &&
+	result->uudet != YENC_ENCODED) {
       if (_FP_strnicmp (line, "Content-Type", 12) == 0 ||
 	  _FP_strnicmp (line, "X-Orcl-Content-Type", 19) == 0) {
 	/*
 	 * We use Content-Type to mark a new attachment and split the file.
 	 * However, we do not split if we haven't found anything encoded yet.
      */
     if (boundary == NULL && !ismime && !uu_more_mime && dflag <= 1 &&
 	line[0] == '-' && line[1] == '-' && strlen(line+2)>10 &&
 	(((ptr = _FP_strrstr (line+2, "--")) == NULL) ||
-	 *(ptr+2) != '\012' && *(ptr+2) != '\015') &&
+	 (*(ptr+2) != '\012' && *(ptr+2) != '\015')) &&
 	_FP_strstr (line+2, "_=_") != NULL) {
       if (_FP_fgets (line, 255, datei) == NULL) {
 	break;
       }
       if (_FP_strnicmp (line, "Content-", 8) == 0) {
 	 * recognize the boundary on the next call and use it.
 	 */
 	fseek (datei, oldposition, SEEK_SET);
 	break;
       }
+    }
+    /*
+     * Detection for yEnc encoding
+     */
+    if (strncmp (line, "=ybegin ", 8) == 0 &&
+	_FP_strstr (line, " size=") != NULL &&
+	_FP_strstr (line, " name=") != NULL) {
+      if ((result->begin || result->end) && !uu_more_mime) {
+	fseek (datei, oldposition, SEEK_SET);
+	break;
+      }
+      /*
+       * name continues to the end of the line
+       */
+      _FP_free (result->filename);
+      ptr = _FP_strstr (line, " name=") + 6;
+      result->filename = _FP_strdup (ptr);
+      while (isspace (result->filename[strlen(result->filename)-1]))
+	result->filename[strlen(result->filename)-1] = '\0';
+      /*
+       * Determine size
+       */
+      ptr = _FP_strstr (line, " size=") + 6;
+      yefilesize = atoi (ptr);
+      /*
+       * check for multipart file and read =ypart line
+       */
+      if ((ptr = _FP_strstr (line, " part=")) != NULL) {
+	result->partno = atoi (ptr + 6);
+	if (result->partno == 1) {
+	  result->begin = 1;
+	}
+	if (_FP_fgets (line, 255, datei) == NULL) {
+	  break;
+	}
+	line[255] = '\0';
+	if (strncmp (line, "=ypart ", 7) != 0) {
+	  break;
+	}
+	if ((ptr = _FP_strstr (line, " end=")) == NULL) {
+	  break;
+	}
+	yepartends = atoi (ptr + 5);
+      }
+      else {
+	result->partno = 1;
+	result->begin = 1;
+      }
+      /*
+       * Don't want auto-detection
+       */
+      result->uudet = YENC_ENCODED;
+      continue;
+    }
+    if (strncmp (line, "=yend ", 6) == 0 &&
+	result->uudet == YENC_ENCODED) {
+      if (yepartends == 0 || yepartends >= yefilesize) {
+	result->end = 1;
+      }
+      if (!uu_more_mime)
+	break;
     }
     /*
      * if we haven't yet found anything encoded, try to find something
      */
   /* Base64 doesn't have begin or end */
   if (result->uudet == B64ENCODED)
     result->begin = result->end = 0;
   /* Base64 and BinHex don't have a file mode */
-  if (result->uudet == B64ENCODED || result->uudet == BH_ENCODED)
+  if (result->uudet == B64ENCODED || result->uudet == BH_ENCODED ||
+      result->uudet == YENC_ENCODED)
     result->mode  = 6*64+4*8+4;
   /*
    * When strict MIME adherance is set, throw out suspicious attachments
    */
 fileread *
 ScanPart (FILE *datei, char *fname, int *errcode)
 {
   int ecount, hcount, lcount;
-  int bhflag, begflag, vflag, blen, res;
+  int bhflag, begflag, vflag, blen=0, res;
-  long preheaders, prevpos, preenc, before;
+  long preheaders, prevpos=0, preenc, before;
   char *line=uuscan_spline;
   fileread *result;
   char *ptr1, *ptr2;
   (void) UUDecodeLine (NULL, NULL, 0);          /* init */
 	/* need a restart */
 	_FP_free (result);
 	return NULL;
       }
     }
     /*
      * So this subpart is either plain text or something else. Check
      * the Content-Type and Content-Transfer-Encoding. If the latter
      * is a defined value, we know what to do and just copy everything
      * up to the boundary.
      * message to our encoding detection. Otherwise, treat as plain
      * text.
      * This is done because users might `attach' a uuencoded file, which
      * would then be correctly typed as `text/plain'.
      */
     if (_FP_stristr (localenv.ctenc, "base64") != NULL)
       result->uudet = B64ENCODED;
-    else if (_FP_stristr (localenv.ctenc, "x-uue") != NULL)
+    else if (_FP_stristr (localenv.ctenc, "x-uue") != NULL) {
       result->uudet = UU_ENCODED;
+      result->begin = result->end = 1;
+    }
+    else if (_FP_stristr (localenv.ctenc, "x-yenc") != NULL) {
+      result->uudet = YENC_ENCODED;
+      result->begin = result->end = 1;
+    }
     else if (_FP_stristr (localenv.ctenc, "quoted-printable") != NULL)
       result->uudet = QP_ENCODED;
     else if (_FP_stristr (localenv.ctenc, "7bit") != NULL ||
 	     _FP_stristr (localenv.ctenc, "8bit") != NULL)
       result->uudet = PT_ENCODED;
       if (_FP_stristr (localenv.ctenc, "quoted-printable") != NULL)
 	result->uudet = QP_ENCODED;
       else if (_FP_stristr (localenv.ctenc, "base64") != NULL)
 	result->uudet = B64ENCODED;
-      else if (_FP_stristr (localenv.ctenc, "x-uue") != NULL)
+      else if (_FP_stristr (localenv.ctenc, "x-uue") != NULL) {
 	result->uudet = UU_ENCODED;
+	result->begin = result->end = 1;
+      }
+      else if (_FP_stristr (localenv.ctenc, "x-yenc") != NULL) {
+	result->uudet = YENC_ENCODED;
+	result->begin = result->end = 1;
+      }
       else if (_FP_stristr (localenv.ctenc, "7bit") != NULL ||
 	       _FP_stristr (localenv.ctenc, "8bit") != NULL)
 	result->uudet = PT_ENCODED;
       else if (_FP_stristr (localenv.ctype, "multipart") != NULL ||
 	       _FP_stristr (localenv.ctype, "message")   != NULL)
     result->maxpno = sstate.envelope.numparts;
     result->flags  = FL_PARTIAL |
       ((res==1 || uu_fast_scanning) ? FL_PROPER : 0) |
 	((uu_fast_scanning) ? FL_TOEND : 0);
     result->mimeid = _FP_strdup (sstate.envelope.mimeid);
+    if (result->partno == 1)
+      result->begin = 1;
     if (uu_fast_scanning)
       result->length = progress.fsize - result->startpos;
     else
       result->length = prevpos - result->startpos;
    * text/plain or a proper Content-Transfer-Encoding.
    * We also go in here if we have an assigned filename - this means
    * that we've had a Content-Disposition field, and we should probably
    * decode a plain-text segment with a filename.
    */
   if (sstate.isfolder && sstate.ismime &&
       sstate.mimestate == MS_BODY &&
       (_FP_stristr (sstate.envelope.ctenc, "quoted-printable") != NULL ||
        _FP_stristr (sstate.envelope.ctenc, "base64")           != NULL ||
        _FP_stristr (sstate.envelope.ctenc, "x-uue")            != NULL ||
+       _FP_stristr (sstate.envelope.ctenc, "x-yenc")           != NULL ||
        _FP_stristr (sstate.envelope.ctype, "message")          != NULL ||
        sstate.envelope.fname != NULL)) {
     if (sstate.envelope.subject)
       result->subject = _FP_strdup (sstate.envelope.subject);
     if (_FP_stristr (sstate.envelope.ctenc, "quoted-printable") != NULL)
       result->uudet = QP_ENCODED;
     else if (_FP_stristr (sstate.envelope.ctenc, "base64") != NULL)
       result->uudet = B64ENCODED;
-    else if (_FP_stristr (sstate.envelope.ctenc, "x-uue") != NULL)
+    else if (_FP_stristr (sstate.envelope.ctenc, "x-uue") != NULL) {
       result->uudet = UU_ENCODED;
+      result->begin = result->end = 1;
+    }
+    else if (_FP_stristr (sstate.envelope.ctenc, "x-yenc") != NULL) {
+      result->uudet = YENC_ENCODED;
+    }
     else if (_FP_stristr (sstate.envelope.ctenc, "7bit") != NULL ||
 	     _FP_stristr (sstate.envelope.ctenc, "8bit") != NULL)
       result->uudet = PT_ENCODED;
     else if (_FP_stristr (sstate.envelope.ctype, "multipart") != NULL ||
 	     _FP_stristr (sstate.envelope.ctype, "message")   != NULL ||
 	 */
 	ptr1 = line+2;
 	while (*ptr1 && !isspace(*ptr1))
 	  ptr1++;
 	*ptr1 = '\0';
+	sstate.envelope.mimevers = _FP_strdup ("1.0");
 	sstate.envelope.boundary = _FP_strdup (line+2);
 	/*
 	 * need restart
 	 */
     sstate.isfolder = 0;
     sstate.ismime   = 0;
     UUkillfread   (result);
     return NULL;
   }
   /*
    * produce result
    */
   if (result->uudet == 0 && uu_handletext) {
     result->startpos = before;	/* display headers */
     result->uudet  = PT_ENCODED;
     result->partno = 1;
   }
+  if (result->uudet == YENC_ENCODED && result->filename != NULL) {
+    /*
+     * prevent replacing the filename found on the =ybegin line
+     */
+  }
-  if (sstate.envelope.fname) {
+  else if (sstate.envelope.fname) {
     _FP_free (result->filename);
     if ((result->filename = _FP_strdup (sstate.envelope.fname)) == NULL)
       *errcode = UURET_NOMEM;
   }
   else if ((result->uudet==QP_ENCODED||result->uudet==PT_ENCODED) &&
       *errcode = UURET_NOMEM;
   }
   else {
     /* assign a filename lateron */
   }
   if (result->subject == NULL) {
     if (sstate.envelope.subject)
       result->subject = _FP_strdup (sstate.envelope.subject);
   }

Diff Legend

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

Comparing Convert-UUlib/uulib/uuscan.c (file contents): Revision 1.3.2.1 by root, Sun Mar 31 19:51:30 2002 UTC vs. Revision 1.3.2.2 by root, Sun Mar 31 19:52:08 2002 UTC

Diff Legend

Comparing Convert-UUlib/uulib/uuscan.c (file contents):
Revision 1.3.2.1 by root, Sun Mar 31 19:51:30 2002 UTC vs.
Revision 1.3.2.2 by root, Sun Mar 31 19:52:08 2002 UTC