X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fscansbr.c;h=3d66bcf5bc9c4bb84262decaf47d72dc403bc71e;hb=49856d905bfbaf3025967cbfe7631440978bccc8;hp=0d12c3444d84c90328cb7e337e7be8caabc5196b;hpb=fd83882889b45c597fd051705147e8bc0ba0890d;p=mmh

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 0d12c34..3d66bcf 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -19,13 +19,6 @@
 # define _cnt _w                /* Wretch */
 #endif
 
-#ifdef SCO_5_STDIO
-# define _ptr  __ptr
-# define _cnt  __cnt
-# define _base __base
-# define _filbuf(fp)  ((fp)->__cnt = 0, __filbuf(fp))
-#endif
-
 #define MAXSCANL 256		/* longest possible scan line */
 
 /*
@@ -63,7 +56,6 @@ char *scanl = 0;			/* text of most recent scanline    */
 /*
  * prototypes
  */
-int sc_width (void);			/* from termsbr.c */
 static int mh_fputs(char *, FILE *);
 
 #ifdef MULTIBYTE_SUPPORT
@@ -215,6 +207,15 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 
 	    case BODY: 
 		compnum = -1;
+		/*
+		 * A slight hack ... if we have less than rlwidth characters
+		 * in the buffer, call m_getfld again.
+		 */
+
+		if ((i = strlen(tmpbuf)) < rlwidth) {
+		    state = m_getfld (state, name, tmpbuf + i,
+		    		      rlwidth - i, inb);
+		}
 		if (! outnum) {
 		    state = FILEEOF; /* stop now if scan cmd */
 		    goto finished;
@@ -360,19 +361,6 @@ finished:
 }
 
 
-/*
- * Cheat:  we are loaded with adrparse, which wants a routine called
- * OfficialName().  We call adrparse:getm() with the correct arguments
- * to prevent OfficialName() from being called.  Hence, the following
- * is to keep the loader happy.
- */
-char *
-OfficialName (char *name)
-{
-    return name;
-}
-
-
 static int
 mh_fputs(char *s, FILE *stream)
 {