psss / rpms / ksh

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