X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;ds=sidebyside;f=ncurses%2Fbase%2Flib_screen.c;h=a03ceecef691b50836fb4cd0c7fa6924e32f7589;hb=6a530b46563470c2ca73579d1994a0c8e275dd98;hp=c11df4bb6966a7abaa6841ea7e97fc0e1820de0e;hpb=0819b56c3096ed77dd36312b0c4e8f37e7d46c88;p=ncurses.git diff --git a/ncurses/base/lib_screen.c b/ncurses/base/lib_screen.c index c11df4bb..a03ceece 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.77 2015/07/04 22:54:14 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; } }