ncurses-5.2-20010603.patch.gz

[Thomas Dickey]

# ncurses 5.2 - patch 20010603 - T.Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 5.2 is at
#       ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 5.2 are in the subdirectory
#       ftp://dickey.his.com/ncurses/5.2
#
# ------------------------------------------------------------------------------
# NEWS                      |    5 +++++
# dist.mk                   |    4 ++--
# ncurses/base/lib_addstr.c |   10 ++++------
# 3 files changed, 11 insertions(+), 8 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq:  1.629 
--- ncurses-5.2-20010602+/NEWS  Sat Jun  2 22:36:15 2001
+++ ncurses-5.2-20010603/NEWS   Sun Jun  3 20:40:31 2001
@@ -1,10 +1,14 @@
--- $Id: NEWS,v 1.629 2001/06/03 02:36:15 tom Exp $
+-- $Id: NEWS,v 1.630 2001/06/04 00:40:31 tom Exp $
 
 This is a log of changes that ncurses has gone through since Zeyd started
 working with Pavel Curtis' original work, pcurses, in 1992.
 
 Changes through 1.9.9e are recorded by Zeyd M. Ben-Halim.
 Changes since 1.9.9e are recorded by Thomas Dickey.
+
+20010603
+       + correct loop expression in NEXT_CHAR macro for lib_addstr.c changes
+         from 20010602 (report by Mike Castle).
 
 20010602
        + modify mvcur() to avoid emitting newline characters when nonl() mode
Index: dist.mk
Prereq:  1.250 
--- ncurses-5.2-20010602+/dist.mk       Sat Jun  2 13:41:38 2001
+++ ncurses-5.2-20010603/dist.mk        Sun Jun  3 20:41:33 2001
@@ -1,4 +1,4 @@
-# $Id: dist.mk,v 1.250 2001/06/02 17:41:38 tom Exp $
+# $Id: dist.mk,v 1.251 2001/06/04 00:41:33 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -10,7 +10,7 @@
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 2
-NCURSES_PATCH = 20010602
+NCURSES_PATCH = 20010603
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: ncurses/base/lib_addstr.c
Prereq:  1.21 
--- ncurses-5.2-20010602+/ncurses/base/lib_addstr.c     Sat Jun  2 23:03:02 2001
+++ ncurses-5.2-20010603/ncurses/base/lib_addstr.c      Sun Jun  3 20:41:07 2001
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_addstr.c,v 1.21 2001/06/03 03:03:02 tom Exp $")
+MODULE_ID("$Id: lib_addstr.c,v 1.22 2001/06/04 00:41:07 tom Exp $")
 
 #if USE_WIDEC_SUPPORT
 #define NEXT_CHAR(s,ch, n)                                             \
@@ -66,12 +66,11 @@
 #else
 #define NEXT_CHAR(s,ch, n)                                             \
     ch = *s++;                                                         \
-    ++n
+    --n
 #endif
 
 NCURSES_EXPORT(int)
-waddnstr
-(WINDOW *win, const char *const astr, int n)
+waddnstr(WINDOW *win, const char *const astr, int n)
 {
     unsigned const char *str = (unsigned const char *) astr;
     int code = ERR;
@@ -101,8 +100,7 @@
 }
 
 NCURSES_EXPORT(int)
-waddchnstr
-(WINDOW *win, const chtype * const astr, int n)
+waddchnstr(WINDOW *win, const chtype * const astr, int n)
 {
     NCURSES_SIZE_T y = win->_cury;
     NCURSES_SIZE_T x = win->_curx;