X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c0591ef34ea123aa8c709bda122308256d2c84cd..ea7c3f6a1f777578447040c553ebc80dbc252f7d:/sbr/fmt_scan.c

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 8475d50e..c3d265a1 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -295,8 +295,10 @@ get_x400_comp (char *mbox, char *key, char *buffer, int buffer_len)
 struct format *
 fmt_scan (struct format *format, char *scanl, int width, int *dat)
 {
-    char *cp, *ep, *sp;
-    char *savestr, *str = NULL;
+    char *cp, *ep;
+    unsigned char *sp;
+    char *savestr;
+    unsigned char *str = NULL;
     char buffer[BUFSIZ], buffer2[BUFSIZ];
     int i, c, ljust, n;
     int value = 0;
@@ -359,11 +361,12 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 
 	case FT_NUM:
 	    n = snprintf(cp, ep - cp + 1, "%d", value);
-	    if (n >= 0)
+	    if (n >= 0) {
 		if (n >= ep - cp) {
 		    cp = ep;
 		} else
 		    cp += n;
+	    }
 	    break;
 	case FT_NUMF:
 	    cpnumber (&cp, value, fmt->f_width, fmt->f_fill, ep - cp);
@@ -492,7 +495,7 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 
 	case FT_LS_TRIM:
 	    if (str) {
-		    char *xp;
+		    unsigned char *xp;
 
 		    strncpy(buffer, str, sizeof(buffer));
 		    buffer[sizeof(buffer)-1] = '\0';
@@ -800,7 +803,8 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 	     * (e.g., "To: ")
 	     */
 	    {
-	    char *lp, *lastb;
+	    unsigned char *lp;
+	    char *lastb;
 	    int indent, wid, len;
 
 	    lp = str;