ncurses-5.2-20010623.patch.gz

[Thomas Dickey]

just typos - I had two hours before I have to get ready to leave again...

# ncurses 5.2 - patch 20010623 - 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                       |    8 +++++++-
# dist.mk                    |    4 ++--
# include/ncurses_defs       |    5 ++---
# ncurses/base/lib_wunctrl.c |    6 +++---
# ncurses/tinfo/access.c     |    4 ++--
# test/view.c                |    8 ++++----
# 6 files changed, 20 insertions(+), 15 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq:  1.633 
--- ncurses-5.2-20010618+/NEWS  Mon Jun 18 14:46:07 2001
+++ ncurses-5.2-20010623/NEWS   Sat Jun 23 19:26:37 2001
@@ -1,4 +1,4 @@
--- $Id: NEWS,v 1.633 2001/06/18 18:46:07 tom Exp $
+-- $Id: NEWS,v 1.634 2001/06/23 23:26:37 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.
@@ -6,6 +6,11 @@
 Changes through 1.9.9e are recorded by Zeyd M. Ben-Halim.
 Changes since 1.9.9e are recorded by Thomas Dickey.
 
+20010623
+       + correct an overlooked CharOf/UChar instance (reports by Eugene Lee
+         <address@hidden>, Sven Verdoolaege).
+       + correct unneeded ifdef for wunctrl() (reported by Sven Verdoolaege)
+
 20010618
        + change overlooked several CharOf/UChar instances.
        > several patches from Sven Verdoolaege:
@@ -292,7 +297,7 @@
          termcap.h, which matches X/Open.
        > patch by Juergen Pfeifer:
        + a revised version of the Ada enhancements sent in by "H.
-         Nanosecond", aka Eugene V.  Melaragno <address@hidden>.  This
+         Nanosecond", aka Eugene V Melaragno <address@hidden>.  This
          patch includes
          - small fixes to the existing ncurses binding
          - addition of some more low-level functions to the binding, including
Index: dist.mk
Prereq:  1.254 
--- ncurses-5.2-20010618+/dist.mk       Mon Jun 18 14:11:02 2001
+++ ncurses-5.2-20010623/dist.mk        Sat Jun 23 18:10:43 2001
@@ -1,4 +1,4 @@
-# $Id: dist.mk,v 1.254 2001/06/18 18:11:02 tom Exp $
+# $Id: dist.mk,v 1.255 2001/06/23 22:10:43 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 = 20010618
+NCURSES_PATCH = 20010623
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: include/ncurses_defs
Prereq:  1.8 
--- ncurses-5.2-20010618+/include/ncurses_defs  Sat Jun  9 20:45:48 2001
+++ ncurses-5.2-20010623/include/ncurses_defs   Sat Jun 23 19:30:22 2001
@@ -1,6 +1,6 @@
-# $Id: ncurses_defs,v 1.8 2001/06/10 00:45:48 tom Exp $
+# $Id: ncurses_defs,v 1.9 2001/06/23 23:30:22 tom Exp $
 ##############################################################################
-# Copyright (c) 2000 Free Software Foundation, Inc.                          #
+# Copyright (c) 2000,2001 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 "Software"), #
@@ -42,7 +42,6 @@
 GCC_NORETURN   /* nothing */
 GCC_UNUSED     /* nothing */
 HAVE_BIG_CORE
-HAVE_BOTWC
 HAVE_BSD_CGETENT
 HAVE_BUILTIN_H
 HAVE_DIRENT_H
Index: ncurses/base/lib_wunctrl.c
Prereq:  1.3 
--- ncurses-5.2-20010618+/ncurses/base/lib_wunctrl.c    Mon Jun 18 14:39:30 2001
+++ ncurses-5.2-20010623/ncurses/base/lib_wunctrl.c     Sat Jun 23 19:34:36 2001
@@ -35,9 +35,9 @@
 
 #include <curses.priv.h>
 
-#if USE_WIDEC_SUPPORT && HAVE_BOTWC
+#if USE_WIDEC_SUPPORT
 
-MODULE_ID("$Id: lib_wunctrl.c,v 1.3 2001/06/18 18:39:30 skimo Exp $")
+MODULE_ID("$Id: lib_wunctrl.c,v 1.5 2001/06/23 23:34:36 tom Exp $")
 
 NCURSES_EXPORT(wchar_t *)
 wunctrl(cchar_t * wc)
@@ -50,7 +50,7 @@
            *sp++ = btowc(*p++);
        return str;
     } else
-       return wc.chars;
+       return wc->chars;
 }
 
 #endif
Index: ncurses/tinfo/access.c
Prereq:  1.8 
--- ncurses-5.2-20010618+/ncurses/tinfo/access.c        Sat Jun 16 07:25:51 2001
+++ ncurses-5.2-20010623/ncurses/tinfo/access.c Sat Jun 23 18:11:49 2001
@@ -34,9 +34,9 @@
 #include <tic.h>
 #include <nc_alloc.h>
 
-MODULE_ID("$Id: access.c,v 1.8 2001/06/16 11:25:51 tom Exp $")
+MODULE_ID("$Id: access.c,v 1.9 2001/06/23 22:11:49 tom Exp $")
 
-#define LOWERCASE(c) ((isalpha(CharOf(c)) && isupper(CharOf(c))) ? 
tolower(CharOf(c)) : (c))
+#define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? 
tolower(UChar(c)) : (c))
 
 NCURSES_EXPORT(char *)
 _nc_rootname(char *path)
Index: test/view.c
Prereq:  1.36 
--- ncurses-5.2-20010618+/test/view.c   Mon Jun 18 14:29:38 2001
+++ ncurses-5.2-20010623/test/view.c    Sat Jun 23 19:49:10 2001
@@ -23,7 +23,7 @@
  * scroll operation worked, and the refresh() code only had to do a
  * partial repaint.
  *
- * $Id: view.c,v 1.36 2001/06/18 18:29:38 skimo Exp $
+ * $Id: view.c,v 1.38 2001/06/23 23:49:10 tom Exp $
  */
 
 #include <test.priv.h>
@@ -139,7 +139,7 @@
     for (j = k = 0; j < len; j++) {
 #if USE_WIDEC_SUPPORT
        rc = mbrtowc(&wch, src + j, len - j, &state);
-       if (rc == -1 || rc == -2)
+       if (rc == (size_t)-1 || rc == (size_t)-2)
            break;
        j += rc - 1;
        if ((width = wcwidth(wch)) < 0)
@@ -252,11 +252,11 @@
 #if USE_WIDEC_SUPPORT
                col++, d++;
 #else
-           if (isprint(CharOf(*d))) {
+           if (isprint(UChar(*d))) {
                col++;
                d++;
            } else {
-               sprintf(d, "\\%03o", CharOf(*s));
+               sprintf(d, "\\%03o", UChar(*s));
                d += strlen(d);
                col = (d - temp);
            }

-- 
Thomas E. Dickey <address@hidden>
http://dickey.his.com
ftp://dickey.his.com