Don't use MB_CUR_MAX if we aren't compiled with multibyte support.

diff --git a/ChangeLog b/ChangeLog
index 33485f842228258dec8422826c166ba2c4ee7000..ed4759178ee1a7bcdcd2f065a0a49563ca2ff16f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-05-22  Peter Maydell  <pmaydell@chiark.greenend.org.uk>
 
 2008-05-22  Peter Maydell  <pmaydell@chiark.greenend.org.uk>
 

+       * uip/scansbr.c: don't use MB_CUR_MAX if we aren't compiled
+       with multibyte support.
+

        * uip/whatnowsbr.c: factor out common code for writing ls
        shell command, and make it do more sensible buffer length
        checks. Also avoid relying on the return value of sprintf(),
        * uip/whatnowsbr.c: factor out common code for writing ls
        shell command, and make it do more sensible buffer length
        checks. Also avoid relying on the return value of sprintf(),

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 1b6a0ed9ec9ffdfe34929eb4bb09216c3bb2abc8..6a9278bbd539895d2f636d2c8a16abba032c45cc 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -68,6 +68,11 @@ char *scanl = 0;                     /* text of most recent scanline    */
 int sc_width (void);                   /* from termsbr.c */
 static int mh_fputs(char *, FILE *);
 
 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,
 
 int
 scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,


@@ -98,7 +103,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
                width = MAXSCANL;
        }
        dat[3] = slwidth = width;
                width = MAXSCANL;
        }
        dat[3] = slwidth = width;

-       scanl = (char *) mh_xmalloc((size_t) MB_CUR_MAX * (slwidth + 2) );
+       scanl = (char *) mh_xmalloc((size_t) SCAN_CHARWIDTH * (slwidth + 2) );

        if (outnum)
            umask(~m_gmprot());
 
        if (outnum)
            umask(~m_gmprot());