Blame SPECS/ksh-20120801-iso8859.patch

Packit Service a8c26c
diff --git a/src/cmd/ksh93/sh/fcin.c b/src/cmd/ksh93/sh/fcin.c
Packit Service a8c26c
index ea6ea6b..08c1f2a 100644
Packit Service a8c26c
--- a/src/cmd/ksh93/sh/fcin.c
Packit Service a8c26c
+++ b/src/cmd/ksh93/sh/fcin.c
Packit Service a8c26c
@@ -150,63 +150,19 @@ extern void fcrestore(Fcin_t *fp)
Packit Service a8c26c
 	_Fcin = *fp;
Packit Service a8c26c
 }
Packit Service a8c26c
 
Packit Service a8c26c
-/* for testing purposes with small buffers */
Packit Service a8c26c
-#if defined(IOBSIZE) && (IOBSIZE < 2*MB_LEN_MAX)
Packit Service a8c26c
-#   undef MB_LEN_MAX
Packit Service a8c26c
-#   define MB_LEN_MAX	(IOBSIZE/2)
Packit Service a8c26c
-#endif
Packit Service a8c26c
-
Packit Service a8c26c
-struct Extra
Packit Service a8c26c
-{
Packit Service a8c26c
-	unsigned char	buff[2*MB_LEN_MAX];
Packit Service a8c26c
-	unsigned char	*next;
Packit Service a8c26c
-};
Packit Service a8c26c
-
Packit Service a8c26c
 int _fcmbget(short *len)
Packit Service a8c26c
 {
Packit Service a8c26c
-	static struct Extra	extra;
Packit Service a8c26c
-	register int		i, c, n;
Packit Service a8c26c
-	if(_Fcin.fcleft)
Packit Service a8c26c
-	{
Packit Service a8c26c
-		if((c = mbsize(extra.next)) < 0)
Packit Service a8c26c
-			c = 1;
Packit Service a8c26c
-		if((_Fcin.fcleft -= c) <=0)
Packit Service a8c26c
-		{
Packit Service a8c26c
-			_Fcin.fcptr = (unsigned char*)fcfirst() - _Fcin.fcleft; 
Packit Service a8c26c
-			_Fcin.fcleft = 0;
Packit Service a8c26c
-		}
Packit Service a8c26c
-		*len = c;
Packit Service a8c26c
-		if(c==1)
Packit Service a8c26c
-			c = *extra.next++;
Packit Service a8c26c
-		else if(c==0)
Packit Service a8c26c
-			_Fcin.fcleft = 0;
Packit Service a8c26c
-		else
Packit Service a8c26c
-			c = mbchar(extra.next);
Packit Service a8c26c
-		return(c);
Packit Service a8c26c
-	}
Packit Service a8c26c
-	switch(*len = mbsize(_Fcin.fcptr))
Packit Service a8c26c
+	register int		c;
Packit Service a8c26c
+	switch (*len = mbsize(_Fcin.fcptr))
Packit Service a8c26c
 	{
Packit Service a8c26c
-	    case -1:
Packit Service a8c26c
-		if(_Fcin._fcfile && (n=(_Fcin.fclast-_Fcin.fcptr)) < MB_LEN_MAX)
Packit Service a8c26c
-		{
Packit Service a8c26c
-			memcpy(extra.buff, _Fcin.fcptr, n);
Packit Service a8c26c
-			_Fcin.fcptr = _Fcin.fclast;
Packit Service a8c26c
-			for(i=n; i < MB_LEN_MAX+n; i++)
Packit Service a8c26c
-			{
Packit Service a8c26c
-				if((extra.buff[i] = fcgetc(c))==0)
Packit Service a8c26c
-					break;
Packit Service a8c26c
-			}
Packit Service a8c26c
-			_Fcin.fcleft = n;
Packit Service a8c26c
-			extra.next = extra.buff;
Packit Service a8c26c
-			return(fcmbget(len));
Packit Service a8c26c
-		}
Packit Service a8c26c
+	case -1:
Packit Service a8c26c
 		*len = 1;
Packit Service a8c26c
 		/* fall through */
Packit Service a8c26c
-	    case 0:
Packit Service a8c26c
-	    case 1:
Packit Service a8c26c
+	case 0:
Packit Service a8c26c
+	case 1:
Packit Service a8c26c
 		c=fcget();
Packit Service a8c26c
 		break;
Packit Service a8c26c
-	    default:
Packit Service a8c26c
+	default:
Packit Service a8c26c
 		c = mbchar(_Fcin.fcptr);
Packit Service a8c26c
 	}
Packit Service a8c26c
 	return(c);