ncurses 5.9 - patch 20150103

+ modify_nc_flush() to retry if interrupted (patch by Stian Skjelstad).
+ change map files to make _nc_freeall a global, since it may be used
  via the Ada95 binding when checking for memory leaks.
+ improve sed script used in 20141220 to account for wide-, threaded-
  variations in ABI 6.
This commit is contained in:
Thomas E. Dickey 2015-01-04 01:53:54 +00:00
parent 1cfa1119f2
commit b8cca229aa
25 changed files with 628 additions and 543 deletions

View File

@ -1,4 +1,4 @@
Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.
Copyright (c) 1998-2014,2015 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
@ -25,4 +25,4 @@ sale, use or other dealings in this Software without prior written
authorization.
-- vile:txtmode fc=72
-- $Id: COPYING,v 1.2 2014/01/18 23:59:29 tom Exp $
-- $Id: COPYING,v 1.3 2015/01/03 20:12:01 tom Exp $

11
NEWS
View File

@ -1,5 +1,5 @@
-------------------------------------------------------------------------------
-- Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. --
-- Copyright (c) 1998-2014,2015 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 --
@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: NEWS,v 1.2322 2014/12/27 17:39:19 tom Exp $
-- $Id: NEWS,v 1.2327 2015/01/03 20:47:28 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@ -45,6 +45,13 @@ See the AUTHORS file for the corresponding full names.
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
20150103
+ modify_nc_flush() to retry if interrupted (patch by Stian Skjelstad).
+ change map files to make _nc_freeall a global, since it may be used
via the Ada95 binding when checking for memory leaks.
+ improve sed script used in 20141220 to account for wide-, threaded-
variations in ABI 6.
20141227
+ regenerate ".map" files, using step overlooked in 20141213 to use
the same patch-dates across each file to match ncurses.map (report by

View File

@ -1 +1 @@
5:0:9 5.9 20141227
5:0:9 5.9 20150103

8
aclocal.m4 vendored
View File

@ -1,5 +1,5 @@
dnl***************************************************************************
dnl Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. *
dnl Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. *
dnl *
dnl Permission is hereby granted, free of charge, to any person obtaining a *
dnl copy of this software and associated documentation files (the *
@ -28,7 +28,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
dnl $Id: aclocal.m4,v 1.725 2014/12/21 00:18:37 tom Exp $
dnl $Id: aclocal.m4,v 1.727 2015/01/03 20:48:02 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@ -3182,7 +3182,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
AC_SUBST(LIB_PREFIX)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_LIB_RULES version: 76 updated: 2014/12/20 19:16:08
dnl CF_LIB_RULES version: 77 updated: 2015/01/03 11:49:39
dnl ------------
dnl Append definitions and rules for the given models to the subdirectory
dnl Makefiles, and the recursion rule for the top-level Makefile. If the
@ -3241,7 +3241,7 @@ do
# Generated by CF_LIB_RULES
resulting.map: $UNALTERED_SYMS
sed -e "s/NCURSES_/NCURSES${cf_cv_abi_version}_/g" < $UNALTERED_SYMS >\[$]@
sed -e "s/NCURSES\\([[WT]]\\+\\)\?_/NCURSES\\1${cf_cv_abi_version}_/g" < $UNALTERED_SYMS >\[$]@
clean::
rm -f resulting.map

1022
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -28,14 +28,14 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
dnl $Id: configure.in,v 1.595 2014/12/21 17:25:38 tom Exp $
dnl $Id: configure.in,v 1.596 2015/01/03 20:44:55 tom Exp $
dnl Process this file with autoconf to produce a configure script.
dnl
dnl See http://invisible-island.net/autoconf/ for additional information.
dnl
dnl ---------------------------------------------------------------------------
AC_PREREQ(2.52.20030208)
AC_REVISION($Revision: 1.595 $)
AC_REVISION($Revision: 1.596 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@ -1550,6 +1550,7 @@ else
AC_FUNC_SETVBUF_REVERSED
fi
AC_CHECK_TYPE(intptr_t, long)
AC_CHECK_TYPE(ssize_t, int)
CF_TYPE_SIGACTION
CF_SIZECHANGE
CF_FUNC_MEMMOVE

View File

@ -1,5 +1,5 @@
##############################################################################
# Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. #
# Copyright (c) 1998-2014,2015 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"), #
@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# $Id: dist.mk,v 1.1022 2014/12/27 16:47:48 tom Exp $
# $Id: dist.mk,v 1.1024 2015/01/03 20:47:45 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@ -37,7 +37,7 @@ SHELL = /bin/sh
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 5
NCURSES_MINOR = 9
NCURSES_PATCH = 20141227
NCURSES_PATCH = 20150103
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

View File

@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. *
* Copyright (c) 1998-2013,2015 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 *
@ -51,7 +51,7 @@
#include <termcap.h> /* ospeed */
#include <tic.h>
MODULE_ID("$Id: lib_tputs.c,v 1.93 2013/01/12 20:57:32 tom Exp $")
MODULE_ID("$Id: lib_tputs.c,v 1.96 2015/01/03 23:51:23 tom Exp $")
NCURSES_EXPORT_VAR(char) PC = 0; /* used by termcap library */
NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0; /* used by termcap library */
@ -121,13 +121,26 @@ NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0)
{
if (SP_PARM != 0 && SP_PARM->_ofd >= 0) {
if (SP_PARM->out_inuse) {
char *buf = SP_PARM->out_buffer;
size_t amount = SP->out_inuse;
/*
* Help a little, if the write is interrupted, by first resetting
* our amount.
*/
ssize_t res;
SP->out_inuse = 0;
IGNORE_RC(write(SP_PARM->_ofd, SP_PARM->out_buffer, amount));
while (amount) {
res = write(SP_PARM->_ofd, buf, amount);
if (res > 0) {
/* if the write was incomplete, try again */
amount -= (size_t) res;
buf += res;
} else if (errno == EAGAIN) {
continue;
} else if (errno == EINTR) {
continue;
} else {
break; /* an error we can not recover from */
}
}
}
}
}

View File

@ -1,8 +1,8 @@
ncurses6 (5.9+20141227) unstable; urgency=low
ncurses6 (5.9+20150103) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 27 Dec 2014 11:47:48 -0500
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 03 Jan 2015 08:36:07 -0500
ncurses6 (5.9-20131005) unstable; urgency=low

View File

@ -1,6 +1,6 @@
This package is used for testing builds of ncurses.
Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.
Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.
Copyright © 2001 by Pradeep Padala
Permission is hereby granted, free of charge, to any person obtaining a
@ -81,7 +81,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
Copyright 1996-2013,2014 by Thomas E. Dickey
Copyright 1996-2014,2015 by Thomas E. Dickey
All Rights Reserved

View File

@ -1,8 +1,8 @@
ncurses6 (5.9+20141227) unstable; urgency=low
ncurses6 (5.9+20150103) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 27 Dec 2014 11:47:48 -0500
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 03 Jan 2015 08:36:07 -0500
ncurses6 (5.9-20131005) unstable; urgency=low

View File

@ -1,6 +1,6 @@
This package is used for testing builds of ncurses.
Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.
Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.
Copyright © 2001 by Pradeep Padala
Permission is hereby granted, free of charge, to any person obtaining a
@ -81,7 +81,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
Copyright 1996-2013,2014 by Thomas E. Dickey
Copyright 1996-2014,2015 by Thomas E. Dickey
All Rights Reserved

View File

@ -1,8 +1,8 @@
ncurses6 (5.9+20141227) unstable; urgency=low
ncurses6 (5.9+20150103) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 27 Dec 2014 11:47:48 -0500
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 03 Jan 2015 08:36:07 -0500
ncurses6 (5.9-20120608) unstable; urgency=low

View File

@ -1,6 +1,6 @@
This package is used for testing builds of ncurses.
Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.
Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.
Copyright © 2001 by Pradeep Padala
Permission is hereby granted, free of charge, to any person obtaining a
@ -81,7 +81,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
Copyright 1996-2013,2014 by Thomas E. Dickey
Copyright 1996-2014,2015 by Thomas E. Dickey
All Rights Reserved

View File

@ -1,4 +1,4 @@
; $Id: mingw-ncurses.nsi,v 1.77 2014/12/27 16:47:48 tom Exp $
; $Id: mingw-ncurses.nsi,v 1.78 2015/01/03 13:36:07 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@ -9,8 +9,8 @@
!define VERSION_MAJOR "5"
!define VERSION_MINOR "9"
!define VERSION_YYYY "2014"
!define VERSION_MMDD "1227"
!define VERSION_YYYY "2015"
!define VERSION_MMDD "0103"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"

View File

@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 5.9
Release: 20141227
Release: 20150103
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

View File

@ -1,8 +1,8 @@
# $Id: ncurses.map,v 1.26 2014/12/13 18:48:45 tom Exp $
# $Id: ncurses.map,v 1.28 2015/01/03 23:22:56 tom Exp $
# script for shared library symbol-versioning using ld
#
# This file was generated by ncu-mapsyms
# Configure options (merged 5 builds):
# Configure options (merged 7 builds):
# 'CFLAGS=-O'
# --disable-echo
# --disable-getcap
@ -19,6 +19,7 @@
# --enable-warnings
# --enable-wgetch-events
# --verbose
# --with-broken-linker
# --with-shared
# --with-termlib
# --with-ticlib
@ -466,7 +467,6 @@ NCURSES_5.0.19991023 {
_nc_background;
_nc_do_color;
_nc_expanded;
_nc_freeall;
_nc_freewin;
_nc_has_mouse;
_nc_hash_map;
@ -799,6 +799,7 @@ NCURSES_TINFO_5.0.19991023 {
_nc_free_entries;
_nc_free_termtype;
_nc_free_tparm;
_nc_freeall;
_nc_get_hash_table;
_nc_get_table;
_nc_get_tty_mode;

View File

@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 5.9
Release: 20141227
Release: 20150103
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

View File

@ -1,8 +1,8 @@
# $Id: ncurses.sym,v 1.15 2014/12/13 18:37:12 tom Exp $
# $Id: ncurses.sym,v 1.17 2015/01/03 23:05:24 tom Exp $
# script for shared library symbol-visibility using libtool
#
# This file was generated by ncu-mapsyms
# Configure options (merged 5 builds):
# Configure options (merged 7 builds):
# 'CFLAGS=-O'
# --disable-echo
# --disable-getcap
@ -19,6 +19,7 @@
# --enable-warnings
# --enable-wgetch-events
# --verbose
# --with-broken-linker
# --with-shared
# --with-termlib
# --with-ticlib
@ -78,6 +79,7 @@ _nc_free_termtype
_nc_free_tic
_nc_free_tinfo
_nc_free_tparm
_nc_freeall
_nc_get_alias_table
_nc_get_hash_table
_nc_get_locale

View File

@ -1,8 +1,8 @@
# $Id: ncursest.map,v 1.18 2014/12/27 17:31:30 tom Exp $
# $Id: ncursest.map,v 1.21 2015/01/03 23:22:56 tom Exp $
# script for shared library symbol-versioning using ld
#
# This file was generated by ncu-mapsyms
# Configure options (merged 7 builds):
# Configure options (merged 9 builds):
# 'CFLAGS=-O'
# --disable-echo
# --disable-getcap
@ -20,6 +20,7 @@
# --enable-warnings
# --enable-wgetch-events
# --verbose
# --with-broken-linker
# --with-pthread
# --with-shared
# --with-termlib
@ -111,6 +112,7 @@ NCURSES_TINFO_5.0.19991023 {
_nc_free_entries;
_nc_free_termtype;
_nc_free_tparm;
_nc_freeall;
_nc_get_hash_table;
_nc_get_table;
_nc_get_tty_mode;
@ -909,7 +911,6 @@ NCURSEST_5.7.20081102 {
_nc_do_color;
_nc_expanded;
_nc_fifo_dump;
_nc_freeall;
_nc_freewin;
_nc_has_mouse;
_nc_hash_map;

View File

@ -1,8 +1,8 @@
# $Id: ncursest.sym,v 1.14 2014/12/13 18:44:45 tom Exp $
# $Id: ncursest.sym,v 1.16 2015/01/03 23:17:01 tom Exp $
# script for shared library symbol-visibility using libtool
#
# This file was generated by ncu-mapsyms
# Configure options (merged 7 builds):
# Configure options (merged 9 builds):
# 'CFLAGS=-O'
# --disable-echo
# --disable-getcap
@ -20,6 +20,7 @@
# --enable-warnings
# --enable-wgetch-events
# --verbose
# --with-broken-linker
# --with-pthread
# --with-shared
# --with-termlib
@ -84,6 +85,7 @@ _nc_free_entries
_nc_free_termtype
_nc_free_tic
_nc_free_tinfo
_nc_freeall
_nc_get_alias_table
_nc_get_hash_table
_nc_get_locale

View File

@ -1,8 +1,8 @@
# $Id: ncursestw.map,v 1.19 2014/12/27 17:31:30 tom Exp $
# $Id: ncursestw.map,v 1.22 2015/01/03 23:22:57 tom Exp $
# script for shared library symbol-versioning using ld
#
# This file was generated by ncu-mapsyms
# Configure options (merged 7 builds):
# Configure options (merged 9 builds):
# 'CFLAGS=-O'
# --disable-echo
# --disable-getcap
@ -21,6 +21,7 @@
# --enable-wgetch-events
# --enable-widec
# --verbose
# --with-broken-linker
# --with-pthread
# --with-shared
# --with-termlib
@ -112,6 +113,7 @@ NCURSES_TINFO_5.0.19991023 {
_nc_free_entries;
_nc_free_termtype;
_nc_free_tparm;
_nc_freeall;
_nc_get_hash_table;
_nc_get_table;
_nc_get_tty_mode;
@ -1017,7 +1019,6 @@ NCURSESTW_5.7.20081102 {
_nc_do_color;
_nc_expanded;
_nc_fifo_dump;
_nc_freeall;
_nc_freewin;
_nc_has_mouse;
_nc_hash_map;

View File

@ -1,8 +1,8 @@
# $Id: ncursestw.sym,v 1.13 2014/12/13 18:48:44 tom Exp $
# $Id: ncursestw.sym,v 1.15 2015/01/03 23:22:56 tom Exp $
# script for shared library symbol-visibility using libtool
#
# This file was generated by ncu-mapsyms
# Configure options (merged 7 builds):
# Configure options (merged 9 builds):
# 'CFLAGS=-O'
# --disable-echo
# --disable-getcap
@ -21,6 +21,7 @@
# --enable-wgetch-events
# --enable-widec
# --verbose
# --with-broken-linker
# --with-pthread
# --with-shared
# --with-termlib
@ -85,6 +86,7 @@ _nc_free_entries
_nc_free_termtype
_nc_free_tic
_nc_free_tinfo
_nc_freeall
_nc_get_alias_table
_nc_get_hash_table
_nc_get_locale

View File

@ -1,8 +1,8 @@
# $Id: ncursesw.map,v 1.24 2014/12/27 17:31:31 tom Exp $
# $Id: ncursesw.map,v 1.27 2015/01/03 23:22:57 tom Exp $
# script for shared library symbol-versioning using ld
#
# This file was generated by ncu-mapsyms
# Configure options (merged 5 builds):
# Configure options (merged 7 builds):
# 'CFLAGS=-O'
# --disable-echo
# --disable-getcap
@ -20,6 +20,7 @@
# --enable-wgetch-events
# --enable-widec
# --verbose
# --with-broken-linker
# --with-shared
# --with-termlib
# --with-ticlib
@ -113,6 +114,7 @@ NCURSES_TINFO_5.0.19991023 {
_nc_free_entries;
_nc_free_termtype;
_nc_free_tparm;
_nc_freeall;
_nc_get_hash_table;
_nc_get_table;
_nc_get_tty_mode;
@ -869,7 +871,6 @@ NCURSESW_5.1.20000708 {
_nc_background;
_nc_do_color;
_nc_expanded;
_nc_freeall;
_nc_freewin;
_nc_has_mouse;
_nc_hash_map;

View File

@ -1,8 +1,8 @@
# $Id: ncursesw.sym,v 1.14 2014/12/13 18:41:11 tom Exp $
# $Id: ncursesw.sym,v 1.16 2015/01/03 23:11:10 tom Exp $
# script for shared library symbol-visibility using libtool
#
# This file was generated by ncu-mapsyms
# Configure options (merged 5 builds):
# Configure options (merged 7 builds):
# 'CFLAGS=-O'
# --disable-echo
# --disable-getcap
@ -20,6 +20,7 @@
# --enable-wgetch-events
# --enable-widec
# --verbose
# --with-broken-linker
# --with-shared
# --with-termlib
# --with-ticlib
@ -80,6 +81,7 @@ _nc_free_termtype
_nc_free_tic
_nc_free_tinfo
_nc_free_tparm
_nc_freeall
_nc_get_alias_table
_nc_get_hash_table
_nc_get_locale