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

Comparing Convert-UUlib/uulib/uuscan.c (file contents):
Revision 1.3 by root, Tue Aug 7 13:38:38 2001 UTC vs.
Revision 1.3.2.4 by root, Thu Nov 6 13:08:24 2003 UTC

 #include <uudeview.h>
 #include <uuint.h>
 #include <fptools.h>
 #include <uustring.h>
-char * uuscan_id = "$Id: uuscan.c,v 1.3 2001/08/07 13:38:38 root Exp $";
+char * uuscan_id = "$Id: uuscan.c,v 1.3.2.4 2003/11/06 13:08:24 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.
 /*
  * mallocable areas
  */
 char *uuscan_shlline;
+char *uuscan_shlline2;
 char *uuscan_pvvalue;
 char *uuscan_phtext;
 char *uuscan_sdline;
 char *uuscan_sdbhds1;
 char *uuscan_sdbhds2;
 IsLineEmpty (char *data)
 {
   if (data == NULL) return 0;
   while (*data && isspace (*data)) data++;
   return ((*data)?0:1);
+}
+/*
+ * Is this a header line? A header line has alphanumeric characters
+ * followed by a colon.
+ */
+static int
+IsHeaderLine (char *data)
+{
+  if (data == NULL) return 0;
+  if (*data == ':') return 0;
+  while (*data && isalnum (*data)) data++;
+  return (*data == ':') ? 1 : 0;
 }
 /*
  * Scans a potentially folded header line from the input file. If
  * initial is non-NULL, it is the first line of the header, useful
 static char *
 ScanHeaderLine (FILE *datei, char *initial)
 {
   char *ptr=uuscan_shlline;
+  char *ptr2, *p1, *p2, *p3;
   int llength, c;
   long curpos;
   int hadcr;
   if (initial) {
-    FP_strncpy (uuscan_shlline, initial, 1024);
+    _FP_strncpy (uuscan_shlline, initial, 1024);
   }
   else {
     /* read first line */
     if (feof (datei) || ferror (datei))
       return NULL;
-    if (FP_fgets (uuscan_shlline, 1023, datei) == NULL)
+    if (_FP_fgets (uuscan_shlline, 1023, datei) == NULL)
       return NULL;
     uuscan_shlline[1023] = '\0';
   }
   llength = strlen (uuscan_shlline);
     if (feof (datei))
       break;
     /* read next line */
     curpos = ftell (datei);
-    if (FP_fgets (uugen_inbuffer, 255, datei) == NULL)
+    if (_FP_fgets (uugen_inbuffer, 255, datei) == NULL)
       break;
     uugen_inbuffer[255] = '\0';
     if (IsLineEmpty (uugen_inbuffer)) { /* oops */
       fseek (datei, curpos, SEEK_SET);
       break;
     }
-    FP_strncpy (ptr, uugen_inbuffer, 1024-llength);
+    _FP_strncpy (ptr, uugen_inbuffer, 1024-llength);
     /*
      * see if line was terminated with CR. Otherwise, it continues ...
      */
     c = strlen (ptr);
     llength += c;
     while (llength && isspace(*(ptr-1))) {
       ptr--; llength--;
     }
   }
   *ptr = '\0';
   if (llength == 0)
     return NULL;
+  /*
+   * Now that we've read the header line, we can RFC 1522-decode it
+   */
+  ptr = uuscan_shlline;
+  ptr2 = uuscan_shlline2;
+  while (*ptr) {
+    /*
+     * Look for =? magic
+     */
+    if (*ptr == '=' && *(ptr+1) == '?') {
+      /*
+       * Let p1 point to the charset, look for next question mark
+       */
+      p1 = p2 = ptr+2;
+      while (*p2 && *p2 != '?') {
+	p2++;
+      }
+      if (*p2 == '?' &&
+	  (*(p2+1) == 'q' || *(p2+1) == 'Q' ||
+	   *(p2+1) == 'b' || *(p2+1) == 'B') &&
+	  *(p2+2) == '?') {
+	/*
+	 * Let p2 point to the encoding, look for ?= magic
+	 */
+	p2++;
+	p3=p2+2;
+	while (*p3 && (*p3 != '?' || *(p3+1) != '=')) {
+	  p3++;
+	}
+	if (*p3 == '?' && *(p3+1) == '=') {
+	  /*
+	   * Alright, we've found an RFC 1522 header field
+	   */
+	  if (*p2 == 'q' || *p2 == 'Q') {
+	    c = UUDecodeField (p2+2, ptr2, QP_ENCODED);
+	  }
+	  else if (*p2 == 'b' || *p2 == 'B') {
+	    c = UUDecodeField (p2+2, ptr2, B64ENCODED);
+	  }
+	  if (c >= 0) {
+	    ptr2 += c;
+	    ptr = p3+2;
+	    continue;
+	  }
+	}
+      }
+    }
+    *ptr2++ = *ptr++;
+  }
+  *ptr2 = 0;
-  return uuscan_shlline;
+  return uuscan_shlline2;
 }
 /*
  * Extract the value from a MIME attribute=value pair. This function
  * receives a pointer to the attribute.
   if (*attribute == '"') {
     /* quoted-string */
     attribute++;
     while (*attribute && *attribute != '"' && length < 255) {
-      if (*attribute == '\\'
-          && (attribute[1] == '"'
-              || attribute[1] == '\015'
-              || attribute[1] == '\\'))
-        /* we dequote only the three characters that MUST be quoted, since
-         * microsoft is obviously unable to correctly implement even mime headers:
-         * filename="c:\xxx". *sigh*
-         */
-	*ptr++ = *++attribute;
-      else
-	*ptr++ = *attribute;
+      *ptr++ = *attribute++;
-      attribute++;
       length++;
     }
     *ptr = '\0';
   }
   else {
     /* tspecials from RFC1521 */
+    /*
+     * Note - exclude '[', ']' and ';' on popular request; these are
+     * used in some Content-Type fields by the Klez virus, and people
+     * who feed their virus scanners with the output of UUDeview would
+     * like to catch it!
+     */
     while (*attribute && !isspace (*attribute) &&
 	   *attribute != '(' && *attribute != ')' &&
 	   *attribute != '<' && *attribute != '>' &&
 	   *attribute != '@' && *attribute != ',' &&
-	   *attribute != ';' && *attribute != ':' &&
+	   /* *attribute != ';' && */ *attribute != ':' &&
 	   *attribute != '\\' &&*attribute != '"' &&
-	   *attribute != '/' && *attribute != '[' &&
+	   *attribute != '/' && /* *attribute != '[' &&
-	   *attribute != ']' && *attribute != '?' &&
+	   *attribute != ']' && */ *attribute != '?' &&
 	   *attribute != '=' && length < 255)
       *ptr++ = *attribute++;
     *ptr = '\0';
   }
 {
   char **variable=NULL;
   char *value, *ptr, *thenew;
   int delimit, length;
-  value = 0; delimit = 0; /* calm down gcc */
   if (line == NULL)
     return theheaders;
-  if (FP_strnicmp (line, "From:", 5) == 0) {
+  if (_FP_strnicmp (line, "From:", 5) == 0) {
     if (theheaders->from) return theheaders;
     variable = &theheaders->from;
     value    = line+5;
     delimit  = 0;
   }
-  else if (FP_strnicmp (line, "Subject:", 8) == 0) {
+  else if (_FP_strnicmp (line, "Subject:", 8) == 0) {
     if (theheaders->subject) return theheaders;
     variable = &theheaders->subject;
     value    = line+8;
     delimit  = 0;
   }
-  else if (FP_strnicmp (line, "To:", 3) == 0) {
+  else if (_FP_strnicmp (line, "To:", 3) == 0) {
     if (theheaders->rcpt) return theheaders;
     variable = &theheaders->rcpt;
     value    = line+3;
     delimit  = 0;
   }
-  else if (FP_strnicmp (line, "Date:", 5) == 0) {
+  else if (_FP_strnicmp (line, "Date:", 5) == 0) {
     if (theheaders->date) return theheaders;
     variable = &theheaders->date;
     value    = line+5;
     delimit  = 0;
   }
-  else if (FP_strnicmp (line, "Mime-Version:", 13) == 0) {
+  else if (_FP_strnicmp (line, "Mime-Version:", 13) == 0) {
     if (theheaders->mimevers) return theheaders;
     variable = &theheaders->mimevers;
     value    = line+13;
     delimit  = 0;
   }
-  else if (FP_strnicmp (line, "Content-Type:", 13) == 0) {
+  else if (_FP_strnicmp (line, "Content-Type:", 13) == 0) {
     if (theheaders->ctype) return theheaders;
     variable = &theheaders->ctype;
     value    = line+13;
     delimit  = ';';
     /* we can probably extract more information */
-    if ((ptr = FP_stristr (line, "boundary")) != NULL) {
+    if ((ptr = _FP_stristr (line, "boundary")) != NULL) {
       if ((thenew = ParseValue (ptr))) {
 	if (theheaders->boundary) free (theheaders->boundary);
-	theheaders->boundary = FP_strdup (thenew);
+	theheaders->boundary = _FP_strdup (thenew);
-      }
-    }
+      }
+    }
-    if ((ptr = FP_stristr (line, "name")) != NULL) {
+    if ((ptr = _FP_stristr (line, "name")) != NULL) {
       if ((thenew = ParseValue (ptr))) {
 	if (theheaders->fname) free (theheaders->fname);
-	theheaders->fname = FP_strdup (thenew);
+	theheaders->fname = _FP_strdup (thenew);
-      }
-    }
+      }
+    }
-    if ((ptr = FP_stristr (line, "id")) != NULL) {
+    if ((ptr = _FP_stristr (line, "id")) != NULL) {
       if ((thenew = ParseValue (ptr))) {
 	if (theheaders->mimeid) free (theheaders->mimeid);
-	theheaders->mimeid = FP_strdup (thenew);
+	theheaders->mimeid = _FP_strdup (thenew);
-      }
-    }
+      }
+    }
-    if ((ptr = FP_stristr (line, "number")) != NULL) {
+    if ((ptr = _FP_stristr (line, "number")) != NULL) {
       if ((thenew = ParseValue (ptr))) {
 	theheaders->partno = atoi (thenew);
       }
     }
-    if ((ptr = FP_stristr (line, "total")) != NULL) {
+    if ((ptr = _FP_stristr (line, "total")) != NULL) {
       if ((thenew = ParseValue (ptr))) {
 	theheaders->numparts = atoi (thenew);
       }
     }
   }
-  else if (FP_strnicmp (line, "Content-Transfer-Encoding:", 26) == 0) {
+  else if (_FP_strnicmp (line, "Content-Transfer-Encoding:", 26) == 0) {
     if (theheaders->ctenc) return theheaders;
     variable = &theheaders->ctenc;
     value    = line+26;
     delimit  = ';';
   }
-  else if (FP_strnicmp (line, "Content-Disposition:", 20) == 0) {
+  else if (_FP_strnicmp (line, "Content-Disposition:", 20) == 0) {
     /*
      * Some encoders mention the original filename as parameter to
      * Content-Type, others as parameter to Content-Disposition. We
      * do prefer the first solution, but accept this situation, too.
      * TODO: Read RFC1806
      */
-    if ((ptr = FP_stristr (line, "name")) != NULL) {
+    if ((ptr = _FP_stristr (line, "name")) != NULL) {
       if (theheaders->fname == NULL && (thenew=ParseValue(ptr)) != NULL) {
-	theheaders->fname = FP_strdup (thenew);
+	theheaders->fname = _FP_strdup (thenew);
       }
     }
     variable = NULL;
   }
   else {
     /*
      * nothing interesting
      */
-    variable = NULL;
+    return theheaders;
   }
   /*
    * okay, so extract the actual data
    */
     while (length && isspace(*(ptr-1))) {
       ptr--; length--;
     }
     *ptr = '\0';
-    if ((*variable = FP_strdup (uuscan_phtext)) == NULL)
+    if ((*variable = _FP_strdup (uuscan_phtext)) == NULL)
       return NULL;
   }
   return theheaders;
 }
 IsKnownHeader (char *line)
 {
   char **iter = knownmsgheaders;
   while (iter && *iter) {
-    if (FP_strnicmp (line, *iter, strlen (*iter)) == 0)
+    if (_FP_strnicmp (line, *iter, strlen (*iter)) == 0)
       return 1;
     iter++;
   }
   iter = knownmimeheaders;
   while (iter && *iter) {
-    if (FP_strnicmp (line, *iter, strlen (*iter)) == 0)
+    if (_FP_strnicmp (line, *iter, strlen (*iter)) == 0)
       return 2;
     iter++;
   }
   return 0;
 	  char *boundary, int ismime, int checkheaders,
 	  fileread *result)
 {
   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 islen[10], 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;
-  blen = 0; preheaders = 0; /* calm down gcc */
   *errcode = UURET_OK;
   (void) UUDecodeLine (NULL, NULL, 0);          /* init */
   bhdsp = bhds2;
   result->startpos = ftell (datei);
   hcount = lcount  = 0;
   for (iscnt=0; iscnt<10; iscnt++) {
     isb64[iscnt] = isuue[iscnt] = isxxe[iscnt] = isbhx[iscnt] = 0;
+    islen[iscnt] = -1;
   }
   iscnt = 0;
   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
      */
 	strncmp (line+2, boundary, blen) == 0) {
       fseek (datei, oldposition, SEEK_SET);
       break;
     }
     if (boundary != NULL && line[0] == 'C' && line[1] == 'o' &&
-	FP_strnicmp (line, "Content-Type:", 13) == 0) {
+	_FP_strnicmp (line, "Content-Type:", 13) == 0) {
       ptr = ScanHeaderLine (datei, line);
-      p2  = (ptr)?FP_stristr(ptr,"boundary"):NULL;
+      p2  = (ptr)?_FP_stristr(ptr,"boundary"):NULL;
       p3  = (p2)?ParseValue(p2):NULL;
       if (p3 && strcmp (p3, boundary) == 0) {
 	fseek (datei, oldposition, SEEK_SET);
 	break;
 	p3 = NULL;
       }
     }
     if (strncmp      (line, "begin ",       6) == 0 ||
-	FP_strnicmp (line, "<pre>begin ", 11) == 0) {
+	_FP_strnicmp (line, "<pre>begin ", 11) == 0) {
       if ((result->begin || result->end ||
 	   result->uudet == B64ENCODED ||
 	   result->uudet == BH_ENCODED) && !uu_more_mime) {
 	fseek (datei, oldposition, SEEK_SET);
 	break;
       while (*ptr == ' ') ptr++;
       /*
        * We may have picked up a filename from a uuenview-style header
        */
-      FP_free (result->filename);
+      _FP_free (result->filename);
-      result->filename = FP_strdup (ptr);
+      result->filename = _FP_strdup (ptr);
       result->begin    = 1;
       while (isspace (result->filename[strlen(result->filename)-1]))
 	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);
-      if ((ptr = FP_stristr (line, "of file ")) != NULL) {
+      if ((ptr = _FP_stristr (line, "of file ")) != NULL) {
 	ptr += 8;
 	while (isspace (*ptr)) ptr++;
 	p2 = ptr;
 	while (isalnum(*p2) ||
 	       *p2 == '.' || *p2=='_' || *p2 == '-' ||
 	       *p2 == '!' || *p2=='@' || *p2 == '$')
 	  p2++;
 	c = *p2; *p2 = '\0';
 	if (p2 != ptr && result->filename == NULL)
-	  result->filename = FP_strdup (ptr);
+	  result->filename = _FP_strdup (ptr);
 	else if (p2 - ptr > 5 && strchr (ptr, '.') != NULL) {
 	  /*
 	   * This file name looks good, too. Let's use it
 	   */
-	  FP_free (result->filename);
+	  _FP_free (result->filename);
-	  result->filename = FP_strdup (ptr);
+	  result->filename = _FP_strdup (ptr);
 	}
 	*p2 = c;
       }
     }
     /*
      * 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 ||
+      if (_FP_strnicmp (line, "Content-Type", 12) == 0 ||
-	  FP_strnicmp (line, "X-Orcl-Content-Type", 19) == 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 (result->uudet) {
 	  ptr++;
 	  while (isspace (*ptr)) ptr++; p2 = ptr;
 	  while (!isspace (*p2) && *p2 != ';') p2++;
 	  c = *p2; *p2 = '\0';
 	  if (p2 != ptr) {
-	    FP_free (result->mimetype);
+	    _FP_free (result->mimetype);
-	    result->mimetype = FP_strdup (ptr);
+	    result->mimetype = _FP_strdup (ptr);
 	  }
 	  *p2 = c;
 	}
 	ctline=0;
 	hadct=1;
       }
-      if ((ptr = FP_stristr (line, "number=")) && ctline<4) {
+      if ((ptr = _FP_stristr (line, "number=")) && ctline<4) {
 	ptr += 7; if (*ptr == '"') ptr++;
 	result->partno = atoi (ptr);
       }
-      if ((ptr = FP_stristr (line, "total=")) && ctline<4) {
+      if ((ptr = _FP_stristr (line, "total=")) && ctline<4) {
 	ptr += 6; if (*ptr == '"') ptr++;
 	result->maxpno = atoi (ptr);
       }
-      if ((ptr = FP_stristr (line, "name=")) && ctline<4) {
+      if ((ptr = _FP_stristr (line, "name=")) && ctline<4) {
 	ptr += 5;
 	while (isspace (*ptr)) ptr++;
 	if (*ptr == '"' && *(ptr+1) && (p2 = strchr (ptr+2, '"')) != NULL) {
 	  c = *p2; *p2 = '\0';
-	  FP_free (result->filename);
+	  _FP_free (result->filename);
-	  result->filename = FP_strdup (ptr+1);
+	  result->filename = _FP_strdup (ptr+1);
 	  *p2 = c;
 	}
 	else if (*ptr=='\''&&*(ptr+1)&&(p2 = strchr(ptr+2, '\'')) != NULL) {
 	  c = *p2; *p2 = '\0';
-	  FP_free (result->filename);
+	  _FP_free (result->filename);
-	  result->filename = FP_strdup (ptr+1);
+	  result->filename = _FP_strdup (ptr+1);
 	  *p2 = c;
 	}
 	else {
 	  p2 = ptr;
 	  while (isalnum(*p2) ||
 		 *p2 == '.' || *p2=='_' || *p2 == '-' ||
 		 *p2 == '!' || *p2=='@' || *p2 == '$')
 	    p2++;
 	  c = *p2; *p2 = '\0';
 	  if (p2 != ptr && result->filename == NULL)
-	    result->filename = FP_strdup (ptr);
+	    result->filename = _FP_strdup (ptr);
 	  else if (p2 - ptr > 5 && strchr (ptr, '.') != NULL) {
 	    /*
 	     * This file name looks good, too. Let's use it
 	     */
-	    FP_free (result->filename);
+	    _FP_free (result->filename);
-	    result->filename = FP_strdup (ptr);
+	    result->filename = _FP_strdup (ptr);
 	  }
 	  *p2 = c;
 	}
       }
-      if ((ptr = FP_stristr (line, "id=")) && ctline<4) {
+      if ((ptr = _FP_stristr (line, "id=")) && ctline<4) {
 	p2 = ptr += 3;
 	if (*p2 == '"') {
 	  p2 = strchr (++ptr, '"');
 	}
 	else {
 	    p2++;
 	}
 	if (p2 && *p2 && p2!=ptr) {
 	  c = *p2; *p2 = '\0';
 	  if (result->mimeid)
-	    FP_free (result->mimeid);
+	    _FP_free (result->mimeid);
-	  result->mimeid = FP_strdup (ptr);
+	  result->mimeid = _FP_strdup (ptr);
 	  *p2 = c;
 	}
       }
       /*
      * a boundary, followed by a Content-* line, try to use it.
      */
     if (boundary == NULL && !ismime && !uu_more_mime && dflag <= 1 &&
 	line[0] == '-' && line[1] == '-' && strlen(line+2)>10 &&
-	(((ptr = FP_strrstr (line+2, "--")) == NULL) ||
+	(((ptr = _FP_strrstr (line+2, "--")) == NULL) ||
-	 *(ptr+2) != '\012' && *(ptr+2) != '\015') &&
+	 (*(ptr+2) != '\012' && *(ptr+2) != '\015')) &&
-	FP_strstr (line+2, "_=_") != NULL) {
+	_FP_strstr (line+2, "_=_") != NULL) {
-      if (FP_fgets (line, 255, datei) == NULL) {
+      if (_FP_fgets (line, 255, datei) == NULL) {
 	break;
       }
-      if (FP_strnicmp (line, "Content-", 8) == 0) {
+      if (_FP_strnicmp (line, "Content-", 8) == 0) {
 	/*
 	 * Okay, let's do it. This breaks out of ScanData. ScanPart will
 	 * 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, " name=") != NULL) {
+      if ((result->begin || result->end || result->uudet) && !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
+       */
+      if ((ptr = _FP_strstr (line, " size=")) != NULL) {
+	ptr += 6;
+	yefilesize = atoi (ptr);
+      }
+      else {
+	yefilesize = -1;
+      }
+      /*
+       * 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 0
+      if (!uu_more_mime)
+	break;
+#endif
+      continue;
+    }
+    /*
      * if we haven't yet found anything encoded, try to find something
      */
     if (!(result->uudet)) {
       /*
       /*
        * Check data against all possible encodings
        */
+      islen[iscnt%10] = strlen(line);
       isb64[iscnt%10] = (UUValidData (line, B64ENCODED, &bhflag)==B64ENCODED);
       isuue[iscnt%10] = (UUValidData (line, UU_ENCODED, &bhflag)==UU_ENCODED);
       isxxe[iscnt%10] = (UUValidData (line, XX_ENCODED, &bhflag)==XX_ENCODED);
       isbhx[iscnt%10] = (UUValidData (line, BH_ENCODED, &bhflag)==BH_ENCODED);
 	  }
 	  if ((bhdsp-bhds2) > (int) bhds2[0] && bhds2[0]>0 &&
 	      result->filename==NULL) {
 	    memcpy (bhds1, bhds2+1, (int) bhds2[0]);
 	    bhds1[(int)bhds2[0]]='\0';
-	    result->filename = FP_strdup (bhds1);
+	    result->filename = _FP_strdup (bhds1);
 	    bhnf             = 1;
 	  }
 	  else if (bhdsp-bhds2 >= 256 && bhds2[0]>0) {
 	    memcpy (bhds1, bhds2+1, 255);
 	    bhds1[255]       = '\0';
-	    result->filename = FP_strdup (bhds1);
+	    result->filename = _FP_strdup (bhds1);
 	    bhnf             = 1;
 	  }
 	  else if (bhds2[0] <= 0)
 	    bhnf = 1;
 	}
 	 * We accept an encoding if it has been true for four consecutive
 	 * lines. Check the is<enc> arrays to avoid mistaking one encoding
 	 * for the other. Uuencoded data is rather easily mistaken for
 	 * Base 64. If the data matches more than one encoding, we need to
 	 * scan further.
+	 *
+	 * Since text can also rather easily be mistaken for UUencoded
+	 * data if it just happens to have 4 lines in a row that have the
+	 * correct first character for the length of the line, we also add
+	 * a check that the first 3 lines must be the same length, and the
+	 * 4th line must be less than or equal to that length. (since
+	 * uuencoders use the same length for all lines except the last,
+	 * this shouldn't increase the minimum size of UUdata we can
+	 * detect, as it would if we tested all 4 lines for being the same
+	 * length.)  - Matthew Mueller, 20030109
 	 */
 	if (iscnt > 3) {
 	  cbb64 = (isb64[(iscnt-1)%10] && isb64[(iscnt-2)%10] &&
 		   isb64[(iscnt-3)%10] && isb64[(iscnt-4)%10]);
 	  cbuue = (isuue[(iscnt-1)%10] && isuue[(iscnt-2)%10] &&
-		   isuue[(iscnt-3)%10] && isuue[(iscnt-4)%10]);
+		   isuue[(iscnt-3)%10] && isuue[(iscnt-4)%10] &&
+		   islen[(iscnt-1)%10] <= islen[(iscnt-2)%10] &&
+		   islen[(iscnt-2)%10] == islen[(iscnt-3)%10] &&
+		   islen[(iscnt-3)%10] == islen[(iscnt-4)%10]);
 	  cbxxe = (isxxe[(iscnt-1)%10] && isxxe[(iscnt-2)%10] &&
-		   isxxe[(iscnt-3)%10] && isxxe[(iscnt-4)%10]);
+		   isxxe[(iscnt-3)%10] && isxxe[(iscnt-4)%10] &&
+		   islen[(iscnt-1)%10] <= islen[(iscnt-2)%10] &&
+		   islen[(iscnt-2)%10] == islen[(iscnt-3)%10] &&
+		   islen[(iscnt-3)%10] == islen[(iscnt-4)%10]);
 	  cbbhx = (isbhx[(iscnt-1)%10] && isbhx[(iscnt-2)%10] &&
 		   isbhx[(iscnt-3)%10] && isbhx[(iscnt-4)%10]);
 	}
 	else {
 	  cbb64 = cbuue = cbxxe = cbbhx = 0;
 	      *errcode = UURET_CANCEL;
 	      break;
 	    }
 	    oldposition = ftell (datei);
-	    if (FP_fgets (line, 255, datei) == NULL)
+	    if (_FP_fgets (line, 255, datei) == NULL)
 	      break;
 	    if (ferror (datei))
 	      break;
 	    line[255] = '\0';
   /* 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
    */
   if (boundary && line[0] == '-' && line[1] == '-' &&
       strncmp (line+2, boundary, blen) == 0)
     return 2;
   else if (boundary && p3 &&
 	   line[0] == 'C' && line[1] == 'o' &&
-	   FP_strnicmp (line, "Content-Type:", 13) == 0 &&
+	   _FP_strnicmp (line, "Content-Type:", 13) == 0 &&
 	   strcmp (p3, boundary) == 0)
     return 2;
   else if (IsKnownHeader (line))
     return 1;
 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;
-  blen = 0; prevpos = 0; /* calm down gcc */
   (void) UUDecodeLine (NULL, NULL, 0);          /* init */
   if (datei == NULL || feof (datei)) {
     *errcode = UURET_OK;
     return NULL;
     /* mimseqno      = 1; */
     while (mssdepth) {
       mssdepth--;
       UUkillheaders (&(multistack[mssdepth].envelope));
-      FP_free (multistack[mssdepth].source);
+      _FP_free (multistack[mssdepth].source);
     }
     UUkillheaders (&sstate.envelope);
     memset (&sstate.envelope, 0, sizeof (headers));
-    FP_free (sstate.source);
+    _FP_free (sstate.source);
-    if ((sstate.source = FP_strdup (fname)) == NULL) {
+    if ((sstate.source = _FP_strdup (fname)) == NULL) {
       *errcode = UURET_NOMEM;
-      FP_free (result);
+      _FP_free (result);
       return NULL;
     }
     /* ignore empty lines at the beginning of a file */
     preheaders = ftell (datei);
     while (!feof (datei)) {
       if (UUBUSYPOLL(ftell(datei),progress.fsize)) SPCANCEL();
-      if (FP_fgets (line, 255, datei) == NULL)
+      if (_FP_fgets (line, 255, datei) == NULL)
 	break;
+      line[255] = '\0';
       if (!IsLineEmpty (line)) {
 	fseek (datei, preheaders, SEEK_SET);
-	line[255] = '\0';
 	break;
       }
       preheaders = ftell (datei);
     }
   }
   if (ferror(datei) || feof(datei)) {
-    FP_free (result);
+    _FP_free (result);
     return NULL;
   }
   /*
    * If we are confident that this is a mail folder and are at the
      */
     while (mssdepth) {
       mssdepth--;
       UUkillheaders (&(multistack[mssdepth].envelope));
-      FP_free (multistack[mssdepth].source);
+      _FP_free (multistack[mssdepth].source);
     }
+    prevpos = ftell (datei);
-    if (FP_fgets (line, 255, datei) == NULL) {
+    if (_FP_fgets (line, 255, datei) == NULL) {
-      FP_free (result);
+      _FP_free (result);
       return NULL;
     }
     line[255] = '\0';
     /*
 	     line[strlen(line)-1] == '\015') {
 	line[strlen(line)-1] = '\0';
       }
       sstate.ismime            = 1;
-      sstate.envelope.mimevers = FP_strdup ("1.0");
+      sstate.envelope.mimevers = _FP_strdup ("1.0");
-      sstate.envelope.boundary = FP_strdup (line+2);
+      sstate.envelope.boundary = _FP_strdup (line+2);
-      sstate.envelope.ctype    = FP_strdup ("multipart/mixed");
+      sstate.envelope.ctype    = _FP_strdup ("multipart/mixed");
       sstate.mimestate         = MS_SUBPART;
       *errcode = UURET_CONT;
-      FP_free (result);
+      _FP_free (result);
       return NULL;
     }
     /*
      * Normal behavior: look for a RFC 822 header
     while (!feof (datei) && !IsLineEmpty (line)) {
       if (IsKnownHeader (line))
 	hcount++;
       if (UUBUSYPOLL(ftell(datei),progress.fsize)) SPCANCEL();
+      if (IsHeaderLine (line)) {
-      ptr1 = ScanHeaderLine (datei, line);
+	ptr1 = ScanHeaderLine (datei, line);
-      if (ParseHeader (&sstate.envelope, ptr1) == NULL) {
+	if (ParseHeader (&sstate.envelope, ptr1) == NULL) {
-	*errcode = UURET_NOMEM;
+	  *errcode = UURET_NOMEM;
-	FP_free (result);
+	  _FP_free (result);
-	return NULL;
+	  return NULL;
+	}
       }
       /*
        * if we've read too many lines without finding headers, then
        * this probably isn't a mail folder after all
        */
       lcount++;
-      if (lcount > WAITHEADER && hcount < hlcount.afternl)
+      if (lcount > WAITHEADER && hcount < hlcount.afternl) {
+	fseek (datei, prevpos, SEEK_SET);
+	line[0] = '\0';
 	break;
+      }
-      if (FP_fgets (line, 255, datei) == NULL)
+      if (_FP_fgets (line, 255, datei) == NULL)
 	break;
       line[255] = '\0';
     }
     /* skip empty lines */
     prevpos = ftell (datei);
+    if (IsLineEmpty (line)) {
-    while (!feof (datei)) {
+      while (!feof (datei)) {
-      if (FP_fgets (line, 255, datei) == NULL)
+	if (_FP_fgets (line, 255, datei) == NULL)
-	break;
+	  break;
-      if (UUBUSYPOLL(ftell(datei),progress.fsize)) SPCANCEL();
+	if (UUBUSYPOLL(ftell(datei),progress.fsize)) SPCANCEL();
-      if (!IsLineEmpty (line)) {
+	if (!IsLineEmpty (line)) {
-	fseek (datei, prevpos, SEEK_SET);
+	  fseek (datei, prevpos, SEEK_SET);
-	line[255] = '\0';
+	  line[255] = '\0';
-	break;
+	  break;
-      }
+	}
-      prevpos = ftell (datei);
+	prevpos = ftell (datei);
-    }
+      }
+    }
     /*
      * If we don't have all valid MIME headers yet, but the following
      * line is a MIME header, accept it anyway.
      */
 	sstate.envelope.ctenc    == NULL &&
 	IsKnownHeader (line)) {
       /*
        * see above
        */
-      if (FP_fgets (line, 255, datei) == NULL) {
+      if (_FP_fgets (line, 255, datei) == NULL) {
 	line[0] = '\012';
 	line[1] = '\0';
       }
       line[255] = '\0';
 	  hcount++;
 	if (UUBUSYPOLL(ftell(datei),progress.fsize)) SPCANCEL();
 	ptr1 = ScanHeaderLine (datei, line);
 	if (ParseHeader (&sstate.envelope, ptr1) == NULL) {
 	  *errcode = UURET_NOMEM;
-	  FP_free (result);
+	  _FP_free (result);
 	  return NULL;
 	}
-	if (FP_fgets (line, 255, datei) == NULL)
+	if (_FP_fgets (line, 255, datei) == NULL)
 	  break;
 	line[255] = '\0';
       }
       /* skip empty lines */
       prevpos = ftell (datei);
       while (!feof (datei)) {
-	if (FP_fgets (line, 255, datei) == NULL)
+	if (_FP_fgets (line, 255, datei) == NULL)
 	  break;
 	if (UUBUSYPOLL(ftell(datei),progress.fsize)) SPCANCEL();
 	if (!IsLineEmpty (line)) {
 	  fseek (datei, prevpos, SEEK_SET);
 	  line[255] = '\0';
      * MIME message
      * if mimevers is not set but there are other well-known MIME
      * headers, don't be too picky about it.
      */
     if (sstate.envelope.ctype && sstate.envelope.mimevers==NULL  &&
-	FP_stristr (sstate.envelope.ctype, "multipart") != NULL &&
+	_FP_stristr (sstate.envelope.ctype, "multipart") != NULL &&
 	sstate.envelope.boundary != NULL) {
-      sstate.envelope.mimevers = FP_strdup ("1.0");
+      sstate.envelope.mimevers = _FP_strdup ("1.0");
       hcount = hlcount.afternl;
     }
     else if (sstate.envelope.mimevers==NULL && sstate.envelope.ctype &&
 	     sstate.envelope.fname && sstate.envelope.ctenc) {
-      sstate.envelope.mimevers = FP_strdup ("1.0");
+      sstate.envelope.mimevers = _FP_strdup ("1.0");
       hcount = hlcount.afternl;
     }
-    if (hcount < hlcount.afternl) {
-      /* not a folder after all */
-      fseek (datei, preheaders, SEEK_SET);
-      sstate.isfolder = 0;
-      sstate.ismime   = 0;
-    }
-    else if (sstate.envelope.mimevers != NULL) {
+    if (sstate.envelope.mimevers != NULL) {
       /* this is a MIME file. check the Content-Type */
       sstate.ismime = 1;
-      if (FP_stristr (sstate.envelope.ctype, "multipart") != NULL) {
+      if (_FP_stristr (sstate.envelope.ctype, "multipart") != NULL) {
 	if (sstate.envelope.boundary == NULL) {
 	  UUMessage (uuscan_id, __LINE__, UUMSG_WARNING,
 		     uustring (S_MIME_NO_BOUNDARY));
 	  sstate.mimestate = MS_BODY;
-	  FP_free (sstate.envelope.ctype);
+	  _FP_free (sstate.envelope.ctype);
-	  sstate.envelope.ctype = FP_strdup ("text/plain");
+	  sstate.envelope.ctype = _FP_strdup ("text/plain");
 	}
 	else {
 	  sstate.mimestate = MS_PREAMBLE;
 	}
       }
       else {
 	sstate.mimestate = MS_BODY;	/* just a `simple' message */
       }
     }
+    else {
+      /* not a folder after all */
+      fseek (datei, prevpos, SEEK_SET);
+      sstate.isfolder = 0;
+      sstate.ismime   = 0;
+    }
   }
   if (feof (datei) || ferror (datei)) { /* oops */
-    FP_free (result);
+    _FP_free (result);
     return NULL;
   }
   /*
    * Handle MIME stuff
     blen   = strlen (sstate.envelope.boundary);
     lcount = 0;
     while (!feof (datei)) {
-      if (FP_fgets (line, 255, datei) == NULL) {
+      if (_FP_fgets (line, 255, datei) == NULL) {
 	line[0] = '\0';
 	break;
       }
       if (UUBUSYPOLL(ftell(datei),progress.fsize)) SPCANCEL();
       if (line[0] == '-' && line[1] == '-' &&
       if (!uu_fast_scanning) {
 	*errcode = UURET_CONT;
 	fseek (datei, preheaders, SEEK_SET);
       }
-      FP_free (result);
+      _FP_free (result);
       return NULL;
     }
     if (line[0] == '-' && line[1] == '-' &&
 	strncmp (line+2, sstate.envelope.boundary, blen) == 0) {
       ptr1 = line + 2 + blen;
       if (!uu_fast_scanning) {
 	*errcode = UURET_CONT;
 	fseek (datei, preheaders, SEEK_SET);
       }
-      FP_free (result);
+      _FP_free (result);
       return NULL;
     }
     /* produce result if uu_usepreamble is set */
     if (uu_usepreamble && lcount) {
       sprintf (line, "%04d.txt", ++mimseqno);
-      result->subject  = FP_strdup (sstate.envelope.subject);
+      result->subject  = _FP_strdup (sstate.envelope.subject);
-      result->filename = FP_strdup (line);
+      result->filename = _FP_strdup (line);
-      result->origin   = FP_strdup (sstate.envelope.from);
+      result->origin   = _FP_strdup (sstate.envelope.from);
-      result->mimeid   = FP_strdup (sstate.envelope.mimeid);
+      result->mimeid   = _FP_strdup (sstate.envelope.mimeid);
-      result->mimetype = FP_strdup ("text/plain");
+      result->mimetype = _FP_strdup ("text/plain");
       result->mode     = 0644;
       result->uudet    = PT_ENCODED;	/* plain text */
-      result->sfname   = FP_strdup (fname);
+      result->sfname   = _FP_strdup (fname);
       result->flags    = FL_SINGLE | FL_PROPER;
       /* result->startpos set from above */
       result->length   = prevpos - result->startpos;
       result->partno   = 1;
     /* MIME message, let's continue */
     if (*errcode == UURET_OK)
       *errcode = UURET_CONT;
     /* otherwise, just return NULL */
-    FP_free (result);
+    _FP_free (result);
     return NULL;
   }
   /*
    * Read Epilogue, the plain text after the last boundary.
     if (uu_fast_scanning && mssdepth == 0) {
       /*
        * check if the epilogue is empty
        */
       while (!feof (datei) && !ferror (datei) && lcount<10 && res==0) {
-	if (FP_fgets (line, 255, datei) == NULL)
+	if (_FP_fgets (line, 255, datei) == NULL)
 	  break;
 	if (!IsLineEmpty (line))
 	  res++;
 	lcount++;
       }
       if (uu_usepreamble && res) {
 	sprintf (line, "%04d.txt", ++mimseqno);
-	result->subject  = FP_strdup (sstate.envelope.subject);
+	result->subject  = _FP_strdup (sstate.envelope.subject);
-	result->filename = FP_strdup (line);
+	result->filename = _FP_strdup (line);
-	result->origin   = FP_strdup (sstate.envelope.from);
+	result->origin   = _FP_strdup (sstate.envelope.from);
-	result->mimeid   = FP_strdup (sstate.envelope.mimeid);
+	result->mimeid   = _FP_strdup (sstate.envelope.mimeid);
-	result->mimetype = FP_strdup ("text/plain");
+	result->mimetype = _FP_strdup ("text/plain");
 	result->mode     = 0644;
 	result->uudet    = PT_ENCODED;	/* plain text */
-	result->sfname   = FP_strdup (fname);
+	result->sfname   = _FP_strdup (fname);
 	result->flags    = FL_SINGLE | FL_PROPER | FL_TOEND;
 	result->partno   = 1;
 	/* result->startpos set from above */
 	result->length   = progress.fsize - result->startpos;
 	  *errcode = UURET_NOMEM;
 	}
 	return result;
       }
-      FP_free (result);
+      _FP_free (result);
       return NULL;
     }
     if (mssdepth > 0)
       blen = strlen (multistack[mssdepth-1].envelope.boundary);
     while (!feof (datei)) {
-      if (FP_fgets (line, 255, datei) == NULL) {
+      if (_FP_fgets (line, 255, datei) == NULL) {
 	line[0] = '\0';
 	break;
       }
       if (UUBUSYPOLL(ftell(datei),progress.fsize)) SPCANCEL();
       line[255] = '\0';
       }
       /* check for begin and encoded data only at outermost level */
       if (mssdepth == 0 && !uu_more_mime) {
 	if (strncmp      (line, "begin ",       6) == 0 ||
-	    FP_strnicmp (line, "<pre>begin ", 11) == 0) {
+	    _FP_strnicmp (line, "<pre>begin ", 11) == 0) {
 	  preenc  = prevpos;
 	  begflag = 1;
 	}
 	else if (strncmp (line, "end", 3) == 0 && begflag) {
 	  ecount = ELC_COUNT;
 	strncmp (line+2,
 		 multistack[mssdepth-1].envelope.boundary, blen) == 0) {
       /* restore previous state */
       mssdepth--;
       UUkillheaders (&sstate.envelope);
-      FP_free  (sstate.source);
+      _FP_free  (sstate.source);
       memcpy (&sstate, &(multistack[mssdepth]), sizeof (scanstate));
       ptr1 = line + 2 + strlen (sstate.envelope.boundary);
       if (*ptr1 == '-' && *(ptr1+1) == '-') {
       sstate.mimestate = MS_BODY;
       while (mssdepth) {
 	mssdepth--;
 	UUkillheaders (&(multistack[mssdepth].envelope));
-	FP_free (multistack[mssdepth].source);
+	_FP_free (multistack[mssdepth].source);
       }
       if (!uu_fast_scanning) {
 	*errcode = UURET_CONT;
 	fseek (datei, preheaders, SEEK_SET);
       }
-      FP_free (result);
+      _FP_free (result);
       return NULL;
     }
     else if (IsKnownHeader (line)) {
       /* new message follows */
       sstate.isfolder  = 1;
     }
     /* produce result if uu_usepreamble is set */
     if (uu_usepreamble && res) {
       sprintf (line, "%04d.txt", ++mimseqno);
-      result->subject  = FP_strdup (sstate.envelope.subject);
+      result->subject  = _FP_strdup (sstate.envelope.subject);
-      result->filename = FP_strdup (line);
+      result->filename = _FP_strdup (line);
-      result->origin   = FP_strdup (sstate.envelope.from);
+      result->origin   = _FP_strdup (sstate.envelope.from);
-      result->mimeid   = FP_strdup (sstate.envelope.mimeid);
+      result->mimeid   = _FP_strdup (sstate.envelope.mimeid);
-      result->mimetype = FP_strdup ("text/plain");
+      result->mimetype = _FP_strdup ("text/plain");
       result->mode     = 0644;
       result->uudet    = PT_ENCODED;	/* plain text */
-      result->sfname   = FP_strdup (fname);
+      result->sfname   = _FP_strdup (fname);
       result->flags    = FL_SINGLE | FL_PROPER;
       result->partno   = 1;
       /* result->startpos set from above */
       /* result->length set from above */
       }
       return result;
     }
     /* otherwise, just return NULL */
-    FP_free (result);
+    _FP_free (result);
     return NULL;
   }
   /*
    * Scan a new part from a Multipart message. Check for a new local
     /*
      * Duplicate some data from outer envelope
      */
-    localenv.mimevers = FP_strdup (sstate.envelope.mimevers);
+    localenv.mimevers = _FP_strdup (sstate.envelope.mimevers);
-    localenv.from     = FP_strdup (sstate.envelope.from);
+    localenv.from     = _FP_strdup (sstate.envelope.from);
-    localenv.subject  = FP_strdup (sstate.envelope.subject);
+    localenv.subject  = _FP_strdup (sstate.envelope.subject);
-    localenv.rcpt     = FP_strdup (sstate.envelope.rcpt);
+    localenv.rcpt     = _FP_strdup (sstate.envelope.rcpt);
-    localenv.date     = FP_strdup (sstate.envelope.date);
+    localenv.date     = _FP_strdup (sstate.envelope.date);
     if ((sstate.envelope.mimevers != NULL && localenv.mimevers == NULL) ||
 	(sstate.envelope.from     != NULL && localenv.from     == NULL) ||
 	(sstate.envelope.subject  != NULL && localenv.subject  == NULL) ||
 	(sstate.envelope.rcpt     != NULL && localenv.rcpt     == NULL) ||
 	(sstate.envelope.date     != NULL && localenv.date     == NULL)) {
       while (mssdepth) {
 	mssdepth--;
 	UUkillheaders (&(multistack[mssdepth].envelope));
-	FP_free (multistack[mssdepth].source);
+	_FP_free (multistack[mssdepth].source);
       }
       sstate.isfolder = 0;
       sstate.ismime   = 0;
       UUkillheaders (&localenv);
       *errcode = UURET_NOMEM;
-      FP_free (result);
+      _FP_free (result);
       return NULL;
     }
     /* Scan subheader. But what if there is no subheader? */
     hcount = 0;
     lcount = 0;
     preheaders = prevpos;
-    if (FP_fgets (line, 255, datei) == NULL) {
+    if (_FP_fgets (line, 255, datei) == NULL) {
       sstate.isfolder = 0;
       sstate.ismime   = 0;
       while (mssdepth) {
 	mssdepth--;
 	UUkillheaders (&(multistack[mssdepth].envelope));
-	FP_free (multistack[mssdepth].source);
+	_FP_free (multistack[mssdepth].source);
       }
       UUkillheaders (&localenv);
-      FP_free (result);
+      _FP_free (result);
       return NULL;
     }
     line[255] = '\0';
     while (!feof (datei) && !IsLineEmpty (line)) {
       if (line[0] == '-' && line[1] == '-')
 	break;
       prevpos = ftell (datei);
-      if (FP_fgets (line, 255, datei) == NULL)
+      if (_FP_fgets (line, 255, datei) == NULL)
 	break;
       line[255] = '\0';
       lcount++;
     }
     if (line[0] == '-' && line[1] == '-') {
        * boundary, so that it gets handled below
        */
       fseek (datei, prevpos, SEEK_SET);
     }
-    if (FP_stristr (localenv.ctype, "multipart") != NULL) {
+    if (_FP_stristr (localenv.ctype, "multipart") != NULL) {
       /* oh no, not again */
       if (mssdepth >= MSMAXDEPTH) {
 	/* Argh, what an isane message. Treat as plain text */
 	UUMessage (uuscan_id, __LINE__, UUMSG_WARNING,
 		   uustring (S_MIME_MULTI_DEPTH));
       else {
 	memcpy (&multistack[mssdepth], &sstate, sizeof (scanstate));
 	memcpy (&sstate.envelope,    &localenv, sizeof (headers));
 	memset (&localenv, 0, sizeof (headers));
 	sstate.mimestate = MS_PREAMBLE;
-	if ((sstate.source = FP_strdup (sstate.source)) == NULL)
+	if ((sstate.source = _FP_strdup (sstate.source)) == NULL)
 	  *errcode = UURET_NOMEM;
 	if (*errcode == UURET_OK)
 	  *errcode = UURET_CONT;
 	mssdepth++;
 	/* need a restart */
-	FP_free (result);
+	_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)
+    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)
+    else if (_FP_stristr (localenv.ctenc, "quoted-printable") != NULL)
       result->uudet = QP_ENCODED;
-    else if (FP_stristr (localenv.ctenc, "7bit") != NULL ||
+    else if (_FP_stristr (localenv.ctenc, "7bit") != NULL ||
-	     FP_stristr (localenv.ctenc, "8bit") != NULL)
+	     _FP_stristr (localenv.ctenc, "8bit") != NULL)
       result->uudet = PT_ENCODED;
-    else if (FP_stristr (localenv.ctype, "multipart") != NULL ||
+    else if (_FP_stristr (localenv.ctype, "multipart") != NULL ||
-	     FP_stristr (localenv.ctype, "message")   != NULL)
+	     _FP_stristr (localenv.ctype, "message")   != NULL)
       result->uudet = PT_ENCODED;
     /*
      * If we're switched to MIME-only mode, handle as text
      */
       prevpos          = ftell (datei);
       blen = strlen (sstate.envelope.boundary);
       lcount = 0;
       while (!feof (datei)) {
-	if (FP_fgets (line, 255, datei) == NULL) {
+	if (_FP_fgets (line, 255, datei) == NULL) {
 	  line[0] = '\0';
 	  break;
 	}
 	if (UUBUSYPOLL(ftell(datei),progress.fsize)) SPCANCEL();
 	line[255] = '\0';
 	 * This check here doesn't cover folded header lines, but we don't
 	 * want to slow down scanning too much. We just check for
 	 * Content-Type: multipart/... boundary="same-boundary"
 	 */
 	if (line[0] == 'C' && line[1] == 'o' &&
-	    FP_strnicmp (line, "Content-Type:", 13) == 0) {
+	    _FP_strnicmp (line, "Content-Type:", 13) == 0) {
 	  ptr1 = ScanHeaderLine (datei, line);
-	  ptr2 = (ptr1)?FP_stristr(ptr1,"boundary"):NULL;
+	  ptr2 = (ptr1)?_FP_stristr(ptr1,"boundary"):NULL;
 	  ptr1 = (ptr2)?ParseValue(ptr2):NULL;
 	  if (ptr1 && strcmp (ptr1, sstate.envelope.boundary) == 0)
 	    break;
 	  for (res=0; ptr1 && res<mssdepth; res++)
 	    if (strcmp (ptr1, multistack[res].envelope.boundary) == 0)
 		   uustring (S_MIME_B_NOT_FOUND));
 	while (mssdepth) {
 	  mssdepth--;
 	  UUkillheaders (&(multistack[mssdepth].envelope));
-	  FP_free (multistack[mssdepth].source);
+	  _FP_free (multistack[mssdepth].source);
 	}
 	/*
 	 * Don't retry if uu_fast_scanning
 	 */
 	if (uu_fast_scanning) {
 	  UUkillheaders (&localenv);
 	  sstate.isfolder  = 0;
 	  sstate.ismime    = 0;
 	  sstate.mimestate = MS_BODY;
-	  FP_free (result);
+	  _FP_free (result);
 	  return NULL;
 	}
 	/*
 	 * Retry, but listening to headers this time
       }
       /* produce result if uu_handletext is set */
       /* or if the file is explicitely named */
       if (result->uudet == B64ENCODED || lcount) {
 	if (localenv.fname) {
-	  FP_free (result->filename);
+	  _FP_free (result->filename);
-	  if ((result->filename = FP_strdup (localenv.fname)) == NULL)
+	  if ((result->filename = _FP_strdup (localenv.fname)) == NULL)
 	    *errcode = UURET_NOMEM;
 	}
 	else if ((result->uudet==QP_ENCODED||result->uudet==PT_ENCODED) &&
 		 result->filename == NULL && uu_handletext) {
 	  sprintf (line, "%04d.txt", ++mimseqno);
-	  if ((result->filename = FP_strdup (line)) == NULL)
+	  if ((result->filename = _FP_strdup (line)) == NULL)
 	    *errcode = UURET_NOMEM;
 	}
-	result->subject  = FP_strdup (localenv.subject);
+	result->subject  = _FP_strdup (localenv.subject);
-	result->origin   = FP_strdup (localenv.from);
+	result->origin   = _FP_strdup (localenv.from);
-	result->mimeid   = FP_strdup (localenv.mimeid);
+	result->mimeid   = _FP_strdup (localenv.mimeid);
-	result->mimetype = FP_strdup (localenv.ctype);
+	result->mimetype = _FP_strdup (localenv.ctype);
 	result->mode     = 0644;
-	result->sfname   = FP_strdup (fname);
+	result->sfname   = _FP_strdup (fname);
 	result->flags    = FL_SINGLE | FL_PROPER;
 	result->partno   = 1;
 	/* result->uudet determined above */
 	/* result->startpos set from above */
 	result->length   = prevpos - result->startpos;
 	  *errcode = UURET_NOMEM;
 	}
       }
       else {
 	/* don't produce a result */
-	FP_free (result);
+	_FP_free (result);
 	result = NULL;
       }
       if (*errcode == UURET_OK)
 	*errcode = UURET_CONT;
       /*
      */
     blen    = strlen (sstate.envelope.boundary);
     prevpos = ftell  (datei);
     while (!feof (datei)) {
-      if (FP_fgets (line, 255, datei) == NULL) {
+      if (_FP_fgets (line, 255, datei) == NULL) {
 	line[0] = '\0';
 	break;
       }
       if (UUBUSYPOLL(ftell(datei),progress.fsize)) SPCANCEL();
       line[255] = '\0';
       if (line[0] == '-' && line[1] == '-' &&
 	  strncmp (line+2, sstate.envelope.boundary, blen) == 0)
 	break;
       if (line[0] == 'C' && line[1] == 'o' &&
-	  FP_strnicmp (line, "Content-Type:", 13) == 0) {
+	  _FP_strnicmp (line, "Content-Type:", 13) == 0) {
 	ptr1 = ScanHeaderLine (datei, line);
-	ptr2 = (ptr1)?FP_stristr(ptr1,"boundary"):NULL;
+	ptr2 = (ptr1)?_FP_stristr(ptr1,"boundary"):NULL;
 	ptr1 = (ptr2)?ParseValue(ptr2):NULL;
 	if (ptr1 && strcmp (ptr1, sstate.envelope.boundary) == 0)
 	  break;
       }
       prevpos = ftell (datei);
 		 uustring (S_MIME_B_NOT_FOUND));
       while (mssdepth) {
 	mssdepth--;
 	UUkillheaders (&(multistack[mssdepth].envelope));
-	FP_free (multistack[mssdepth].source);
+	_FP_free (multistack[mssdepth].source);
       }
       if (uu_fast_scanning) {
 	UUkillheaders (&localenv);
 	sstate.isfolder  = 0;
 	sstate.ismime    = 0;
 	sstate.mimestate = MS_BODY;
-	FP_free (result);
+	_FP_free (result);
 	return NULL;
       }
       /*
        * Retry, listening to headers this time
      * If this file has been nicely MIME so far, then be very suspicious
      * if ScanData reports anything else. So do a double check, and if
      * it doesn't hold up, handle as plain text instead.
      */
-    if (sstate.ismime && sstate.mimestate == MS_SUBPART &&
-        strcmp (localenv.mimevers, "1.0") == 0 &&
+    if (strcmp (localenv.mimevers, "1.0") == 0 &&
-	FP_stristr (localenv.ctype, "text") != NULL &&
+	_FP_stristr (localenv.ctype, "text") != NULL &&
+	sstate.ismime && sstate.mimestate == MS_SUBPART &&
 	!uu_desperate) {
       if (result->uudet == UU_ENCODED && !(result->begin || result->end)) {
 	result->uudet = 0;
       }
     }
     if (result->uudet == 0) {
       result->uudet = PT_ENCODED; /* plain text */
     }
     if (localenv.fname) {
-      FP_free (result->filename);
+      _FP_free (result->filename);
-      if ((result->filename = FP_strdup (localenv.fname)) == NULL)
+      if ((result->filename = _FP_strdup (localenv.fname)) == NULL)
 	*errcode = UURET_NOMEM;
     }
     else if ((result->uudet==QP_ENCODED || result->uudet==PT_ENCODED) &&
 	     result->filename==NULL && uu_handletext) {
       sprintf (line, "%04d.txt", ++mimseqno);
-      if ((result->filename = FP_strdup (line)) == NULL)
+      if ((result->filename = _FP_strdup (line)) == NULL)
 	*errcode = UURET_NOMEM;
     }
     else {
       /* assign a filename lateron */
     }
-    if (result->mimetype) FP_free (result->mimetype);
+    if (result->mimetype) _FP_free (result->mimetype);
     if (result->uudet) {
-      if (FP_stristr (localenv.ctype, "text") != NULL &&
+      if (_FP_stristr (localenv.ctype, "text") != NULL &&
 	  result->uudet != QP_ENCODED && result->uudet != PT_ENCODED)
 	result->mimetype = NULL; /* better don't set it */
       else
-	result->mimetype = FP_strdup (localenv.ctype);
+	result->mimetype = _FP_strdup (localenv.ctype);
     }
-    if (result->origin) FP_free  (result->origin);
+    if (result->origin) _FP_free  (result->origin);
-    result->origin  = FP_strdup  (localenv.from);
+    result->origin  = _FP_strdup  (localenv.from);
-    if (result->subject) FP_free (result->subject);
+    if (result->subject) _FP_free (result->subject);
-    result->subject = FP_strdup  (localenv.subject);
+    result->subject = _FP_strdup  (localenv.subject);
     if (result->sfname == NULL)
-      if ((result->sfname = FP_strdup (fname)) == NULL)
+      if ((result->sfname = _FP_strdup (fname)) == NULL)
 	*errcode = UURET_NOMEM;
     result->length = prevpos - result->startpos;
     result->flags  = FL_SINGLE | FL_PROPER;
     result->partno = 1;
    * long to figure this out. But this might still be a MIME message
    * body. And if it's a message/partial, we need more special handling
    */
   if (sstate.isfolder && sstate.ismime && sstate.mimestate == MS_BODY &&
-      FP_stristr (sstate.envelope.ctype, "message") != NULL &&
+      _FP_stristr (sstate.envelope.ctype, "message") != NULL &&
-      FP_stristr (sstate.envelope.ctype, "partial") != NULL) {
+      _FP_stristr (sstate.envelope.ctype, "partial") != NULL) {
     result->startpos = ftell (datei);
     if (sstate.envelope.partno == 1) {
       /* read local envelope */
       memset (&localenv, 0, sizeof (headers));
       /* skip over blank lines first */
       prevpos = ftell (datei);
       while (!feof (datei)) {
-	if (FP_fgets (line, 255, datei) == NULL)
+	if (_FP_fgets (line, 255, datei) == NULL)
 	  break;
 	line[255] = '\0';
 	if (UUBUSYPOLL(ftell(datei),progress.fsize)) SPCANCEL();
 	if (!IsLineEmpty (line))
 	  break;
 	}
 	ptr1 = ScanHeaderLine (datei, line);
 	if (ParseHeader (&localenv, ptr1) == NULL)
 	  *errcode = UURET_NOMEM;
-	if (FP_fgets (line, 255, datei) == NULL)
+	if (_FP_fgets (line, 255, datei) == NULL)
 	  break;
 	line[255] = '\0';
 	lcount++;
       }
       prevpos = ftell (datei);
       /*
        * Examine local header. We're mostly interested in the Content-Type
        * and the Content-Transfer-Encoding.
        */
-      if (FP_stristr (localenv.ctype, "multipart") != NULL) {
+      if (_FP_stristr (localenv.ctype, "multipart") != NULL) {
 	UUMessage (uuscan_id, __LINE__, UUMSG_WARNING,
 		   uustring (S_MIME_PART_MULTI));
       }
       if (localenv.subject)
-	result->subject  = FP_strdup (localenv.subject);
+	result->subject  = _FP_strdup (localenv.subject);
       else
-	result->subject  = FP_strdup (sstate.envelope.subject);
+	result->subject  = _FP_strdup (sstate.envelope.subject);
       if (localenv.from)
-	result->origin   = FP_strdup (localenv.from);
+	result->origin   = _FP_strdup (localenv.from);
       else
-	result->origin   = FP_strdup (sstate.envelope.from);
+	result->origin   = _FP_strdup (sstate.envelope.from);
       if (localenv.ctype)
-	result->mimetype = FP_strdup (localenv.ctype);
+	result->mimetype = _FP_strdup (localenv.ctype);
       else
-	result->mimetype = FP_strdup ("text/plain");
+	result->mimetype = _FP_strdup ("text/plain");
-      if (FP_stristr (localenv.ctenc, "quoted-printable") != NULL)
+      if (_FP_stristr (localenv.ctenc, "quoted-printable") != NULL)
 	result->uudet = QP_ENCODED;
-      else if (FP_stristr (localenv.ctenc, "base64") != NULL)
+      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 ||
+      else if (_FP_stristr (localenv.ctenc, "7bit") != NULL ||
-	       FP_stristr (localenv.ctenc, "8bit") != NULL)
+	       _FP_stristr (localenv.ctenc, "8bit") != NULL)
 	result->uudet = PT_ENCODED;
-      else if (FP_stristr (localenv.ctype, "multipart") != NULL ||
+      else if (_FP_stristr (localenv.ctype, "multipart") != NULL ||
-	       FP_stristr (localenv.ctype, "message")   != NULL)
+	       _FP_stristr (localenv.ctype, "message")   != NULL)
 	result->uudet = PT_ENCODED;
       /*
        * If we're switched to MIME-only mode, handle as text
        */
     }
     else if (result->uudet != 0) {
       hcount = lcount = 0;
       prevpos = ftell (datei);
-      if (FP_stristr (localenv.ctype, "message") != NULL &&
+      if (_FP_stristr (localenv.ctype, "message") != NULL &&
-	  FP_stristr (localenv.ctype, "rfc822")  != NULL) {
+	  _FP_stristr (localenv.ctype, "rfc822")  != NULL) {
 	/*
 	 * skip over empty lines and local header
 	 */
 	preheaders = ftell (datei);
 	while (!feof (datei)) {
-	  if (FP_fgets (line, 255, datei) == NULL)
+	  if (_FP_fgets (line, 255, datei) == NULL)
 	    break;
 	  line[255] = '\0';
 	  if (!IsLineEmpty (line)) {
 	    break;
 	  }
 	    hcount++;
 	  lcount++;
 	  if (lcount > WAITHEADER && hcount < hlcount.afternl)
 	    break;
-	  if (FP_fgets (line, 255, datei) == NULL)
+	  if (_FP_fgets (line, 255, datei) == NULL)
 	    break;
 	  line[255] = '\0';
 	}
 	if (hcount < hlcount.afternl)
 	  fseek (datei, preheaders, SEEK_SET);
       /*
        * look for next header
        */
       while (!feof (datei)) {
-	if (FP_fgets (line, 255, datei) == NULL)
+	if (_FP_fgets (line, 255, datei) == NULL)
 	  break;
 	if (UUBUSYPOLL(ftell(datei),progress.fsize)) SPCANCEL();
 	if (ferror (datei))
 	  break;
 	line[255] = '\0';
     }
     /*
      * produce result
      */
     if (localenv.fname) {
-      FP_free (result->filename);
+      _FP_free (result->filename);
-      if ((result->filename = FP_strdup (localenv.fname)) == NULL)
+      if ((result->filename = _FP_strdup (localenv.fname)) == NULL)
 	*errcode = UURET_NOMEM;
     }
     else if (sstate.envelope.fname) {
-      FP_free (result->filename);
+      _FP_free (result->filename);
-      if ((result->filename = FP_strdup (sstate.envelope.fname)) == NULL)
+      if ((result->filename = _FP_strdup (sstate.envelope.fname)) == NULL)
 	*errcode = UURET_NOMEM;
     }
     else if ((result->uudet==QP_ENCODED || result->uudet==PT_ENCODED) &&
 	     result->filename == NULL) {
       sprintf (line, "%04d.txt", ++mimseqno);
-      if ((result->filename = FP_strdup (line)) == NULL)
+      if ((result->filename = _FP_strdup (line)) == NULL)
 	*errcode = UURET_NOMEM;
     }
     else {
       /* assign a filename lateron */
     }
     if (result->subject == NULL) {
       if (sstate.envelope.subject)
-	result->subject = FP_strdup (sstate.envelope.subject);
+	result->subject = _FP_strdup (sstate.envelope.subject);
     }
     result->partno = sstate.envelope.partno;
     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);
+    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;
     if (result->sfname == NULL)
-      result->sfname = FP_strdup (fname);
+      result->sfname = _FP_strdup (fname);
     if (result->mode == 0)
       result->mode = 0644;
     /*
    * 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, "quoted-printable") != NULL ||
-       FP_stristr (sstate.envelope.ctenc, "base64")           != NULL ||
+       _FP_stristr (sstate.envelope.ctenc, "base64")           != NULL ||
-       FP_stristr (sstate.envelope.ctenc, "x-uue")            != NULL ||
+       _FP_stristr (sstate.envelope.ctenc, "x-uue")            != NULL ||
+       _FP_stristr (sstate.envelope.ctenc, "x-yenc")           != NULL ||
-       FP_stristr (sstate.envelope.ctype, "message")          != NULL ||
+       _FP_stristr (sstate.envelope.ctype, "message")          != NULL ||
        sstate.envelope.fname != NULL)) {
     if (sstate.envelope.subject)
-      result->subject = FP_strdup (sstate.envelope.subject);
+      result->subject = _FP_strdup (sstate.envelope.subject);
     if (sstate.envelope.from)
-      result->origin  = FP_strdup (sstate.envelope.from);
+      result->origin  = _FP_strdup (sstate.envelope.from);
     if (sstate.envelope.ctype)
-      result->mimetype = FP_strdup (sstate.envelope.ctype);
+      result->mimetype = _FP_strdup (sstate.envelope.ctype);
     else
-      result->mimetype = FP_strdup ("text/plain");
+      result->mimetype = _FP_strdup ("text/plain");
-    if (FP_stristr (sstate.envelope.ctenc, "quoted-printable") != NULL)
+    if (_FP_stristr (sstate.envelope.ctenc, "quoted-printable") != NULL)
       result->uudet = QP_ENCODED;
-    else if (FP_stristr (sstate.envelope.ctenc, "base64") != NULL)
+    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 ||
+    else if (_FP_stristr (sstate.envelope.ctenc, "7bit") != NULL ||
-	     FP_stristr (sstate.envelope.ctenc, "8bit") != NULL)
+	     _FP_stristr (sstate.envelope.ctenc, "8bit") != NULL)
       result->uudet = PT_ENCODED;
-    else if (FP_stristr (sstate.envelope.ctype, "multipart") != NULL ||
+    else if (_FP_stristr (sstate.envelope.ctype, "multipart") != NULL ||
-	     FP_stristr (sstate.envelope.ctype, "message")   != NULL ||
+	     _FP_stristr (sstate.envelope.ctype, "message")   != NULL ||
 	     sstate.envelope.fname != NULL)
       result->uudet = PT_ENCODED;
     /*
      * If we're switched to MIME-only mode, handle as text
     if (uu_more_mime >= 2 && !result->uudet) {
       result->uudet = PT_ENCODED;
     }
     result->startpos = prevpos = ftell (datei);
     /*
      * If this is Quoted-Printable or Plain Text, just try looking
      * for the next message header. If uu_fast_scanning, we know
      * there won't be more headers.
      * If it is a "trivial" (non-embedded) message/rfc822, skip over
     }
     else if (result->uudet != 0) {
       hcount = lcount = 0;
       prevpos = ftell (datei);
-      if (FP_stristr (sstate.envelope.ctype, "message") != NULL &&
+      if (_FP_stristr (sstate.envelope.ctype, "message") != NULL &&
-	  FP_stristr (sstate.envelope.ctype, "rfc822")  != NULL) {
+	  _FP_stristr (sstate.envelope.ctype, "rfc822")  != NULL) {
 	/*
 	 * skip over empty lines and local header
 	 */
 	preheaders = ftell (datei);
 	while (!feof (datei)) {
-	  if (FP_fgets (line, 255, datei) == NULL)
+	  if (_FP_fgets (line, 255, datei) == NULL)
 	    break;
 	  line[255] = '\0';
 	  if (!IsLineEmpty (line)) {
 	    break;
 	  }
 	    hcount++;
 	  lcount++;
 	  if (lcount > WAITHEADER && hcount < hlcount.afternl)
 	    break;
-	  if (FP_fgets (line, 255, datei) == NULL)
+	  if (_FP_fgets (line, 255, datei) == NULL)
 	    break;
 	  line[255] = '\0';
 	}
 	if (hcount < hlcount.afternl)
 	  fseek (datei, preheaders, SEEK_SET);
       /*
        * look for next header
        */
       while (!feof (datei)) {
-	if (FP_fgets (line, 255, datei) == NULL)
+	if (_FP_fgets (line, 255, datei) == NULL)
 	  break;
 	if (UUBUSYPOLL(ftell(datei),progress.fsize)) SPCANCEL();
 	if (ferror (datei))
 	  break;
 	line[255] = '\0';
     }
     /*
      * produce result
      */
     if (sstate.envelope.fname) {
-      FP_free (result->filename);
+      _FP_free (result->filename);
-      if ((result->filename = FP_strdup (sstate.envelope.fname)) == NULL)
+      if ((result->filename = _FP_strdup (sstate.envelope.fname)) == NULL)
 	*errcode = UURET_NOMEM;
     }
     else if ((result->uudet==QP_ENCODED||result->uudet==PT_ENCODED) &&
 	     result->filename == NULL) {
       sprintf (line, "%04d.txt", ++mimseqno);
-      if ((result->filename = FP_strdup (line)) == NULL)
+      if ((result->filename = _FP_strdup (line)) == NULL)
 	*errcode = UURET_NOMEM;
     }
     else {
       /* assign a filename lateron */
     }
     if (result->subject == NULL) {
       if (sstate.envelope.subject)
-	result->subject = FP_strdup (sstate.envelope.subject);
+	result->subject = _FP_strdup (sstate.envelope.subject);
     }
     result->flags  = ((res==1||uu_fast_scanning)?FL_PROPER:0) |
       ((uu_fast_scanning) ? FL_TOEND : 0);
-    result->mimeid = FP_strdup (sstate.envelope.mimeid);
+    result->mimeid = _FP_strdup (sstate.envelope.mimeid);
     if (uu_fast_scanning)
       result->length = progress.fsize - result->startpos;
     else
       result->length = prevpos - result->startpos;
     if (result->sfname == NULL)
-      result->sfname = FP_strdup (fname);
+      result->sfname = _FP_strdup (fname);
     if (result->mode == 0)
       result->mode = 0644;
     /*
    * we know that sstate.envelope.boundary is NULL, or we wouldn't
    * be here!
    */
   if ((sstate.envelope.ctype == NULL ||
-       FP_stristr (sstate.envelope.ctype, "multipart") != NULL) &&
+       _FP_stristr (sstate.envelope.ctype, "multipart") != NULL) &&
       !uu_more_mime) {
     prevpos = ftell (datei);
     while (!feof (datei)) {
-      if (FP_fgets (line, 255, datei) == NULL) {
+      if (_FP_fgets (line, 255, datei) == NULL) {
 	line[0] = '\0';
 	break;
       }
       if (UUBUSYPOLL(ftell(datei),progress.fsize)) SPCANCEL();
       if (!IsLineEmpty (line))
 	break;
     }
     if (line[0] == '-' && line[1] == '-' &&
 	!IsLineEmpty (line+2) && !feof (datei)) {
-      ptr1 = FP_strrstr (line+2, "--");
+      ptr1 = _FP_strrstr (line+2, "--");
       ptr2 = ScanHeaderLine (datei, NULL);
       if ((ptr1 == NULL || (*(ptr1+2) != '\012' && *(ptr1+2) != '\015')) &&
-	  ptr2 && FP_strnicmp (ptr2, "Content-", 8) == 0) {
+	  ptr2 && _FP_strnicmp (ptr2, "Content-", 8) == 0) {
 	/*
 	 * hmm, okay, let's do it!
 	 */
 	sstate.isfolder  = 1;
 	sstate.ismime    = 1;
 	 */
 	ptr1 = line+2;
 	while (*ptr1 && !isspace(*ptr1))
 	  ptr1++;
 	*ptr1 = '\0';
-        sstate.envelope.mimevers = FP_strdup ("1.0");
+	sstate.envelope.mimevers = _FP_strdup ("1.0");
-	sstate.envelope.boundary = FP_strdup (line+2);
+	sstate.envelope.boundary = _FP_strdup (line+2);
 	/*
 	 * need restart
 	 */
 	fseek (datei, prevpos, SEEK_SET);
-	FP_free (result);
+	_FP_free (result);
 	return NULL;
       }
     }
     fseek (datei, prevpos, SEEK_SET);
   }
    * Freestyle time. Anyway, if this seems to be a Mime message,
    * don't allow the minimal Base64 handling.
    */
   if (sstate.envelope.subject)
-    result->subject = FP_strdup (sstate.envelope.subject);
+    result->subject = _FP_strdup (sstate.envelope.subject);
   if (sstate.envelope.from)
-    result->origin  = FP_strdup (sstate.envelope.from);
+    result->origin  = _FP_strdup (sstate.envelope.from);
   if (sstate.envelope.ctype)
-    result->mimetype = FP_strdup (sstate.envelope.ctype);
+    result->mimetype = _FP_strdup (sstate.envelope.ctype);
   if ((res=ScanData (datei, fname, errcode, NULL,
 		     sstate.ismime, 1, result))==-1) {
     /* oops, something went wrong */
     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);
+    _FP_free (result->filename);
-    if ((result->filename = FP_strdup (sstate.envelope.fname)) == NULL)
+    if ((result->filename = _FP_strdup (sstate.envelope.fname)) == NULL)
       *errcode = UURET_NOMEM;
   }
   else if ((result->uudet==QP_ENCODED||result->uudet==PT_ENCODED) &&
 	   result->filename == NULL) {
     sprintf (line, "%04d.txt", ++mimseqno);
-    if ((result->filename = FP_strdup (line)) == NULL)
+    if ((result->filename = _FP_strdup (line)) == NULL)
       *errcode = UURET_NOMEM;
   }
   else {
     /* assign a filename lateron */
   }
   if (result->subject == NULL) {
     if (sstate.envelope.subject)
-      result->subject = FP_strdup (sstate.envelope.subject);
+      result->subject = _FP_strdup (sstate.envelope.subject);
   }
   result->flags  = (result->uudet==PT_ENCODED)?FL_SINGLE:0;
-  result->mimeid = FP_strdup (sstate.envelope.mimeid);
+  result->mimeid = _FP_strdup (sstate.envelope.mimeid);
   result->length = ftell (datei) - result->startpos;
   if (result->mode == 0)
     result->mode = 0644;
   if (result->sfname == NULL)
-    result->sfname = FP_strdup (fname);
+    result->sfname = _FP_strdup (fname);
   if (res == 1) {
     /*
      * new headers found
      */
   UUkillheaders (&localenv);
   while (mssdepth) {
     mssdepth--;
     UUkillheaders (&(multistack[mssdepth].envelope));
-    FP_free (multistack[mssdepth].source);
+    _FP_free (multistack[mssdepth].source);
   }
   return NULL;
 }

Diff Legend

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

Comparing Convert-UUlib/uulib/uuscan.c (file contents): Revision 1.3 by root, Tue Aug 7 13:38:38 2001 UTC vs. Revision 1.3.2.4 by root, Thu Nov 6 13:08:24 2003 UTC

Diff Legend

Comparing Convert-UUlib/uulib/uuscan.c (file contents):
Revision 1.3 by root, Tue Aug 7 13:38:38 2001 UTC vs.
Revision 1.3.2.4 by root, Thu Nov 6 13:08:24 2003 UTC