X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=ncurses%2Fbase%2Flib_screen.c;h=a35ad175b8a2248ee16c78a536768cda7bae32a8;hb=c72b2c2c48ade76b5b4090b0f54b619a4fd483d9;hp=c11df4bb6966a7abaa6841ea7e97fc0e1820de0e;hpb=0819b56c3096ed77dd36312b0c4e8f37e7d46c88;p=ncurses.git

diff --git a/ncurses/base/lib_screen.c b/ncurses/base/lib_screen.c
index c11df4bb..a35ad175 100644
--- a/ncurses/base/lib_screen.c
+++ b/ncurses/base/lib_screen.c
@@ -41,7 +41,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_screen.c,v 1.75 2015/04/18 21:58:03 tom Exp $")
+MODULE_ID("$Id: lib_screen.c,v 1.79 2015/12/20 01:22:59 tom Exp $")
 
 #define MAX_SIZE 0x3fff		/* 16k is big enough for a window or pad */
 
@@ -179,6 +179,7 @@ read_txt(FILE *fp)
 		    result = 0;
 		    break;
 		}
+		result = buffer;
 	    }
 	    ch = fgetc(fp);
 	    if (ch == EOF)
@@ -351,7 +352,7 @@ decode_cchar(char *source, cchar_t *fillin, cchar_t *target)
     while (source[0] == MARKER && source[1] == APPEND) {
 	source += 2;
 	source = decode_char(source, &value);
-	if (append++ < CCHARW_MAX) {
+	if (++append < CCHARW_MAX) {
 	    chars[append] = (wchar_t) value;
 	}
     }
@@ -587,7 +588,7 @@ NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep)
 	}
 #if NCURSES_EXT_PUTWIN
 	else {
-	    char *txt;
+	    char *txt = 0;
 	    bool success = TRUE;
 	    NCURSES_CH_T prior = blank;
 
@@ -750,7 +751,6 @@ encode_cell(char *target, CARG_CH_T source, CARG_CH_T previous)
 	    break;
 	}
     }
-    target += strlen(target);
 #endif
 }
 #endif