ncurses 6.0 - patch 20150912

[ncurses.git] / ncurses / base / lib_screen.c

diff --git a/ncurses/base/lib_screen.c b/ncurses/base/lib_screen.c
index c11df4bb6966a7abaa6841ea7e97fc0e1820de0e..484f36505063bbf0ad51844d16bee103ec674aa4 100644 (file)
--- a/ncurses/base/lib_screen.c
+++ b/ncurses/base/lib_screen.c
@@ -41,7 +41,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
 #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.78 2015/09/12 20:47:43 tom Exp $")

 
 #define MAX_SIZE 0x3fff                /* 16k is big enough for a window or pad */
 
 
 #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 = 0;
                    break;
                }

+               result = buffer;

            }
            ch = fgetc(fp);
            if (ch == EOF)
            }
            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);
     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;
        }
     }
            chars[append] = (wchar_t) value;
        }
     }


@@ -750,7 +751,6 @@ encode_cell(char *target, CARG_CH_T source, CARG_CH_T previous)
            break;
        }
     }
            break;
        }
     }

-    target += strlen(target);

 #endif
 }
 #endif
 #endif
 }
 #endif