X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fscansbr.c;h=7eef85f97ecfa378b116cd27df52834cd2ca905c;hb=bd4fca3a8a15b35a04bdc333503c901d677c12eb;hp=ae347e85726080b66ec28e462d1fbdb16f32b71d;hpb=c2191f6961409263271aaeb0f9685e10492389a8;p=mmh

diff --git a/uip/scansbr.c b/uip/scansbr.c
index ae347e8..7eef85f 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -56,14 +56,9 @@ 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
 #define SCAN_CHARWIDTH MB_CUR_MAX
-#else
-#define SCAN_CHARWIDTH 1
-#endif
 
 int
 scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
@@ -208,6 +203,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;