Skip to content

Commit 9f47919

Browse files
committed
ncurses 6.2 - patch 20210619
+ improve configure-macro used for dependencies of --disable-leaks such as --with-valgrind + trim trailing blanks from files
1 parent a50b059 commit 9f47919

File tree

298 files changed

+13825
-13770
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

298 files changed

+13825
-13770
lines changed

AUTHORS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-------------------------------------------------------------------------------
2-
-- Copyright 2020 Thomas E. Dickey --
2+
-- Copyright 2020,2021 Thomas E. Dickey --
33
-- Copyright 2006,2017 Free Software Foundation, Inc. --
44
-- --
55
-- Permission is hereby granted, free of charge, to any person obtaining a --
@@ -26,13 +26,13 @@
2626
-- sale, use or other dealings in this Software without prior written --
2727
-- authorization. --
2828
-------------------------------------------------------------------------------
29-
-- $Id: AUTHORS,v 1.4 2020/02/02 23:34:34 tom Exp $
29+
-- $Id: AUTHORS,v 1.5 2021/06/17 21:20:30 tom Exp $
3030
-------------------------------------------------------------------------------
3131
These are the principal authors/contributors of ncurses since 1.9.9e,
3232
in decreasing order of their contribution:
3333

3434
TD Thomas E. Dickey
35-
JPF Juergen Pfeifer
35+
JPF Juergen Pfeifer
3636
ESR Eric S Raymond
3737
AVL Alexander V Lukyanov
3838
PB Philippe Blain

Ada95/README

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-------------------------------------------------------------------------------
2-
-- Copyright 2020 Thomas E. Dickey --
2+
-- Copyright 2020,2021 Thomas E. Dickey --
33
-- Copyright 1998-2002,2003 Free Software Foundation, Inc. --
44
-- --
55
-- Permission is hereby granted, free of charge, to any person obtaining a --
@@ -29,6 +29,6 @@
2929

3030
-- Author: Juergen Pfeifer, 1996
3131

32-
The documentation is provided in HTML format in the ./html
32+
The documentation is provided in HTML format in the ./html
3333
subdirectory. The main document is named index.html
3434

Ada95/TODO

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-------------------------------------------------------------------------------
2-
-- Copyright 2020 Thomas E. Dickey --
2+
-- Copyright 2020,2021 Thomas E. Dickey --
33
-- Copyright 1998-1999,2006 Free Software Foundation, Inc. --
44
-- --
55
-- Permission is hereby granted, free of charge, to any person obtaining a --
@@ -26,7 +26,7 @@
2626
-- sale, use or other dealings in this Software without prior written --
2727
-- authorization. --
2828
-------------------------------------------------------------------------------
29-
-- $Id: TODO,v 1.6 2020/02/02 23:34:34 tom Exp $
29+
-- $Id: TODO,v 1.7 2021/06/17 21:20:30 tom Exp $
3030
-------------------------------------------------------------------------------
3131

3232
-- Intensive testing
@@ -36,7 +36,7 @@
3636
Like most WEB pages: under continuous construction
3737

3838
-- Style cleanup
39-
39+
4040
-- Alternate functions for procedures with out params
4141
Comfort purpose
4242

Ada95/aclocal.m4

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dnl***************************************************************************
2929
dnl
3030
dnl Author: Thomas E. Dickey
3131
dnl
32-
dnl $Id: aclocal.m4,v 1.175 2021/05/19 23:35:25 tom Exp $
32+
dnl $Id: aclocal.m4,v 1.176 2021/06/19 23:44:07 tom Exp $
3333
dnl Macros used in NCURSES Ada95 auto-configuration script.
3434
dnl
3535
dnl These macros are maintained separately from NCURSES. The copyright on
@@ -827,7 +827,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then
827827
fi
828828
])
829829
dnl ---------------------------------------------------------------------------
830-
dnl CF_CONST_X_STRING version: 6 updated: 2021/01/01 13:31:04
830+
dnl CF_CONST_X_STRING version: 7 updated: 2021/06/07 17:39:17
831831
dnl -----------------
832832
dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
833833
dnl character-strings.
@@ -857,7 +857,7 @@ AC_TRY_COMPILE(
857857
#include <stdlib.h>
858858
#include <X11/Intrinsic.h>
859859
],
860-
[String foo = malloc(1); (void)foo],[
860+
[String foo = malloc(1); free((void*)foo)],[
861861
862862
AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
863863
AC_TRY_COMPILE(
@@ -887,7 +887,7 @@ esac
887887
])
888888
])dnl
889889
dnl ---------------------------------------------------------------------------
890-
dnl CF_CONST_X_STRING version: 6 updated: 2021/01/01 13:31:04
890+
dnl CF_CONST_X_STRING version: 7 updated: 2021/06/07 17:39:17
891891
dnl -----------------
892892
dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
893893
dnl character-strings.
@@ -917,7 +917,7 @@ AC_TRY_COMPILE(
917917
#include <stdlib.h>
918918
#include <X11/Intrinsic.h>
919919
],
920-
[String foo = malloc(1); (void)foo],[
920+
[String foo = malloc(1); free((void*)foo)],[
921921
922922
AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
923923
AC_TRY_COMPILE(

Ada95/configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15081,7 +15081,7 @@ cat >"conftest.$ac_ext" <<_ACEOF
1508115081
int
1508215082
main (void)
1508315083
{
15084-
String foo = malloc(1); (void)foo
15084+
String foo = malloc(1); free((void*)foo)
1508515085
;
1508615086
return 0;
1508715087
}

Ada95/include/ncurses_defs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# $Id: ncurses_defs,v 1.45 2020/02/02 23:34:34 tom Exp $
1+
# $Id: ncurses_defs,v 1.46 2021/06/17 21:20:30 tom Exp $
22
##############################################################################
3-
# Copyright 2020 Thomas E. Dickey #
3+
# Copyright 2020,2021 Thomas E. Dickey #
44
# Copyright 2008-2012,2013 Free Software Foundation, Inc. #
55
# #
66
# Permission is hereby granted, free of charge, to any person obtaining a #
@@ -44,7 +44,7 @@ GCC_UNUSED /* nothing */
4444
HAVE_BIG_CORE
4545
HAVE_BSD_CGETENT
4646
HAVE_BSD_SIGNAL_H
47-
HAVE_BTOWC
47+
HAVE_BTOWC
4848
HAVE_BUILTIN_H
4949
HAVE_CHGAT 1
5050
HAVE_COLOR_SET 1
@@ -101,7 +101,7 @@ HAVE_PANEL_H
101101
HAVE_POLL
102102
HAVE_POLL_H
103103
HAVE_PURIFY
104-
HAVE_PUTWC
104+
HAVE_PUTWC
105105
HAVE_PUTWIN 1
106106
HAVE_REGEXPR_H_FUNCS
107107
HAVE_REGEXP_H_FUNCS
@@ -156,7 +156,7 @@ HAVE_VSNPRINTF
156156
HAVE_VSSCANF
157157
HAVE_WCSRTOMBS
158158
HAVE_WCSTOMBS
159-
HAVE_WCTOB
159+
HAVE_WCTOB
160160
HAVE_WCTOMB
161161
HAVE_WCTYPE_H
162162
HAVE_WINSSTR 1

Ada95/make-tar.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
2-
# $Id: make-tar.sh,v 1.18 2020/02/02 23:34:34 tom Exp $
2+
# $Id: make-tar.sh,v 1.19 2021/06/17 21:26:02 tom Exp $
33
##############################################################################
4-
# Copyright 2019,2020 Thomas E. Dickey #
4+
# Copyright 2019-2020,2021 Thomas E. Dickey #
55
# Copyright 2010-2015,2017 Free Software Foundation, Inc. #
66
# #
77
# Permission is hereby granted, free of charge, to any person obtaining a #
@@ -128,10 +128,10 @@ cp -p $SOURCE/NEWS $BUILD/$ROOTNAME
128128

129129
# cleanup empty directories (an artifact of ncurses source archives)
130130

131-
touch $BUILD/$ROOTNAME/MANIFEST
131+
touch $BUILD/$ROOTNAME/MANIFEST
132132
( cd $BUILD/$ROOTNAME && find . -type f -print |$SOURCE/misc/csort >MANIFEST )
133133

134-
cd $BUILD || exit
134+
cd $BUILD || exit
135135

136136
# Remove build-artifacts.
137137
find . -name RCS -exec rm -rf {} \;

Ada95/package/debian/rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ install-stamp: build-stamp
7171
dh_installdirs
7272

7373
$(MAKE) install DESTDIR=$(TARGET_DIR)
74-
74+
7575
# FIXME: it would be nice to make these into separate packages
7676
( cd samples && $(MAKE) install.examples DESTDIR=$(TARGET_DIR) BINDIR=$(SAMPLE_DIR) )
7777
( cd doc && $(MAKE) install.html DESTDIR=$(TARGET_DIR) )

Ada95/samples/Makefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#
3030
# Author: Juergen Pfeifer, 1996
3131
#
32-
# $Id: Makefile.in,v 1.62 2021/01/23 20:42:08 tom Exp $
32+
# $Id: Makefile.in,v 1.63 2021/06/17 21:11:08 tom Exp $
3333
#
3434
.SUFFIXES:
3535

@@ -107,7 +107,7 @@ THISLIB = sample
107107
CARGS = -cargs $(ADAFLAGS)
108108
LARGS = -largs -L../lib -l@ADA_LIBNAME@ @TEST_ARG2@ $(LD_FLAGS) @TEST_LIBS2@
109109

110-
PROGS = tour$x ncurses$x @USE_GNAT_SIGINT@ rain$x
110+
PROGS = tour$x ncurses$x @USE_GNAT_SIGINT@ rain$x
111111

112112
all :: $(PROGS)
113113
@echo made $@

Ada95/samples/explain.txt

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -27,29 +27,29 @@ In a menu you can use the following Keys in the whole application:
2727
- Cursor Right Right one item
2828
- END Key Go to last item
2929
#FORMKEYS
30-
- CTRL-X eXit the form
30+
- CTRL-X eXit the form
3131
- CTRL-F Go forward to the next field
3232
- CTRL-B Go backward to the previous field
33-
- CTRL-L Go to the field left of the current one
33+
- CTRL-L Go to the field left of the current one
3434
- CTRL-R Go to the field right of the current one
35-
- CTRL-U Go to the field above the current one
36-
- CTRL-D Go to the field below the current one
35+
- CTRL-U Go to the field above the current one
36+
- CTRL-D Go to the field below the current one
3737

38-
- CTRL-W Go to the next word in the field
38+
- CTRL-W Go to the next word in the field
3939
- CTRL-T Go to the previous word in the field
4040

4141
- CTRL-A Go to the beginning of the field
4242
- CTRL-E Go to the end of the field
4343

4444
- CTRL-I Insert a blank character at the current position
4545
- CTRL-O Insert a line
46-
- CTRL-V Delete a character
47-
- CTRL-H Delete previous character
48-
- CTRL-Y Delete a line
49-
- CTRL-G Delete a word
50-
- CTRL-K Clear to end of field
46+
- CTRL-V Delete a character
47+
- CTRL-H Delete previous character
48+
- CTRL-Y Delete a line
49+
- CTRL-G Delete a word
50+
- CTRL-K Clear to end of field
5151

52-
- CTRL-N Next choice in a choice field (Enumerations etc.)
52+
- CTRL-N Next choice in a choice field (Enumerations etc.)
5353
- CTRL-P Previous choice in a choice field.
5454
#HELP
5555
#HELPKEYS
@@ -62,7 +62,7 @@ You may leave the help with the Function Key labeled 'Quit'.
6262
This is the main menu of the sample program for the ncurses Ada95
6363
binding. The main intention of the demo is not to demonstrate or
6464
test all the features of ncurses and it's subsystems, but to provide
65-
to you some sample code how to use the binding with Ada95.
65+
to you some sample code how to use the binding with Ada95.
6666

6767
You may select this options:
6868

@@ -71,7 +71,7 @@ You may select this options:
7171
* Look at some features of the form subsystem
7272
* Look at the output of the Ada.Text_IO like functions
7373
for ncurses.
74-
74+
7575
#MAINPAD
7676
You may press at any place in this demo CTRL-C. This will give you a command
7777
window. You can just type in the Label-String of a function key, then this
@@ -86,13 +86,13 @@ descriptions for the items, a marker and a padding character between
8686
the item name and the description.
8787
#MENU01
8888
This is a demo of the some of the menu layout options. One of them
89-
is the spacing functionality. Just press the Key labeled "Flip" to
89+
is the spacing functionality. Just press the Key labeled "Flip" to
9090
flip between the non-spaced and a spaced version of the menu. Please
91-
note that this functionality is unique for ncurses and is not found
92-
in the SVr4 menu implementation.
91+
note that this functionality is unique for ncurses and is not found
92+
in the SVr4 menu implementation.
9393

94-
This is a menu that sometimes does not fit into it's window and
95-
therefore it becomes a scroll menu.
94+
This is a menu that sometimes does not fit into it's window and
95+
therefore it becomes a scroll menu.
9696

9797
You can also see here very nicely the pattern matching functionality
9898
of menus. Type for example a 'J' and you will be positioned to the
@@ -106,7 +106,7 @@ labeled "4x1", "4x2" or "4x3" to get a menu with that many rows
106106
and columns.
107107

108108
With the Keys "O-Row" or "O-Col" (they occupy the same label and
109-
switch on selection) you can change the major order scheme for
109+
switch on selection) you can change the major order scheme for
110110
the menu. If "O-Col" is visible, the menu is currently major
111111
ordered by rows, you can switch to major column order by pressing
112112
the key. If "O-Row" is visible, it's just the reverse situation.
@@ -136,7 +136,7 @@ For more details press the Key labeled "Help".
136136
This is a demo of the forms package.
137137
#FORM-PAD00
138138
Please note that this demo is far from being complete. It really shows
139-
only a small part of the functionality of the forms package. Let's hope
139+
only a small part of the functionality of the forms package. Let's hope
140140
the next version will have a richer demo (You want to contribute ?).
141141
#NOTIMPL
142142
Sorry this functionality of the demo is not implemented at the moment.
@@ -148,7 +148,7 @@ This is a menu where you can select some different demos of the ncurses
148148
functionality.
149149
#CURSES-PAD00
150150
Please note that this demo is far from being complete. It really shows
151-
only a small part of the functionality of the curses package. Let's hope
151+
only a small part of the functionality of the curses package. Let's hope
152152
the next version will have a richer demo (You want to contribute ?).
153153
#MOUSEKEYS
154154
In this demo you may use this keys:
@@ -161,11 +161,11 @@ You may click the mouse buttons at any location at the screen and look
161161
at the protocol window !
162162
#MOUSE00
163163
A rather simple use of a mouse as demo. It's there just to test the
164-
code and to provide the sample source.
164+
code and to provide the sample source.
165165

166166
It might be of interest, that the output into the protocol window is
167167
done by the (n)curses Text_IO subpackages. Especially the output of
168-
the button and state names is done by Ads's enumeration IO, which
168+
the button and state names is done by Ads's enumeration IO, which
169169
allows you to print the names of enumeration literals. That's really
170170
nice.
171171
#MOUSE-PAD00

0 commit comments

Comments
 (0)