X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/162f2a7d23a18a87cad101f68ab27de057de533d..3ef341abe440ece07f8deed59fb026ab020e805:/sbr/fmt_scan.c

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 5240781b..9c1eb16a 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -5,6 +5,9 @@
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
+ *
+ * This is the engine that processes the format instructions created by
+ * fmt_compile (found in fmt_compile.c).
  */
 
 #include <h/mh.h>
@@ -152,7 +155,10 @@ cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) {
 		sp += char_len;
 #else
 	    end--;
-	    if (iscntrl(*sp) || isspace(*sp)) {
+            /* isnctrl(), etc., take an int argument.  Cygwin's ctype.h
+               intentionally warns if they are passed a char. */
+            int c = *sp;
+	    if (iscntrl(c) || isspace(c)) {
 		sp++;
 #endif
 		if (!prevCtrl) {
@@ -505,13 +511,13 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 			    ljust++;
 		    }
 
-		    if (!ljust && i > 0 && strlen(str) > i)
+		    if (!ljust && i > 0 && (int) strlen(str) > i)
 			    str[i] = '\0';
 		    xp = str;
 		    xp += strlen(str) - 1;
 		    while (xp > str && isspace(*xp))
 			    *xp-- = '\0';
-		    if (ljust && i > 0 && strlen(str) > i)
+		    if (ljust && i > 0 && (int) strlen(str) > i)
 			str += strlen(str) - i;
 	    }
 	    break;