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

Comparing Convert-UUlib/uulib/uunconc.c (file contents):
Revision 1.3.2.5 by root, Sun Apr 18 19:55:46 2004 UTC vs.
Revision 1.33 by root, Sat Sep 24 17:40:45 2022 UTC

 #include <os2.h>
 #endif
 #include <stdio.h>
 #include <ctype.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <string.h>
-#endif
+#include <errno.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
 #endif
 #include <crc32.h>
 #include <uudeview.h>
 #include <uuint.h>
 #include <fptools.h>
 #include <uustring.h>
-char * uunconc_id = "$Id: uunconc.c,v 1.3.2.5 2004/04/18 19:55:46 root Exp $";
 /* for braindead systems */
 #ifndef SEEK_SET
 #ifdef L_BEGIN
 #define SEEK_SET L_BEGIN
 /*
  * To prevent warnings when using a char as index into an array
  */
-#define ACAST(s)	((int)(unsigned char)(s))
+#define ACAST(s)	((int)(uchar)(s))
 /*
  * Initialize decoding tables
  */
   B64xlat = (int *) uunconc_B64xlat;
   XXxlat  = (int *) uunconc_XXxlat;
   BHxlat  = (int *) uunconc_BHxlat;
   save[0] = uunconc_save;
-  save[1] = uunconc_save + 256;
+  save[1] = uunconc_save + 1200;
-  save[2] = uunconc_save + 512;
+  save[2] = uunconc_save + 2400;
   /* prepare decoding translation table */
   for(i = 0; i < 256; i++)
     UUxlat[i] = B64xlat[i] = XXxlat[i] = BHxlat[i] = -1;
  * Determines whether Netscape may have broken up a data line (by
  * inserting a newline). This only seems to happen after <a in a
  * href statement
  */
-int
+static int
 UUBrokenByNetscape (char *string)
 {
   char *ptr;
   int len;
   if (string==NULL || (len=strlen(string))<3)
     return 0;
-  if ((ptr = _FP_stristr (string, "<a href=")) != NULL) {
+  if ((ptr = FP_stristr (string, "<a href=")) != NULL) {
-    if (_FP_stristr (string, "</a>") > ptr)
+    if (FP_stristr (string, "</a>") > ptr)
       return 2;
   }
   ptr = string + len;
-  while (len && (*(ptr-1)=='\015' || *(ptr-1)=='\012')) {
-    ptr--; len--;
-  }
   if (len<3)         return 0;
   if (*--ptr == ' ') ptr--;
   ptr--;
-  if (_FP_strnicmp (ptr, "<a", 2) == 0)
+  if (FP_strnicmp (ptr, "<a", 2) == 0)
     return 1;
   return 0;
 }
 /*
  * Try to repair a Netscape-corrupted line of data.
  * This must only be called on corrupted lines, since non-Netscape
  * data may even _get_ corrupted by this procedure.
  *
  * Some checks are included multiply to speed up the procedure. For
  * example: (*p1!='<' || strnicmp(p1,"</a>",4)). If the first expression
  * becomes true, the costly function isn't called :-)
  *
  * Since '<', '>', '&' might even be replaced by their html equivalents
  * in href strings, I'm now using two passes, the first one for &amp; + co,
  * the second one for hrefs.
  */
-int
+static int
 UUNetscapeCollapse (char *string)
 {
   char *p1=string, *p2=string;
   int res = 0;
   /*
    * First pass
    */
   while (*p1) {
     if (*p1 == '&') {
-      if      (_FP_strnicmp (p1, "&amp;", 5) == 0) { p1+=5; *p2++='&'; res=1; }
+      if      (FP_strnicmp (p1, "&amp;", 5) == 0) { p1+=5; *p2++='&'; res=1; }
-      else if (_FP_strnicmp (p1, "&lt;",  4) == 0) { p1+=4; *p2++='<'; res=1; }
+      else if (FP_strnicmp (p1, "&lt;",  4) == 0) { p1+=4; *p2++='<'; res=1; }
-      else if (_FP_strnicmp (p1, "&gt;",  4) == 0) { p1+=4; *p2++='>'; res=1; }
+      else if (FP_strnicmp (p1, "&gt;",  4) == 0) { p1+=4; *p2++='>'; res=1; }
       else *p2++ = *p1++;
+      res = 1;
     }
     else *p2++ = *p1++;
   }
   *p2 = '\0';
   /*
    */
   p1 = p2 = string;
   while (*p1) {
     if (*p1 == '<') {
-      if ((_FP_strnicmp (p1, "<ahref=", 7) == 0 ||
+      if ((FP_strnicmp (p1, "<ahref=", 7) == 0 ||
-	   _FP_strnicmp (p1, "<a href=",8) == 0) &&
+	   FP_strnicmp (p1, "<a href=",8) == 0) &&
-	  (_FP_strstr (p1, "</a>") != 0 || _FP_strstr (p1, "</A>") != 0)) {
+	  (FP_strstr (p1, "</a>") != 0 || FP_strstr (p1, "</A>") != 0)) {
 	while (*p1 && *p1!='>')        p1++;
 	if (*p1=='\0' || *(p1+1)!='<') return 0;
 	p1++;
-	while (*p1 && (*p1!='<' || _FP_strnicmp(p1,"</a>",4)!=0)) {
+	while (*p1 && (*p1!='<' || FP_strnicmp(p1,"</a>",4)!=0)) {
 	  *p2++ = *p1++;
 	}
-	if (_FP_strnicmp(p1,"</a>",4) != 0)
+	if (FP_strnicmp(p1,"</a>",4) != 0)
 	  return 0;
 	p1+=4;
 	res=1;
       }
       else
 int
 UUValidData (char *ptr, int encoding, int *bhflag)
 {
   int i=0, j, len=0, suspicious=0, flag=0;
-  char *s = ptr;
+  signed char *s = ptr;
   if ((s == NULL) || (*s == '\0')) {
     return 0;              /* bad string */
   }
-  while (*s && *s!='\012' && *s!='\015') {
+  if (encoding == YENC_ENCODED)
-    s++;
+    return YENC_ENCODED;
-    len++;
-    i++;
-  }
-  if (i == 0)
+  i = strlen (s);
-    return 0;
   switch (encoding) {
   case UU_ENCODED:
     goto _t_UU;
   case XX_ENCODED:
     goto _t_XX;
   case B64ENCODED:
     goto _t_B64;
   case BH_ENCODED:
     goto _t_Binhex;
-  case YENC_ENCODED:
-    return YENC_ENCODED;
   }
  _t_Binhex:                 /* Binhex Test */
   len = i; s = ptr;
   while (vflag == 0 && nflag && safety--) {
     if (nflag == 1) {		/* need next line to repair */
       if (strlen (line) > 250)
 	break;
       ptr = line + strlen (line);
-      while (ptr>line && (*(ptr-1)=='\015' || *(ptr-1)=='\012'))
-	ptr--;
-      if (_FP_fgets (ptr, 255-(ptr-line), datei) == NULL)
+      if (FP_fgets (ptr, 299-(ptr-line), datei) == NULL)
 	break;
     }
     else {			/* don't need next line to repair */
     }
     if (UUNetscapeCollapse (line)) {
    * it!
    */
   if (vflag == 0) {
     ptr    = line + strlen(line);
-    while (ptr>line && (*(ptr-1)=='\012' || *(ptr-1)=='\015')) {
-      ptr--;
-    }
     *ptr++ = ' ';
     *ptr-- = '\0';
     if ((vflag = UUValidData (line, encoding, bhflag)) != UU_ENCODED) {
       *ptr  = '\0';
       vflag = 0;
   /*
    * To shut up gcc -Wall
    */
   z1 = z2 = z3 = z4 = 0;
+  if (method == YENC_ENCODED) {
+    while (*s) {
+      if (ecb_expect_false (*s == '=')) {
+	if (*++s != '\0') {
+	  d[count++] = (char) ((int) *s - 64 - 42);
+	  s++;
+	}
+      }
+      #if 0 /* FP_fgets never leaves CR or LF in the buffer, so skip this */
+      else if (ecb_expect_false (*s == '\n' || *s == '\r')) {
+	s++; /* ignore */
+      }
+      #endif
+      else {
+	d[count++] = (char) ((int) *s++ - 42);
+      }
+    }
+  }
-  if (method == UU_ENCODED || method == XX_ENCODED) {
+  else if (method == UU_ENCODED || method == XX_ENCODED) {
     if (method == UU_ENCODED)
       table = UUxlat;
     else
       table = XXxlat;
       cc = table[ACAST(*s++)];
       c |= (cc >> 4);
       if(i-- > 0)
 	d[count++] = c;
       cc <<= 4;
       c    = table[ACAST(*s++)];
       cc  |= (c >> 2);
       if(i-- > 0)
 	d[count++] = cc;
       c <<= 6;
       c |= table[ACAST(*s++)];
       if(i-- > 0)
 	d[count++] = c;
       j -= 4;
     }
   }
   else if (method == B64ENCODED) {
     if (leftover) {
-      strcpy (uuncdl_fulline+leftover, s);
+      strcpy (uuncdl_fulline + leftover, s);
       leftover = 0;
       s        = uuncdl_fulline;
     }
     while ((z1 = B64xlat[ACAST(*s)]) != -1) {
     while (B64xlat[ACAST(*s)] != -1)
       uuncdl_fulline[leftover++] = *s++;
   }
   else if (method == BH_ENCODED) {
     if (leftover) {
-      strcpy (uuncdl_fulline+leftover, s);
+      strcpy (uuncdl_fulline + leftover, s);
       leftover = 0;
       s        = uuncdl_fulline;
     }
     else if (*s == ':')
       s++;
       s+=3;
     }
     while (BHxlat[ACAST(*s)] != -1)
       uuncdl_fulline[leftover++] = *s++;
   }
-  else if (method == YENC_ENCODED) {
-    while (*s) {
-      if (*s == '=') {
-	if (*++s != '\0') {
-	  d[count++] = (char) ((int) *s - 64 - 42);
-	  s++;
-	}
-      }
-      else if (*s == '\n' || *s == '\r') {
-	s++; /* ignore */
-      }
-      else {
-	d[count++] = (char) ((int) *s++ - 42);
-      }
-    }
-  }
   return count;
 }
 /*
  * ``Decode'' Quoted-Printable text
  */
-int
+static int
 UUDecodeQP (FILE *datain, FILE *dataout, int *state,
 	    long maxpos, int method, int flags,
 	    char *boundary)
 {
   char *line=uugen_inbuffer, *p1, *p2;
   int val;
   uulboundary = -1;
-  while (!feof (datain) &&
+  while (!FP_feof (datain) &&
 	 (ftell(datain)<maxpos || flags&FL_TOEND ||
 	  (!(flags&FL_PROPER) && uu_fast_scanning))) {
-    if (_FP_fgets (line, 255, datain) == NULL)
+    if (FP_fgets (line, 1023, datain) == NULL)
       break;
     if (ferror (datain)) {
-      UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+      UUMessage (UUMSG_ERROR, uustring (S_SOURCE_READ_ERR), strerror (uu_errno = errno));
-		 uustring (S_SOURCE_READ_ERR),
-		 strerror (uu_errno = errno));
       return UURET_IOERR;
     }
     line[255] = '\0';
     if (boundary && line[0]=='-' && line[1]=='-' &&
 	uulboundary = 0;
       return UURET_OK;
     }
     if (UUBUSYPOLL(ftell(datain)-progress.foffset,progress.fsize)) {
-      UUMessage (uunconc_id, __LINE__, UUMSG_NOTE,
+      UUMessage (UUMSG_NOTE, uustring (S_DECODE_CANCEL));
-		 uustring (S_DECODE_CANCEL));
       return UURET_CANCEL;
     }
     p1 = p2 = line;
 	fputc (val, dataout);
 	p2 += 2;
 	p1  = p2;
       }
-      else if (*p2 == '\012' || *(p2+1) == '\015') {
+      else if (!*p2) {
 	/* soft line break */
-	*p2 = '\0';
+        goto skip_lbr;
 	break;
       }
       else {
 	/* huh? */
 	fputc ('=', dataout);
      * p2 points to a nullbyte right after the CR/LF/CRLF
      */
     val = 0;
     while (p2>p1 && isspace (*(p2-1))) {
       if (*(p2-1) == '\012' || *(p2-1) == '\015')
-	val = 1;
+        val = 1;
       p2--;
     }
     *p2 = '\0';
     /*
      * If the part ends directly after this line, the data does not end
      * with a linebreak. Or, as the docs put it, "the CRLF preceding the
      * encapsulation line is conceptually attached to the boundary.
      * So if the part ends here, don't print a line break"
      */
+    /* something is broken here now, but it was broken before */
-    if (val && (!feof (datain) &&
+    if (!FP_feof (datain) &&
-		(ftell(datain)<maxpos || flags&FL_TOEND ||
+	(ftell(datain)<maxpos || flags&FL_TOEND ||
-		 (!(flags&FL_PROPER) && uu_fast_scanning))))
+	 (!(flags&FL_PROPER) && uu_fast_scanning)))
       fprintf (dataout, "%s\n", p1);
     else
       fprintf (dataout, "%s", p1);
+    skip_lbr: ;
   }
   return UURET_OK;
 }
 /*
  * ``Decode'' plain text. Our job is to properly handle the EOL sequence
  */
-int
+static int
 UUDecodePT (FILE *datain, FILE *dataout, int *state,
 	    long maxpos, int method, int flags,
 	    char *boundary)
 {
   char *line=uugen_inbuffer, *ptr;
   uulboundary = -1;
-  while (!feof (datain) &&
+  while (!FP_feof (datain) &&
 	 (ftell(datain)<maxpos || flags&FL_TOEND ||
 	  (!(flags&FL_PROPER) && uu_fast_scanning))) {
-    if (_FP_fgets (line, 255, datain) == NULL)
+    if (FP_fgets (line, 1023, datain) == NULL)
       break;
     if (ferror (datain)) {
-      UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+      UUMessage (UUMSG_ERROR, uustring (S_SOURCE_READ_ERR), strerror (uu_errno = errno));
-		 uustring (S_SOURCE_READ_ERR),
-		 strerror (uu_errno = errno));
       return UURET_IOERR;
     }
     line[255] = '\0';
     if (boundary && line[0]=='-' && line[1]=='-' &&
 	uulboundary = 0;
       return UURET_OK;
     }
     if (UUBUSYPOLL(ftell(datain)-progress.foffset,progress.fsize)) {
-      UUMessage (uunconc_id, __LINE__, UUMSG_NOTE,
+      UUMessage (UUMSG_NOTE, uustring (S_DECODE_CANCEL));
-		 uustring (S_DECODE_CANCEL));
       return UURET_CANCEL;
     }
     ptr = line + strlen (line);
-    while (ptr>line && (*(ptr-1) == '\012' || *(ptr-1) == '\015'))
-      ptr--;
     /*
      * If the part ends directly after this line, the data does not end
      * with a linebreak. Or, as the docs put it, "the CRLF preceding the
      * encapsulation line is conceptually attached to the boundary.
      * So if the part ends here, don't print a line break"
      */
-    if ((*ptr == '\012' || *ptr == '\015') &&
-	(ftell(datain)<maxpos || flags&FL_TOEND || flags&FL_PARTIAL ||
+    if ((ftell(datain)<maxpos || flags&FL_TOEND || flags&FL_PARTIAL ||
 	 !boundary || (!(flags&FL_PROPER) && uu_fast_scanning))) {
       *ptr = '\0';
       fprintf (dataout, "%s\n", line);
     }
     else {
 	  d[count]  = (isdigit (*(s+1)) ? (*(s+1)-'0') : (tolower (*(s+1))-'a'+10)) << 4;
 	  d[count] |= (isdigit (*(s+2)) ? (*(s+2)-'0') : (tolower (*(s+2))-'a'+10));
 	  count++;
 	  s+=3;
 	}
-	else if (*(s+1) == '\012' || *(s+1) == '\015') {
+	else if (!s[1]) {
-	  s+=2;
+          d[count++] = '\012';
 	}
 	else {
 	  d[count++] = *s++;
 	}
       }
 int
 UUDecodePart (FILE *datain, FILE *dataout, int *state,
 	      long maxpos, int method, int flags,
 	      char *boundary)
 {
-  char *line=uugen_fnbuffer, *oline=uuncdp_oline;
+  char *line, *oline=uuncdp_oline;
   int warning=0, vlc=0, lc[2], hadct=0;
   int tc=0, tf=0, vflag, haddata=0, haddh=0;
-  long yefilesize=0, yepartends=0;
+  long yefilesize=0, yepartends=0, yenotlastpart=0;
-  crc32_t yepartcrc=crc32(0L, Z_NULL, 0);
+  crc32_t yepartcrc=CRC32_INIT;
-  static crc32_t yefilecrc=0;
+  static crc32_t yefilecrc;
   static int bhflag=0;
   size_t count=0;
   size_t yepartsize=0;
   char *ptr;
   if (datain == NULL || dataout == NULL) {
-    yefilecrc = crc32(0L, Z_NULL, 0);
+    yefilecrc = CRC32_INIT;
     bhflag = 0;
     return UURET_OK;
   }
   /*
   if (method == YENC_ENCODED) {
     *state = BEGIN;
   }
-  while (!feof (datain) && *state != DONE &&
+  while (!FP_feof (datain) && *state != DONE &&
 	 (ftell(datain)<maxpos || flags&FL_TOEND || maxpos==-1 ||
 	  (!(flags&FL_PROPER) && uu_fast_scanning))) {
-    if (_FP_fgets (line, 255, datain) == NULL)
+    if (FP_fgets ((line = uugen_fnbuffer), 1200 - 5, datain) == NULL)
       break;
+    /* optionally skip .. */
+    if (*line == '.' && uu_dotdot)
+      line++;
     if (ferror (datain)) {
-      UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+      UUMessage (UUMSG_ERROR, uustring (S_SOURCE_READ_ERR), strerror (uu_errno = errno));
-		 uustring (S_SOURCE_READ_ERR),
-		 strerror (uu_errno = errno));
       return UURET_IOERR;
     }
-    if (line[0]=='\015' || line[0]=='\012') { /* Empty line? */
+    if (!*line) { /* Empty line? */
       if (*state == DATA &&
 	  (method == UU_ENCODED || method == XX_ENCODED))
 	*state = END;
       /*
       if (vlc > 5)
 	tf = tc = 0;
       vlc = 0;
       continue;
     }
     /*
      * Busy Polls
      */
     if (UUBUSYPOLL(ftell(datain)-progress.foffset,progress.fsize)) {
-      UUMessage (uunconc_id, __LINE__, UUMSG_NOTE,
+      UUMessage (UUMSG_NOTE, uustring (S_DECODE_CANCEL));
-		 uustring (S_DECODE_CANCEL));
       return UURET_CANCEL;
     }
     /*
      * try to make sense of data
      */
-    line[255] = '\0'; /* For Safety of string functions */
+    line[1200 - 1] = '\0'; /* For Safety of string functions */
-    count     =  0;
+    count          =  0;
     if (boundary && line[0]=='-' && line[1]=='-' &&
 	strncmp (line+2, boundary, strlen (boundary)) == 0) {
       if (line[strlen(boundary)+2]=='-')
 	uulboundary = 1;
      * Use this pseudo-handling only if !FL_PROPER
      */
     if ((flags&FL_PROPER) == 0) {
       if (strncmp (line, "BEGIN", 5) == 0 &&
-	  _FP_strstr  (line, "CUT HERE")  && !tf) { /* I hate these lines */
+	  FP_strstr  (line, "CUT HERE")  && !tf) { /* I hate these lines */
 	tc = tf = vlc = 0;
 	continue;
       }
       /* MIME body boundary */
       if (line[0] == '-' && line[1] == '-' && method == B64ENCODED) {
 	}
 	hadct = 0;
 	haddh = 1;
 	continue;
       }
-      if (_FP_strnicmp (line, "Content-Type", 12) == 0)
+      if (FP_strnicmp (line, "Content-Type", 12) == 0)
 	hadct = 1;
     }
     if (*state == BEGIN) {
       if ((method == UU_ENCODED || method == XX_ENCODED) &&
 	  (strncmp      (line, "begin ",       6) == 0 ||
-	   _FP_strnicmp (line, "<pre>begin ", 11) == 0)) { /* for LYNX */
+	   FP_strnicmp (line, "<pre>begin ", 11) == 0)) { /* for LYNX */
 	*state = DATA;
 	continue;
       }
       else if (method == BH_ENCODED && line[0] == ':') {
 	if (UUValidData (line, BH_ENCODED, &bhflag) == BH_ENCODED) {
 	else
 	  continue;
       }
       else if (method == YENC_ENCODED &&
 	       strncmp (line, "=ybegin ", 8) == 0 &&
-	       _FP_strstr (line, " name=") != NULL) {
+	       FP_strstr (line, " name=") != NULL) {
 	*state = DATA;
-	if ((ptr = _FP_strstr (line, " size=")) != NULL) {
+	if ((ptr = FP_strstr (line, " size=")) != NULL) {
 	  ptr += 6;
 	  yefilesize = atoi (ptr);
 	}
 	else {
 	  yefilesize = -1;
 	}
-	if (_FP_strstr (line, " part=") != NULL) {
+	if ((ptr =FP_strstr (line, " part="))) {
+          int partno = atoi (ptr + 6);
+	  if ((ptr = FP_strstr (line, " total=")))
+            yenotlastpart = atoi (ptr + 7) != partno;
-	  if (_FP_fgets (line, 255, datain) == NULL) {
+	  if (FP_fgets (line, 1200 - 5, datain) == NULL) {
 	    break;
 	  }
-	  if ((ptr = _FP_strstr (line, " end=")) == NULL) {
+	  if ((ptr = FP_strstr (line, " end=")) == NULL) {
 	    break;
 	  }
 	  yepartends = atoi (ptr + 5);
 	}
 	tf = 1;
 	continue;
       }
       else {
 	continue;
       }
       tc = tf = vlc = 0;
       lc[0] = lc[1] = 0;
     }
-    else if ((*state == END) &&
+    else if ((*state == END || *state == DATA) &&
 	     (method == UU_ENCODED || method == XX_ENCODED)) {
       if (strncmp (line, "end", 3) == 0) {
 	*state = DONE;
 	break;
       }
     }
     if (*state == DATA && method == YENC_ENCODED &&
 	strncmp (line, "=yend ", 6) == 0) {
+      int lastpart = !yenotlastpart && (yepartends == 0 || yepartends >= yefilesize);
+      yefilecrc = uu_crc32_combine(yefilecrc, yepartcrc, yepartsize);
-      if ((ptr = _FP_strstr (line, " pcrc32=")) != NULL) {
+      if ((ptr = FP_strstr (line, " pcrc32=")) != NULL) {
 	crc32_t pcrc32 = strtoul (ptr + 8, NULL, 16);
 	if (pcrc32 != yepartcrc) {
-	  UUMessage (uunconc_id, __LINE__, UUMSG_WARNING,
-		     uustring (S_PCRC_MISMATCH), progress.curfile, progress.partno);
+	  UUMessage (UUMSG_WARNING, uustring (S_PCRC_MISMATCH), progress.curfile, progress.partno);
 	}
+      } else if ((ptr = FP_strstr (line, " pcrc=")) != NULL) {
+	crc32_t pcrc32 = strtoul (ptr + 6, NULL, 16);
+	if (pcrc32 != yepartcrc) {
+	  UUMessage (UUMSG_WARNING, uustring (S_PCRC_MISMATCH), progress.curfile, progress.partno);
+	}
       }
-      if ((ptr = _FP_strstr (line, " crc32=")) != NULL)
+      if (lastpart && (ptr = FP_strstr (line, " crc32=")) != NULL)
       {
 	crc32_t fcrc32 = strtoul (ptr + 7, NULL, 16);
 	if (fcrc32 != yefilecrc) {
-	  UUMessage (uunconc_id, __LINE__, UUMSG_WARNING,
+	  UUMessage (UUMSG_WARNING, uustring (S_CRC_MISMATCH), progress.curfile);
-		     uustring (S_CRC_MISMATCH), progress.curfile);
 	}
       }
-      if ((ptr = _FP_strstr (line, " size=")) != NULL)
+      if ((ptr = FP_strstr (line, " size=")) != NULL)
       {
 	size_t size = atol(ptr + 6);
 	if (size != yepartsize && yefilesize != -1) {
 	  if (size != yefilesize)
-	    UUMessage (uunconc_id, __LINE__, UUMSG_WARNING,
+	    UUMessage (UUMSG_WARNING,
 		       uustring (S_PSIZE_MISMATCH), progress.curfile,
 		       progress.partno, yepartsize, size);
 	  else
-	    UUMessage (uunconc_id, __LINE__, UUMSG_WARNING,
+	    UUMessage (UUMSG_WARNING,
 		       uustring (S_SIZE_MISMATCH), progress.curfile,
 		       yepartsize, size);
 	}
       }
-      if (yepartends == 0 || yepartends >= yefilesize) {
+      if (lastpart) {
 	*state = DONE;
       }
       break;
     }
       if (vflag == method) {
 	if (tf) {
 	  count  = UUDecodeLine (line, oline, method);
 	  if (method == YENC_ENCODED) {
-	    if (yepartends)
-	      yepartcrc = crc32(yepartcrc, oline, count);
+	    yepartcrc = uu_crc32(yepartcrc, oline, count);
-	    yefilecrc = crc32(yefilecrc, oline, count);
 	    yepartsize += count;
 	  }
 	  vlc++; lc[1]++;
 	}
 	else if (tc == 3) {
 	   * correctly encoded data. This usually means that the
 	   * file is in error
 	   */
 	  if (lc[1] > 10 && (lc[0] >= 1 && lc[0] <= 2) && !warning) {
-	    UUMessage (uunconc_id, __LINE__, UUMSG_WARNING,
+	    UUMessage (UUMSG_WARNING, uustring (S_DATA_SUSPICIOUS));
-		       uustring (S_DATA_SUSPICIOUS));
 	    warning=1;
 	  }
 	  lc[0] = 0;
 	  lc[1] = 3;
 	}
 	else {
-	  _FP_strncpy (save[tc++], line, 256);
+	  FP_strncpy (save[tc++], line, 1200);
 	}
 	if (method == UU_ENCODED)
 	  *state = (line[0] == 'M') ? DATA : END;
 	else if (method == XX_ENCODED)
     }
     if (count) {
       if (method == BH_ENCODED) {
 	if (UUbhwrite (oline, 1, count, dataout) != count) {
-	  UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+	  UUMessage (UUMSG_ERROR, uustring (S_WR_ERR_TEMP), strerror (uu_errno = errno));
-		     uustring (S_WR_ERR_TEMP),
-		     strerror (uu_errno = errno));
 	  return UURET_IOERR;
 	}
       }
       else if (fwrite (oline, 1, count, dataout) != count) {
-	UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+	UUMessage (UUMSG_ERROR, uustring (S_WR_ERR_TEMP), strerror (uu_errno = errno));
-		   uustring (S_WR_ERR_TEMP),
-		   strerror (uu_errno = errno));
 	return UURET_IOERR;
       }
       haddata++;
       count = 0;
     }
   }
   if (*state  == DONE ||
       (*state == DATA && method == B64ENCODED &&
        vflag == B64ENCODED && (flags&FL_PROPER || haddh))) {
     for (tf=0; tf<tc; tf++)
       count += UUDecodeLine (save[tf], oline + count, method);
     if (count) {
       if (method == BH_ENCODED) {
 	if (UUbhwrite (oline, 1, count, dataout) != count) {
-	  UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+	  UUMessage (UUMSG_ERROR, uustring (S_WR_ERR_TEMP), strerror (uu_errno = errno));
-		     uustring (S_WR_ERR_TEMP),
-		     strerror (uu_errno = errno));
 	  return UURET_IOERR;
 	}
       }
       else if (fwrite (oline, 1, count, dataout) != count) {
-	UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+	UUMessage (UUMSG_ERROR, uustring (S_WR_ERR_TEMP), strerror (uu_errno = errno));
-		   uustring (S_WR_ERR_TEMP),
-		   strerror (uu_errno = errno));
 	return UURET_IOERR;
       }
     }
   }
   return UURET_OK;
 int
 UUDecode (uulist *data)
 {
   int state=BEGIN, part=-1, res=0, hb;
-  long rsize, dsize, numbytes;
+  unsigned long rsize, dsize, numbytes;
   FILE *datain, *dataout;
+  void *datain_buf, *dataout_buf;
   unsigned char r[8];
   char *mode, *ntmp;
   uufile *iter;
   size_t bytes;
+#ifdef HAVE_MKSTEMP
+  int tmpfd;
+  const char *tmpprefix = "uuXXXXXX";
+  char *tmpdir = NULL;
+#endif /* HAVE_MKSTEMP */
   if (data == NULL || data->thisfile == NULL)
     return UURET_ILLVAL;
   if (data->state & UUFILE_TMPFILE)
   if (data->uudet == PT_ENCODED)
     mode = "wt";	/* open text files in text mode */
   else
     mode = "wb";	/* otherwise in binary          */
+#ifdef HAVE_MKSTEMP
+  if ((getuid()==geteuid()) && (getgid()==getegid())) {
+	  tmpdir=getenv("TMPDIR");
+  }
+  if (!tmpdir) {
+	  tmpdir = "/tmp";
+  }
+  data->binfile = malloc(strlen(tmpdir)+strlen(tmpprefix)+2);
+  if (!data->binfile) {
+#else
-  if ((data->binfile = tempnam (NULL, "uu")) == NULL) {
+  if ((data->binfile = tmpnam (NULL)) == NULL) {
-    UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+#endif /* HAVE_MKSTEMP */
-	       uustring (S_NO_TEMP_NAME));
+    UUMessage (UUMSG_ERROR, uustring (S_NO_TEMP_NAME));
     return UURET_NOMEM;
   }
+#ifdef HAVE_MKSTEMP
+  strcpy(data->binfile, tmpdir);
+  strcat(data->binfile, "/");
+  strcat(data->binfile, tmpprefix);
+  if ((tmpfd = mkstemp(data->binfile)) == -1 ||
+	  (dataout = fdopen(tmpfd, mode)) == NULL) {
+#else
   if ((dataout = fopen (data->binfile, mode)) == NULL) {
+#endif /* HAVE_MKSTEMP */
     /*
      * we couldn't create a temporary file. Usually this means that TMP
      * and TEMP aren't set
      */
-    UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+    UUMessage (UUMSG_ERROR, uustring (S_WR_ERR_TARGET), data->binfile, strerror (uu_errno = errno));
-	       uustring (S_WR_ERR_TARGET),
+#ifdef HAVE_MKSTEMP
-	       data->binfile, strerror (uu_errno = errno));
+	if (tmpfd != -1) {
+		unlink(data->binfile);
+		close(tmpfd);
+    }
+#endif /* HAVE_MKSTEMP */
-    _FP_free (data->binfile);
+    FP_free (data->binfile);
     data->binfile = NULL;
     uu_errno = errno;
     return UURET_IOERR;
   }
+  UUSETBUF (dataout, dataout_buf, uu_wbuf);
+  FP_flockfile (dataout);
   /*
    * we don't have begin lines in Base64 or plain text files.
    */
   if (data->uudet == B64ENCODED || data->uudet == QP_ENCODED ||
       data->uudet == PT_ENCODED)
   /*
    * initialize progress information
    */
   progress.action = 0;
   if (data->filename != NULL) {
-    _FP_strncpy (progress.curfile,
+    FP_strncpy (progress.curfile,
 		 (strlen(data->filename)>255)?
 		 (data->filename+strlen(data->filename)-255):data->filename,
 		 256);
   }
   else {
-    _FP_strncpy (progress.curfile,
+    FP_strncpy (progress.curfile,
 		 (strlen(data->binfile)>255)?
 		 (data->binfile+strlen(data->binfile)-255):data->binfile,
 		 256);
   }
   progress.partno   =  0;
   iter = data->thisfile;
   while (iter) {
     progress.numparts = (iter->partno)?iter->partno:1;
     iter = iter->NEXT;
   }
   /*
    * let's rock!
    */
   iter = data->thisfile;
 				     uugen_fnbuffer, 1)) != UURET_OK)
 	break;
       if ((datain = fopen (uugen_fnbuffer, "rb")) == NULL) {
 	(*uu_FileCallback) (uu_FileCBArg, iter->data->sfname,
 			    uugen_fnbuffer, 0);
-	UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+	UUMessage (UUMSG_ERROR,
 		   uustring (S_NOT_OPEN_FILE),
 		   uugen_fnbuffer, strerror (uu_errno = errno));
 	res = UURET_IOERR;
 	break;
       }
     }
     else {
       if ((datain = fopen (iter->data->sfname, "rb")) == NULL) {
-	UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+	UUMessage (UUMSG_ERROR,
 		   uustring (S_NOT_OPEN_FILE),
 		   iter->data->sfname, strerror (uu_errno = errno));
 	res = UURET_IOERR;
 	break;
       }
-      _FP_strncpy (uugen_fnbuffer, iter->data->sfname, 1024);
+      FP_strncpy (uugen_fnbuffer, iter->data->sfname, 1024);
     }
+    UUSETBUF (datain, datain_buf, uu_rbuf);
+    FP_flockfile (datain);
     progress.partno  = part;
     progress.fsize   = (iter->data->length)?iter->data->length:-1;
     progress.percent = 0;
     progress.foffset = iter->data->startpos;
     fseek              (datain, iter->data->startpos, SEEK_SET);
     res = UUDecodePart (datain, dataout, &state,
 			iter->data->startpos+iter->data->length,
 			data->uudet, iter->data->flags, NULL);
     fclose             (datain);
+    UUCLRBUF (uu_rbuf, datain_buf);
     if (uu_FileCallback)
       (*uu_FileCallback) (uu_FileCBArg, iter->data->sfname, uugen_fnbuffer, 0);
     if (state == DONE || res != UURET_OK)
       break;
     iter = iter->NEXT;
   }
   if (state == DATA &&
       (data->uudet == B64ENCODED || data->uudet == QP_ENCODED ||
        data->uudet == PT_ENCODED))
     state = DONE; /* assume we're done */
   if (fclose (dataout)) {
-    UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+    UUMessage (UUMSG_ERROR, uustring (S_WR_ERR_TEMP), strerror (uu_errno = errno));
-	       uustring (S_WR_ERR_TEMP),
-	       strerror (uu_errno = errno));
     res = UURET_IOERR;
   }
+  UUCLRBUF (uu_wbuf, dataout_buf);
   if (res != UURET_OK || (state != DONE && !uu_desperate)) {
     unlink (data->binfile);
-    _FP_free (data->binfile);
+    FP_free (data->binfile);
     data->binfile = NULL;
     data->state  &= ~UUFILE_TMPFILE;
     data->state  |=  UUFILE_ERROR;
     if (res == UURET_OK && state != DONE)
   /*
    * If this was a BinHex file, we must extract its data or resource fork
    */
   if (data->uudet == BH_ENCODED && data->binfile) {
-    if ((ntmp = tempnam (NULL, "uu")) == NULL) {
+#ifdef HAVE_MKSTEMP
-      UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+    ntmp = malloc(strlen(tmpdir)+strlen(tmpprefix)+2);
-		 uustring (S_NO_TEMP_NAME));
+#else
+    ntmp = tempnam (NULL);
+#endif /* HAVE_MKSTEMP */
+    if (ntmp == NULL) {
+      UUMessage (UUMSG_ERROR, uustring (S_NO_TEMP_NAME));
       progress.action = 0;
       return UURET_NOMEM;
     }
     if ((datain = fopen (data->binfile, "rb")) == NULL) {
-      UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+      UUMessage (UUMSG_ERROR, uustring (S_NOT_OPEN_FILE),
-		 uustring (S_NOT_OPEN_FILE),
 		 data->binfile, strerror (uu_errno = errno));
       progress.action = 0;
       free (ntmp);
       return UURET_IOERR;
     }
+    UUSETBUF (datain, datain_buf, uu_rbuf);
+    FP_flockfile (datain);
+#ifdef HAVE_MKSTEMP
+    strcpy(ntmp, tmpdir);
+    strcat(ntmp, "/");
+    strcat(ntmp, tmpprefix);
+    if ((tmpfd = mkstemp(ntmp)) == -1 ||
+		(dataout = fdopen(tmpfd, "wb")) == NULL) {
+#else
     if ((dataout = fopen (ntmp, "wb")) == NULL) {
-      UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+#endif /* HAVE_MKSTEMP */
+      UUMessage (UUMSG_ERROR,
 		 uustring (S_NOT_OPEN_TARGET),
 		 ntmp, strerror (uu_errno = errno));
       progress.action = 0;
       fclose (datain);
+      UUCLRBUF (uu_rbuf, datain_buf);
+#ifdef HAVE_MKSTEMP
+	  if (tmpfd != -1) {
+		  unlink(ntmp);
+		  close(tmpfd);
+	  }
+#endif /* HAVE_MKSTEMP */
       free   (ntmp);
       return UURET_IOERR;
     }
+    UUSETBUF (dataout, dataout_buf, uu_wbuf);
+    FP_flockfile (dataout);
     /*
      * read fork lengths. remember they're in Motorola format
      */
-    r[0] = fgetc (datain);
+    r[0] = FP_getc (datain);
     hb   = (int) r[0] + 22;
     fseek (datain, (int) r[0] + 12, SEEK_SET);
     fread (r, 1, 8, datain);
     dsize = (((long) 1 << 24) * (long) r[0]) +
     rsize = (((long) 1 << 24) * (long) r[4]) +
 	    (((long) 1 << 16) * (long) r[5]) +
 	    (((long) 1 <<  8) * (long) r[6]) +
 	    (                   (long) r[7]);
-    UUMessage (uunconc_id, __LINE__, UUMSG_MESSAGE,
+    UUMessage (UUMSG_MESSAGE, uustring (S_BINHEX_SIZES), dsize, rsize);
-	       uustring (S_BINHEX_SIZES),
-	       dsize, rsize);
     if (dsize == 0) {
       fseek  (datain, dsize + hb + 2, SEEK_SET);
       numbytes = rsize;
     }
       fseek  (datain, hb, SEEK_SET);
       numbytes = dsize;
     }
     else {
       /* we should let the user have the choice here */
-      UUMessage (uunconc_id, __LINE__, UUMSG_NOTE,
+      UUMessage (UUMSG_NOTE, uustring (S_BINHEX_BOTH));
-		 uustring (S_BINHEX_BOTH));
       fseek  (datain, hb, SEEK_SET);
       numbytes = dsize;
     }
     progress.action   = 0;
     progress.partno   = 0;
     progress.numparts = 1;
-    progress.fsize    = (numbytes)?numbytes:-1;
+    progress.fsize    = numbytes ? numbytes : -1;
     progress.foffset  = hb;
     progress.percent  = 0;
     progress.action   = UUACT_COPYING;
     /*
      * copy the chosen fork
      */
-    while (!feof (datain) && numbytes) {
+    while (!FP_feof (datain) && numbytes) {
       if (UUBUSYPOLL(ftell(datain)-progress.foffset,progress.fsize)) {
-	UUMessage (uunconc_id, __LINE__, UUMSG_NOTE,
+	UUMessage (UUMSG_NOTE, uustring (S_DECODE_CANCEL));
-		   uustring (S_DECODE_CANCEL));
 	fclose (datain);
+        UUCLRBUF (uu_rbuf, datain_buf);
 	fclose (dataout);
+        UUCLRBUF (uu_wbuf, dataout_buf);
 	unlink (ntmp);
 	free   (ntmp);
 	return UURET_CANCEL;
       }
       bytes = fread (uugen_inbuffer, 1,
 		     (size_t) ((numbytes>1024)?1024:numbytes), datain);
-      if (ferror (datain) || (bytes == 0 && !feof (datain))) {
+      if (ferror (datain) || (bytes == 0 && !FP_feof (datain))) {
 	progress.action = 0;
-	UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+	UUMessage (UUMSG_ERROR,
 		   uustring (S_SOURCE_READ_ERR),
 		   data->binfile, strerror (uu_errno = errno));
 	fclose (datain);
+        UUCLRBUF (uu_rbuf, datain_buf);
 	fclose (dataout);
+        UUCLRBUF (uu_wbuf, dataout_buf);
 	unlink (ntmp);
 	free   (ntmp);
 	return UURET_IOERR;
       }
       if (fwrite (uugen_inbuffer, 1, bytes, dataout) != bytes) {
 	progress.action = 0;
-	UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+	UUMessage (UUMSG_ERROR,
 		   uustring (S_WR_ERR_TARGET),
 		   ntmp, strerror (uu_errno = errno));
 	fclose (datain);
+        UUCLRBUF (uu_rbuf, datain_buf);
 	fclose (dataout);
+        UUCLRBUF (uu_wbuf, dataout_buf);
 	unlink (ntmp);
 	free   (ntmp);
 	return UURET_IOERR;
       }
       numbytes -= bytes;
     }
     if (numbytes) {
-      UUMessage (uunconc_id, __LINE__, UUMSG_WARNING,
+      UUMessage (UUMSG_WARNING,
 		 uustring (S_SHORT_BINHEX),
 		 (data->filename)?data->filename:
 		 (data->subfname)?data->subfname:"???",
 		 numbytes);
     }
     /*
      * replace temp file
      */
     fclose (datain);
+    UUCLRBUF (uu_rbuf, datain_buf);
     if (fclose (dataout)) {
-      UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+      UUCLRBUF (uu_wbuf, dataout_buf);
+      UUMessage (UUMSG_ERROR,
 		 uustring (S_WR_ERR_TARGET),
 		 ntmp, strerror (uu_errno = errno));
       unlink (ntmp);
       free   (ntmp);
       return UURET_IOERR;
     }
+    UUCLRBUF (uu_wbuf, dataout_buf);
     if (unlink (data->binfile)) {
-      UUMessage (uunconc_id, __LINE__, UUMSG_WARNING,
+      UUMessage (UUMSG_WARNING,
 		 uustring (S_TMP_NOT_REMOVED),
 		 data->binfile, strerror (uu_errno = errno));
     }
     free (data->binfile);
    */
   memset (&myenv, 0, sizeof (headers));
   UUScanHeader (datain, &myenv);
-  if (_FP_stristr (myenv.ctenc, "uu") != NULL)
+  if (FP_stristr (myenv.ctenc, "uu") != NULL)
     encoding = UU_ENCODED;
-  else if (_FP_stristr (myenv.ctenc, "xx") != NULL)
+  else if (FP_stristr (myenv.ctenc, "xx") != NULL)
     encoding = XX_ENCODED;
-  else if (_FP_stricmp (myenv.ctenc, "base64") == 0)
+  else if (FP_stricmp (myenv.ctenc, "base64") == 0)
     encoding = B64ENCODED;
-  else if (_FP_stricmp (myenv.ctenc, "quoted-printable") == 0)
+  else if (FP_stricmp (myenv.ctenc, "quoted-printable") == 0)
     encoding = QP_ENCODED;
   else
     encoding = PT_ENCODED;
   UUkillheaders (&myenv);

Diff Legend

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

Comparing Convert-UUlib/uulib/uunconc.c (file contents): Revision 1.3.2.5 by root, Sun Apr 18 19:55:46 2004 UTC vs. Revision 1.33 by root, Sat Sep 24 17:40:45 2022 UTC

Diff Legend

Comparing Convert-UUlib/uulib/uunconc.c (file contents):
Revision 1.3.2.5 by root, Sun Apr 18 19:55:46 2004 UTC vs.
Revision 1.33 by root, Sat Sep 24 17:40:45 2022 UTC