ncurses 6.0 - patch 20160507

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

diff --git a/ncurses/base/lib_screen.c b/ncurses/base/lib_screen.c
index c11df4bb6966a7abaa6841ea7e97fc0e1820de0e..71d2173d3224ef70d620b786beeb7274ed3939cf 100644 (file)
--- a/ncurses/base/lib_screen.c
+++ b/ncurses/base/lib_screen.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2011,2015 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -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.80 2016/05/04 00:46:06 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
@@ -858,6 +858,7 @@ putwin(WINDOW *win, FILE *filep)
            }
            PUTS("\n");
        }
+       code = OK;
     }
 #else
     /*