X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=sbr%2Ffmt_scan.c;h=89023cbcee9adac862adf8cee67a96c4b52dfe6b;hb=5aab34095ffbff27be09091e703e61ddf352ad87;hp=de20013c6a353bd5948d0b01fb68e0886979d48b;hpb=13ae9ba066e6b8c114daa6714895a56816465f49;p=mmh

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index de20013..89023cb 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -33,7 +33,8 @@ struct msgs *fmt_current_folder; /* current folder (set by main program) */
 #endif
 
 extern int fmt_norm;		/* defined in sbr/fmt_def.c = AD_NAME */
-struct mailname fmt_mnull;
+struct mailname fmt_mnull = { NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,
+			      NULL, NULL };
 
 /*
  * static prototypes
@@ -155,7 +156,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) {