ncurses 6.0 - patch 20160528

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

diff --git a/ncurses/base/lib_screen.c b/ncurses/base/lib_screen.c
index c11df4bb6966a7abaa6841ea7e97fc0e1820de0e..e5124a09d9a8d154459f8b7c7970e07cb6feec0f 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.83 2016/05/29 01:38:42 tom Exp $")
 
 #define MAX_SIZE 0x3fff                /* 16k is big enough for a window or pad */
 
@@ -161,12 +161,12 @@ static char *
 read_txt(FILE *fp)
 {
     size_t limit = 1024;
-    size_t used = 0;
     char *result = malloc(limit);
     char *buffer;
 
     if (result != 0) {
        int ch = 0;
+       size_t used = 0;
 
        clearerr(fp);
        result[used] = '\0';
@@ -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;
        }
     }
@@ -364,9 +365,6 @@ static int
 read_win(WINDOW *win, FILE *fp)
 {
     int code = ERR;
-    char *txt;
-    char *name;
-    char *value;
     size_t n;
     int color;
 #if NCURSES_WIDECHAR
@@ -376,7 +374,10 @@ read_win(WINDOW *win, FILE *fp)
 
     memset(win, 0, sizeof(WINDOW));
     for (;;) {
-       txt = read_txt(fp);
+       char *name;
+       char *value;
+       char *txt = read_txt(fp);
+
        if (txt == 0)
            break;
        if (!strcmp(txt, "rows:")) {
@@ -434,10 +435,13 @@ read_row(char *source, NCURSES_CH_T * prior, NCURSES_CH_T * target, int length)
 {
     while (*source != '\0' && length > 0) {
 #if NCURSES_WIDECHAR
-       int n, len;
+       int len;
+
        source = decode_cchar(source, prior, target);
        len = wcwidth(target->chars[0]);
        if (len > 1) {
+           int n;
+
            SetWidecExt(CHDEREF(target), 0);
            for (n = 1; n < len; ++n) {
                target[n] = target[0];
@@ -489,7 +493,6 @@ NCURSES_EXPORT(WINDOW *)
 NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep)
 {
     WINDOW tmp, *nwin;
-    int n;
     bool old_format = FALSE;
 
     T((T_CALLED("getwin(%p)"), (void *) filep));
@@ -545,6 +548,7 @@ NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep)
      * made sense is probably gone.
      */
     if (nwin != 0) {
+       int n;
        size_t linesize = sizeof(NCURSES_CH_T) * (size_t) (tmp._maxx + 1);
 
        nwin->_curx = tmp._curx;
@@ -587,7 +591,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 +754,6 @@ encode_cell(char *target, CARG_CH_T source, CARG_CH_T previous)
            break;
        }
     }
-    target += strlen(target);
 #endif
 }
 #endif
@@ -759,7 +762,6 @@ NCURSES_EXPORT(int)
 putwin(WINDOW *win, FILE *filep)
 {
     int code = ERR;
-    int y;
 
     T((T_CALLED("putwin(%p,%p)"), (void *) win, (void *) filep));
 
@@ -768,6 +770,7 @@ putwin(WINDOW *win, FILE *filep)
        const char *version = curses_version();
        char buffer[1024];
        NCURSES_CH_T last_cell;
+       int y;
 
        memset(&last_cell, 0, sizeof(last_cell));
 
@@ -858,6 +861,7 @@ putwin(WINDOW *win, FILE *filep)
            }
            PUTS("\n");
        }
+       code = OK;
     }
 #else
     /*
@@ -868,6 +872,7 @@ putwin(WINDOW *win, FILE *filep)
      */
     if (win != 0) {
        size_t len = (size_t) (win->_maxx + 1);
+       int y;
 
        clearerr(filep);
        if (fwrite(win, sizeof(WINDOW), (size_t) 1, filep) != 1
@@ -940,7 +945,6 @@ scr_dump(const char *file)
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(scr_init) (NCURSES_SP_DCLx const char *file)
 {
-    FILE *fp = 0;
     int code = ERR;
 
     T((T_CALLED("scr_init(%p,%s)"), (void *) SP_PARM, _nc_visbuf(file)));
@@ -952,6 +956,8 @@ NCURSES_SP_NAME(scr_init) (NCURSES_SP_DCLx const char *file)
        !(exit_ca_mode && non_rev_rmcup)
 #endif
        ) {
+       FILE *fp = 0;
+
        if (_nc_access(file, R_OK) >= 0
            && (fp = fopen(file, "rb")) != 0) {
            delwin(CurScreen(SP_PARM));