+ remove incorrect free() from
20170617 changes (report by David Macek).
+ correct type for "U8" in user_caps.5; it is a number not boolean.
+ add a null-pointer check in safe_sprintf.c (report by Steven Noonan).
+ improve fix for Debian #882620 by reusing limit2 variable (report
Julien Cristau, Sven Cristau).
17 files changed:
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3080 2018/02/10 20:36:21 tom Exp $
+-- $Id: NEWS,v 1.3085 2018/02/17 21:27:10 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20180217
+ + remove incorrect free() from 20170617 changes (report by David Macek).
+ + correct type for "U8" in user_caps.5; it is a number not boolean.
+ + add a null-pointer check in safe_sprintf.c (report by Steven Noonan).
+ + improve fix for Debian #882620 by reusing limit2 variable (report
+ Julien Cristau, Sven Cristau).
+
20180210
+ modify misc/Makefile.in to install/uninstall explicit list in case
the build-directory happens to have no ".pc" files when an uninstall
20180210
+ modify misc/Makefile.in to install/uninstall explicit list in case
the build-directory happens to have no ".pc" files when an uninstall
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1210 2018/02/10 13:15:08 tom Exp $
+# $Id: dist.mk,v 1.1211 2018/02/11 20:16:59 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 1
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 1
-NCURSES_PATCH = 20180210
+NCURSES_PATCH = 20180217
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
.\" authorization. *
.\"***************************************************************************
.\"
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: user_caps.5,v 1.6 2018/02/03 22:38:17 tom Exp $
+.\" $Id: user_caps.5,v 1.7 2018/02/17 19:07:01 tom Exp $
.TH user_caps 5
.ie \n(.g .ds `` \(lq
.el .ds `` ``
.TH user_caps 5
.ie \n(.g .ds `` \(lq
.el .ds `` ``
to represent the standard eight ANSI colors, i.e., one bit per color.
.TP 3
U8
to represent the standard eight ANSI colors, i.e., one bit per color.
.TP 3
U8
asserts that ncurses must use Unicode values for line-drawing characters,
and that it should ignore the alternate character set capabilities
when the locale uses UTF-8 encoding.
asserts that ncurses must use Unicode values for line-drawing characters,
and that it should ignore the alternate character set capabilities
when the locale uses UTF-8 encoding.
#include <curses.priv.h>
#include <ctype.h>
#include <curses.priv.h>
#include <ctype.h>
-MODULE_ID("$Id: safe_sprintf.c,v 1.29 2018/02/10 17:52:19 tom Exp $")
+MODULE_ID("$Id: safe_sprintf.c,v 1.31 2018/02/17 21:19:41 tom Exp $")
-#if NCURSES_SP_FUNCS
- (void) sp;
-#endif
-
- if (fmt != 0) {
+ if (SP_PARM != 0 && fmt != 0) {
#if USE_SAFE_SPRINTF
va_list ap2;
int len;
#if USE_SAFE_SPRINTF
va_list ap2;
int len;
/****************************************************************************
/****************************************************************************
- * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2017,2018 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 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
#include <locale.h>
#endif
#include <locale.h>
#endif
-MODULE_ID("$Id: lib_setup.c,v 1.188 2017/07/01 18:24:50 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.189 2018/02/17 21:23:32 tom Exp $")
/****************************************************************************
*
/****************************************************************************
*
termp->Filedes = (short) Filedes;
termp->_termname = strdup(tname);
} else {
termp->Filedes = (short) Filedes;
termp->_termname = strdup(tname);
} else {
- _nc_free_termtype2(&TerminalType(termp));
- free(my_tcb);
ret_error0(errret ? *errret : TGETENT_ERR,
"Could not find any driver to handle this terminal.\n");
}
ret_error0(errret ? *errret : TGETENT_ERR,
"Could not find any driver to handle this terminal.\n");
}
/****************************************************************************
/****************************************************************************
- * Copyright (c) 1998-2015,2017 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2017,2018 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 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
#define TRACE_NUM(n) /* nothing */
#endif
#define TRACE_NUM(n) /* nothing */
#endif
-MODULE_ID("$Id: write_entry.c,v 1.101 2017/11/25 19:56:06 tom Exp $")
+MODULE_ID("$Id: write_entry.c,v 1.102 2018/02/11 20:24:28 Julien.Cristau Exp $")
static int total_written;
static int total_parts;
static int total_written;
static int total_parts;
- if (strlen(first_name) >= sizeof(filename) - (2 + LEAF_LEN)) {
+ if (strlen(first_name) >= limit2) {
_nc_warning("terminal name too long.");
saved = first_name[limit2];
first_name[limit2] = '\0';
_nc_warning("terminal name too long.");
saved = first_name[limit2];
first_name[limit2] = '\0';
-ncurses6 (6.1+20180210) unstable; urgency=low
+ncurses6 (6.1+20180217) unstable; urgency=low
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Feb 2018 08:15:08 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 11 Feb 2018 15:16:59 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
ncurses6 (5.9-20131005) unstable; urgency=low
-ncurses6 (6.1+20180210) unstable; urgency=low
+ncurses6 (6.1+20180217) unstable; urgency=low
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Feb 2018 08:15:08 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 11 Feb 2018 15:16:59 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
ncurses6 (5.9-20131005) unstable; urgency=low
-ncurses6 (6.1+20180210) unstable; urgency=low
+ncurses6 (6.1+20180217) unstable; urgency=low
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Feb 2018 08:15:08 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 11 Feb 2018 15:16:59 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
ncurses6 (5.9-20120608) unstable; urgency=low
--with-develop \
--with-extra-suffix=$(MY_ABI) \
--with-shared \
--with-develop \
--with-extra-suffix=$(MY_ABI) \
--with-shared \
- --with-terminfo-dirs=$(MYDATA):/usr/share/terminfo \
+ --with-terminfo-dirs=$(MYDATA):/lib/terminfo:/usr/share/terminfo \
--with-termlib \
--with-ticlib \
--with-trace \
--with-termlib \
--with-ticlib \
--with-trace \
-; $Id: mingw-ncurses.nsi,v 1.257 2018/02/10 13:15:08 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.258 2018/02/11 20:16:59 tom Exp $\r
\r
; TODO add examples\r
; TODO bump ABI to 6\r
\r
; TODO add examples\r
; TODO bump ABI to 6\r
!define VERSION_MAJOR "6"\r
!define VERSION_MINOR "1"\r
!define VERSION_YYYY "2018"\r
!define VERSION_MAJOR "6"\r
!define VERSION_MINOR "1"\r
!define VERSION_YYYY "2018"\r
-!define VERSION_MMDD "0210"\r
+!define VERSION_MMDD "0217"\r
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
\r
!define MY_ABI "5"\r
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
\r
!define MY_ABI "5"\r
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
/****************************************************************************
/****************************************************************************
- * Copyright (c) 2002-2016,2017 Free Software Foundation, Inc. *
+ * Copyright (c) 2002-2017,2018 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 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
* authorization. *
****************************************************************************/
/*
* authorization. *
****************************************************************************/
/*
- * $Id: demo_defkey.c,v 1.27 2017/04/09 23:57:56 tom Exp $
+ * $Id: demo_defkey.c,v 1.28 2018/02/12 09:57:31 tom Exp $
*
* Demonstrate the define_key() function.
* Thomas Dickey - 2002/11/23
*
* Demonstrate the define_key() function.
* Thomas Dickey - 2002/11/23
const char *prefix = 0;
char temp[BUFSIZ];
const char *prefix = 0;
char temp[BUFSIZ];
- if (!strncmp(value, "\033[", (size_t) 2)) {
+ if (!(strncmp) (value, "\033[", (size_t) 2)) {
- } else if (!strncmp(value, "\033O", (size_t) 2)) {
+ } else if (!(strncmp) (value, "\033O", (size_t) 2)) {
prefix = "\033[";
}
if (prefix != 0) {
prefix = "\033[";
}
if (prefix != 0) {
/****************************************************************************
/****************************************************************************
- * Copyright (c) 2016,2017 Free Software Foundation, Inc. *
+ * Copyright (c) 2016-2017,2018 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 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
* authorization. *
****************************************************************************/
/*
* authorization. *
****************************************************************************/
/*
- * $Id: list_keys.c,v 1.22 2017/08/12 17:28:23 tom Exp $
+ * $Id: list_keys.c,v 1.23 2018/02/12 09:57:31 tom Exp $
*
* Author: Thomas E Dickey
*
*
* Author: Thomas E Dickey
*
Type(j) = ktOther;
if (sscanf(strnames[j], "kf%d", &k) == 1) {
Type(j) = ktFunction;
Type(j) = ktOther;
if (sscanf(strnames[j], "kf%d", &k) == 1) {
Type(j) = ktFunction;
- } else if (!strncmp(strnames[j], "kcu", 3)) {
+ } else if (!(strncmp) (strnames[j], "kcu", 3)) {
Type(j) = ktCursor;
}
Name(j) = strnames[j];
Type(j) = ktCursor;
}
Name(j) = strnames[j];
* authorization. *
****************************************************************************/
/*
* authorization. *
****************************************************************************/
/*
- * $Id: picsmap.c,v 1.116 2018/01/16 09:14:52 tom Exp $
+ * $Id: picsmap.c,v 1.117 2018/02/12 09:57:31 tom Exp $
*
* Author: Thomas E. Dickey
*
*
* Author: Thomas E. Dickey
*
if (*t == '-') {
if (sscanf(t, "-%d%c", &num, &chr) == 2 &&
chr == 'c' &&
if (*t == '-') {
if (sscanf(t, "-%d%c", &num, &chr) == 2 &&
chr == 'c' &&
- !strncmp(strchr(t, chr), "color", 5)) {
+ !(strncmp) (strchr(t, chr), "color", 5)) {
++t;
}
if (found && (t != s)
++t;
}
if (found && (t != s)
- && strncmp(s, "xterm", (size_t) (t - s))) {
+ && (strncmp) (s, "xterm", (size_t) (t - s))) {
sprintf(s, "xterm%s", filename + (t - s));
} else {
continue;
sprintf(s, "xterm%s", filename + (t - s));
} else {
continue;
/* should not happen... */
continue;
}
/* should not happen... */
continue;
}
- if (!strncmp(cs, list[c], (size_t) cpp)) {
+ if (!(strncmp) (cs, list[c], (size_t) cpp)) {
result->cells[which].ch = list[c][0];
result->cells[which].fg = c;
result->fgcol[c].count++;
result->cells[which].ch = list[c][0];
result->cells[which].fg = c;
result->fgcol[c].count++;
size_t n = strlen(filename);
debugmsg2("...read %s", buffer);
if (strlen(buffer) > n &&
size_t n = strlen(filename);
debugmsg2("...read %s", buffer);
if (strlen(buffer) > n &&
- !strncmp(buffer, filename, n) &&
+ !(strncmp) (buffer, filename, n) &&
isspace(UChar(buffer[n])) &&
sscanf(skip_word(buffer + n), " %dx%d ", &pic_x, &pic_y) == 2) {
/* distort image to make it show normally on terminal */
isspace(UChar(buffer[n])) &&
sscanf(skip_word(buffer + n), " %dx%d ", &pic_x, &pic_y) == 2) {
/* distort image to make it show normally on terminal */