mirror/ncursesw-morphos
2
0
Fork 0
mirror of https://github.com/Aigor44/ncursesw-morphos.git synced 2025-01-30 15:19:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

ncurses 5.9 - patch 20131214

Browse Source 
+ modify configure-script/ifdef's to allow OLD_TTY feature to be
  suppressed if the type of ospeed is configured using the option
  --with-ospeed to not be a short.  By default, it is a short for
  termcap-compatibility (adapted from suggestion by Christian
  Weisgerber).
+ correct a typo in _nc_baudrate() (patch by Christian Weisgerber,
  cf: 20061230).
+ fix a few -Wlogical-op warnings.
+ updated llib-l* files.
This commit is contained in:
Thomas E. Dickey 2013-12-15 02:33:31 +00:00
parent 02788b9c63
commit cc387b11f4
35 changed files with 3248 additions and 1165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
NEWS
View File

@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: NEWS,v 1.2145 2013/12/07 18:26:50 tom Exp $
-- $Id: NEWS,v 1.2149 2013/12/15 00:43:42 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@ -45,6 +45,17 @@ 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.
20131214
+ modify configure-script/ifdef's to allow OLD_TTY feature to be
suppressed if the type of ospeed is configured using the option
--with-ospeed to not be a short. By default, it is a short for
termcap-compatibility (adapted from suggestion by Christian
Weisgerber).
+ correct a typo in _nc_baudrate() (patch by Christian Weisgerber,
cf: 20061230).
+ fix a few -Wlogical-op warnings.
+ updated llib-l* files.
20131207
+ add form_driver_w() entrypoint to wide-character forms library, as
well as test program form_driver_w (adapted from patch by Gaute

48
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Revision: 1.576 .
# From configure.in Revision: 1.577 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20121002.
#
@ -21039,6 +21039,20 @@ echo "${as_me:-configure}:21033: testing moving _XOPEN_SOURCE_EXTENDED to work a
;;
esac
# AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this.
case "x$NCURSES_OSPEED" in #(vi
*short*) #(vi
cf_compatible=1
;;
*)
cf_compatible=0
;;
esac
cat >>confdefs.h <<EOF
#define NCURSES_OSPEED_COMPAT $cf_compatible
EOF
SUB_SCRIPTS=
ac_config_files="$ac_config_files include/MKterm.h.awk include/curses.head:include/curses.h.in include/ncurses_dll.h include/termcap.h include/unctrl.h $SUB_SCRIPTS $SUB_MAKEFILES Makefile"
@ -21122,7 +21136,7 @@ DEFS=-DHAVE_CONFIG_H
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
{ echo "$as_me:21125: creating $CONFIG_STATUS" >&5
{ echo "$as_me:21139: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
@ -21298,7 +21312,7 @@ cat >>$CONFIG_STATUS <<\EOF
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
{ { echo "$as_me:21301: error: ambiguous option: $1
{ { echo "$as_me:21315: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2;}
@ -21317,7 +21331,7 @@ Try \`$0 --help' for more information." >&2;}
ac_need_defaults=false;;
# This is an error.
-*) { { echo "$as_me:21320: error: unrecognized option: $1
-*) { { echo "$as_me:21334: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2;}
@ -21428,7 +21442,7 @@ do
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
*) { { echo "$as_me:21431: error: invalid argument: $ac_config_target" >&5
*) { { echo "$as_me:21445: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
@ -21862,7 +21876,7 @@ done; }
esac
if test x"$ac_file" != x-; then
{ echo "$as_me:21865: creating $ac_file" >&5
{ echo "$as_me:21879: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
@ -21880,7 +21894,7 @@ echo "$as_me: creating $ac_file" >&6;}
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
test -f "$f" || { { echo "$as_me:21883: error: cannot find input file: $f" >&5
test -f "$f" || { { echo "$as_me:21897: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@ -21893,7 +21907,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo $srcdir/$f
else
# /dev/null tree
{ { echo "$as_me:21896: error: cannot find input file: $f" >&5
{ { echo "$as_me:21910: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@ -21909,7 +21923,7 @@ cat >>$CONFIG_STATUS <<\EOF
if test -n "$ac_seen"; then
ac_used=`grep '@datarootdir@' $ac_item`
if test -z "$ac_used"; then
{ echo "$as_me:21912: WARNING: datarootdir was used implicitly but not set:
{ echo "$as_me:21926: WARNING: datarootdir was used implicitly but not set:
$ac_seen" >&5
echo "$as_me: WARNING: datarootdir was used implicitly but not set:
$ac_seen" >&2;}
@ -21918,7 +21932,7 @@ $ac_seen" >&2;}
fi
ac_seen=`grep '${datarootdir}' $ac_item`
if test -n "$ac_seen"; then
{ echo "$as_me:21921: WARNING: datarootdir was used explicitly but not set:
{ echo "$as_me:21935: WARNING: datarootdir was used explicitly but not set:
$ac_seen" >&5
echo "$as_me: WARNING: datarootdir was used explicitly but not set:
$ac_seen" >&2;}
@ -21955,7 +21969,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file`
if test -z "$ac_init"; then
ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
{ echo "$as_me:21958: WARNING: Variable $ac_name is used but was not set:
{ echo "$as_me:21972: WARNING: Variable $ac_name is used but was not set:
$ac_seen" >&5
echo "$as_me: WARNING: Variable $ac_name is used but was not set:
$ac_seen" >&2;}
@ -21966,7 +21980,7 @@ $ac_seen" >&2;}
egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
if test -s $tmp/out; then
ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
{ echo "$as_me:21969: WARNING: Some variables may not be substituted:
{ echo "$as_me:21983: WARNING: Some variables may not be substituted:
$ac_seen" >&5
echo "$as_me: WARNING: Some variables may not be substituted:
$ac_seen" >&2;}
@ -22015,7 +22029,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
* ) ac_file_in=$ac_file.in ;;
esac
test x"$ac_file" != x- && { echo "$as_me:22018: creating $ac_file" >&5
test x"$ac_file" != x- && { echo "$as_me:22032: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
@ -22026,7 +22040,7 @@ echo "$as_me: creating $ac_file" >&6;}
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
test -f "$f" || { { echo "$as_me:22029: error: cannot find input file: $f" >&5
test -f "$f" || { { echo "$as_me:22043: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@ -22039,7 +22053,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo $srcdir/$f
else
# /dev/null tree
{ { echo "$as_me:22042: error: cannot find input file: $f" >&5
{ { echo "$as_me:22056: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@ -22097,7 +22111,7 @@ cat >>$CONFIG_STATUS <<\EOF
rm -f $tmp/in
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
{ echo "$as_me:22100: $ac_file is unchanged" >&5
{ echo "$as_me:22114: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@ -22400,7 +22414,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
cygdll|msysdll|mingw) #(vi
test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6
echo "${as_me:-configure}:22403: testing overriding CXX_MODEL to SHARED ..." 1>&5
echo "${as_me:-configure}:22417: testing overriding CXX_MODEL to SHARED ..." 1>&5
with_shared_cxx=yes
;;

15
configure.in
View File

@ -28,14 +28,14 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
dnl $Id: configure.in,v 1.576 2013/11/16 23:22:48 tom Exp $
dnl $Id: configure.in,v 1.577 2013/12/15 00:03:02 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.576 $)
AC_REVISION($Revision: 1.577 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@ -1961,6 +1961,17 @@ solaris2*) #(vi
;;
esac
# AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this.
case "x$NCURSES_OSPEED" in #(vi
*short*) #(vi
cf_compatible=1
;;
*)
cf_compatible=0
;;
esac
AC_DEFINE_UNQUOTED(NCURSES_OSPEED_COMPAT,$cf_compatible,[Define to 1 if termcap variable ospeed is short])
SUB_SCRIPTS=
AC_OUTPUT( \

4
dist.mk
View File

@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# $Id: dist.mk,v 1.960 2013/12/07 15:21:58 tom Exp $
# $Id: dist.mk,v 1.961 2013/12/14 17:30:25 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 = 20131207
NCURSES_PATCH = 20131214
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

11
form/llib-lformtw
View File

@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2010 Free Software Foundation, Inc. *
* Copyright (c) 2010,2013 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 *
@ -27,7 +27,7 @@
****************************************************************************/
/****************************************************************************
* Author: Thomas E. Dickey 2010 *
* Author: Thomas E. Dickey 2010-on *
****************************************************************************/
/* LINTLIBRARY */
@ -494,6 +494,13 @@ int form_driver(
int c)
{ return(*(int *)0); }
#undef form_driver_w
int form_driver_w(
FORM *form,
int type,
wchar_t c)
{ return(*(int *)0); }
#undef set_field_buffer
int set_field_buffer(
FIELD *field,

11
form/llib-lformw
View File

@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2002-2005,2010 Free Software Foundation, Inc. *
* Copyright (c) 2002-2010,2013 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 *
@ -27,7 +27,7 @@
****************************************************************************/
/****************************************************************************
* Author: Thomas E. Dickey 2002-2005,2010 *
* Author: Thomas E. Dickey 2002-on *
****************************************************************************/
/* LINTLIBRARY */
@ -494,6 +494,13 @@ int form_driver(
int c)
{ return(*(int *)0); }
#undef form_driver_w
int form_driver_w(
FORM *form,
int type,
wchar_t c)
{ return(*(int *)0); }
#undef set_field_buffer
int set_field_buffer(
FIELD *field,

12
include/nc_string.h
View File

@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2012 Free Software Foundation, Inc. *
* Copyright (c) 2012,2013 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 *
@ -36,7 +36,7 @@
#include <ncurses_cfg.h>
/*
* $Id: nc_string.h,v 1.3 2012/02/23 10:21:17 tom Exp $
* $Id: nc_string.h,v 1.4 2013/12/15 01:09:19 tom Exp $
*
* String-hacks. Use these macros to stifle warnings on (presumably) correct
* uses of strcat, strcpy and sprintf.
@ -49,26 +49,26 @@
*/
#ifdef __cplusplus
#define NCURSES_VOID /* nothing */
#define NCURSES_VOID /* nothing */
#else
#define NCURSES_VOID (void)
#endif
#if USE_STRING_HACKS && HAVE_STRLCAT
#define _nc_STRCAT(d,s,n) NCURSES_VOID strlcat((d),(s),(n))
#define _nc_STRCAT(d,s,n) NCURSES_VOID strlcat((d),(s),NCURSES_CAST(size_t,n))
#else
#define _nc_STRCAT(d,s,n) NCURSES_VOID strcat((d),(s))
#endif
#if USE_STRING_HACKS && HAVE_STRLCPY
#define _nc_STRCPY(d,s,n) NCURSES_VOID strlcpy((d),(s),(n))
#define _nc_STRCPY(d,s,n) NCURSES_VOID strlcpy((d),(s),NCURSES_CAST(size_t,n))
#else
#define _nc_STRCPY(d,s,n) NCURSES_VOID strcpy((d),(s))
#endif
#if USE_STRING_HACKS && HAVE_SNPRINTF
#define _nc_SPRINTF NCURSES_VOID snprintf
#define _nc_SLIMIT(n) (n),
#define _nc_SLIMIT(n) NCURSES_CAST(size_t,n),
#else
#define _nc_SPRINTF NCURSES_VOID sprintf
#define _nc_SLIMIT(n) /* nothing */

3
include/ncurses_defs
View File

@ -1,4 +1,4 @@
# $Id: ncurses_defs,v 1.61 2013/07/06 20:31:28 tom Exp $
# $Id: ncurses_defs,v 1.62 2013/12/14 23:52:07 tom Exp $
##############################################################################
# Copyright (c) 2000-2012,2013 Free Software Foundation, Inc. #
# #
@ -186,6 +186,7 @@ NCURSES_EXPANDED
NCURSES_EXT_COLORS
NCURSES_EXT_FUNCS
NCURSES_NO_PADDING
NCURSES_OSPEED_COMPAT
NCURSES_PATHSEP ':'
NCURSES_WIDECHAR
NEED_PTEM_H

455
ncurses/llib-lncurses
View File

File diff suppressed because it is too large Load Diff

423
ncurses/llib-lncursest
View File

File diff suppressed because it is too large Load Diff

565
ncurses/llib-lncursestw
View File

File diff suppressed because it is too large Load Diff

567
ncurses/llib-lncursesw
View File

File diff suppressed because it is too large Load Diff

212
ncurses/llib-ltict Normal file
View File

@ -0,0 +1,212 @@
/****************************************************************************
* Copyright (c) 2013 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"), to deal in the Software without restriction, including *
* without limitation the rights to use, copy, modify, merge, publish, *
* distribute, distribute with modifications, sublicense, and/or sell *
* copies of the Software, and to permit persons to whom the Software is *
* furnished to do so, subject to the following conditions: *
* *
* The above copyright notice and this permission notice shall be included *
* in all copies or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
* IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
* THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
* *
* Except as contained in this notice, the name(s) of the above copyright *
* holders shall not be used in advertising or otherwise to promote the *
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************/
/****************************************************************************
* Author: Thomas E. Dickey 2013 *
****************************************************************************/
/* LINTLIBRARY */
/* ./tinfo/alloc_entry.c */
#include <curses.priv.h>
#include <tic.h>
#undef _nc_init_entry
void _nc_init_entry(
TERMTYPE *const tp)
{ /* void */ }
#undef _nc_copy_entry
ENTRY *_nc_copy_entry(
ENTRY *oldp)
{ return(*(ENTRY **)0); }
#undef _nc_save_str
char *_nc_save_str(
const char *const string)
{ return(*(char **)0); }
#undef _nc_wrap_entry
void _nc_wrap_entry(
ENTRY *const ep,
NCURSES_BOOL copy_strings)
{ /* void */ }
#undef _nc_merge_entry
void _nc_merge_entry(
TERMTYPE *const to,
TERMTYPE *const from)
{ /* void */ }
/* ./tinfo/captoinfo.c */
#include <ctype.h>
#undef _nc_captoinfo
char *_nc_captoinfo(
const char *cap,
const char *s,
int const parameterized)
{ return(*(char **)0); }
#undef _nc_infotocap
char *_nc_infotocap(
const char *cap,
const char *str,
int const parameterized)
{ return(*(char **)0); }
/* ./tinfo/comp_expand.c */
#undef _nc_tic_expand
char *_nc_tic_expand(
const char *srcp,
NCURSES_BOOL tic_format,
int numbers)
{ return(*(char **)0); }
/* ./tinfo/comp_parse.c */
#undef _nc_check_termtype2
void (*_nc_check_termtype2)(
TERMTYPE *p1,
NCURSES_BOOL p2);
#undef _nc_check_termtype
void (*_nc_check_termtype)(
TERMTYPE *p1);
#undef _nc_entry_match
NCURSES_BOOL _nc_entry_match(
char *n1,
char *n2)
{ return(*(NCURSES_BOOL *)0); }
#undef _nc_read_entry_source
void _nc_read_entry_source(
FILE *fp,
char *buf,
int literal,
NCURSES_BOOL silent,
NCURSES_BOOL (*hook)(
ENTRY *p1))
{ /* void */ }
#undef _nc_resolve_uses2
int _nc_resolve_uses2(
NCURSES_BOOL fullresolve,
NCURSES_BOOL literal)
{ return(*(int *)0); }
#undef _nc_resolve_uses
int _nc_resolve_uses(
NCURSES_BOOL fullresolve)
{ return(*(int *)0); }
/* ./tinfo/comp_scan.c */
#undef _nc_syntax
int _nc_syntax;
#undef _nc_strict_bsd
int _nc_strict_bsd;
#undef _nc_curr_file_pos
long _nc_curr_file_pos;
#undef _nc_comment_start
long _nc_comment_start;
#undef _nc_comment_end
long _nc_comment_end;
#undef _nc_start_line
long _nc_start_line;
#undef _nc_curr_token
struct token _nc_curr_token;
#undef _nc_disable_period
NCURSES_BOOL _nc_disable_period;
#undef _nc_reset_input
void _nc_reset_input(
FILE *fp,
char *buf)
{ /* void */ }
#undef _nc_get_token
int _nc_get_token(
NCURSES_BOOL silent)
{ return(*(int *)0); }
#undef _nc_trans_string
int _nc_trans_string(
char *ptr,
char *last)
{ return(*(int *)0); }
#undef _nc_push_token
void _nc_push_token(
int tokclass)
{ /* void */ }
#undef _nc_panic_mode
void _nc_panic_mode(
char ch)
{ /* void */ }
/* ./tinfo/parse_entry.c */
#undef _nc_parse_entry
int _nc_parse_entry(
struct entry *entryp,
int literal,
NCURSES_BOOL silent)
{ return(*(int *)0); }
#undef _nc_capcmp
int _nc_capcmp(
const char *s,
const char *t)
{ return(*(int *)0); }
typedef struct {
const char *from;
const char *to;
} assoc;
/* ./tinfo/write_entry.c */
#include <hashed_db.h>
#undef _nc_set_writedir
void _nc_set_writedir(
char *dir)
{ /* void */ }
#undef _nc_write_entry
void _nc_write_entry(
TERMTYPE *const tp)
{ /* void */ }
#undef _nc_tic_written
int _nc_tic_written(void)
{ return(*(int *)0); }

76
ncurses/llib-ltinfo
View File

@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2012 Free Software Foundation, Inc. *
* Copyright (c) 2012,2013 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 *
@ -289,6 +289,12 @@ int _nc_getenv_num(
const char *name)
{ return(*(int *)0); }
#undef _nc_setenv_num
void _nc_setenv_num(
const char *name,
int value)
{ /* void */ }
/* ./tinfo/home_terminfo.c */
#undef _nc_home_terminfo
@ -694,17 +700,17 @@ void use_env_sp(
NCURSES_BOOL f)
{ /* void */ }
#undef use_env
void use_env(
NCURSES_BOOL f)
{ /* void */ }
#undef use_tioctl_sp
void use_tioctl_sp(
SCREEN *sp,
NCURSES_BOOL f)
{ /* void */ }
#undef use_env
void use_env(
NCURSES_BOOL f)
{ /* void */ }
#undef use_tioctl
void use_tioctl(
NCURSES_BOOL f)
@ -891,7 +897,7 @@ int _nc_tparm_err;
int _nc_tparm_analyze(
const char *string,
char *p_is_s[9],
int *popcount)
int *_nc_popcount)
{ return(*(int *)0); }
#undef tparm
@ -951,12 +957,28 @@ int _nc_outch(
int ch)
{ return(*(int *)0); }
#undef _nc_putchar_sp
int _nc_putchar_sp(
SCREEN *sp,
int ch)
{ return(*(int *)0); }
#undef _nc_putchar
int _nc_putchar(
int ch)
{ return(*(int *)0); }
#undef putp_sp
int putp_sp(
SCREEN *sp,
const char *string)
{ return(*(int *)0); }
#undef putp
int putp(
const char *string)
{ return(*(int *)0); }
#undef _nc_putp_sp
int _nc_putp_sp(
SCREEN *sp,
@ -964,11 +986,6 @@ int _nc_putp_sp(
const char *string)
{ return(*(int *)0); }
#undef putp
int putp(
const char *string)
{ return(*(int *)0); }
#undef _nc_putp
int _nc_putp(
const char *name,
@ -1258,10 +1275,30 @@ char *const strnames[] = {0};
#undef strfnames
char *const strfnames[] = {0};
/* ./tinfo/obsolete.c */
#undef _nc_set_buffer_sp
void _nc_set_buffer_sp(
SCREEN *sp,
FILE *ofp,
int buffered)
{ /* void */ }
#undef _nc_set_buffer
void _nc_set_buffer(
FILE *ofp,
int buffered)
{ /* void */ }
/* ./tinfo/read_entry.c */
#include <hashed_db.h>
#undef _nc_init_termtype
void _nc_init_termtype(
TERMTYPE *const tp)
{ /* void */ }
#undef _nc_read_termtype
int _nc_read_termtype(
TERMTYPE *ptr,
@ -1290,21 +1327,6 @@ int _nc_read_entry(
void _nc_read_termcap(void)
{ /* void */ }
/* ./tinfo/setbuf.c */
#undef _nc_set_buffer_sp
void _nc_set_buffer_sp(
SCREEN *sp,
FILE *ofp,
int buffered)
{ /* void */ }
#undef _nc_set_buffer
void _nc_set_buffer(
FILE *ofp,
int buffered)
{ /* void */ }
/* ./tinfo/strings.c */
#undef _nc_str_init

1635
ncurses/llib-ltinfot Normal file
View File

File diff suppressed because it is too large Load Diff

76
ncurses/llib-ltinfotw
View File

@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2012 Free Software Foundation, Inc. *
* Copyright (c) 2012,2013 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 *
@ -294,6 +294,12 @@ int _nc_getenv_num(
const char *name)
{ return(*(int *)0); }
#undef _nc_setenv_num
void _nc_setenv_num(
const char *name,
int value)
{ /* void */ }
/* ./tinfo/home_terminfo.c */
#undef _nc_home_terminfo
@ -765,17 +771,17 @@ void use_env_sp(
NCURSES_BOOL f)
{ /* void */ }
#undef use_env
void use_env(
NCURSES_BOOL f)
{ /* void */ }
#undef use_tioctl_sp
void use_tioctl_sp(
SCREEN *sp,
NCURSES_BOOL f)
{ /* void */ }
#undef use_env
void use_env(
NCURSES_BOOL f)
{ /* void */ }
#undef use_tioctl
void use_tioctl(
NCURSES_BOOL f)
@ -962,7 +968,7 @@ int _nc_tparm_err;
int _nc_tparm_analyze(
const char *string,
char *p_is_s[9],
int *popcount)
int *_nc_popcount)
{ return(*(int *)0); }
#undef tparm
@ -1022,12 +1028,28 @@ int _nc_outch(
int ch)
{ return(*(int *)0); }
#undef _nc_putchar_sp
int _nc_putchar_sp(
SCREEN *sp,
int ch)
{ return(*(int *)0); }
#undef _nc_putchar
int _nc_putchar(
int ch)
{ return(*(int *)0); }
#undef putp_sp
int putp_sp(
SCREEN *sp,
const char *string)
{ return(*(int *)0); }
#undef putp
int putp(
const char *string)
{ return(*(int *)0); }
#undef _nc_putp_sp
int _nc_putp_sp(
SCREEN *sp,
@ -1035,11 +1057,6 @@ int _nc_putp_sp(
const char *string)
{ return(*(int *)0); }
#undef putp
int putp(
const char *string)
{ return(*(int *)0); }
#undef _nc_putp
int _nc_putp(
const char *name,
@ -1378,10 +1395,30 @@ char *const *_nc_strnames(void)
char *const *_nc_strfnames(void)
{ return(*(char **)0); }
/* ./tinfo/obsolete.c */
#undef _nc_set_buffer_sp
void _nc_set_buffer_sp(
SCREEN *sp,
FILE *ofp,
int buffered)
{ /* void */ }
#undef _nc_set_buffer
void _nc_set_buffer(
FILE *ofp,
int buffered)
{ /* void */ }
/* ./tinfo/read_entry.c */
#include <hashed_db.h>
#undef _nc_init_termtype
void _nc_init_termtype(
TERMTYPE *const tp)
{ /* void */ }
#undef _nc_read_termtype
int _nc_read_termtype(
TERMTYPE *ptr,
@ -1410,21 +1447,6 @@ int _nc_read_entry(
void _nc_read_termcap(void)
{ /* void */ }
/* ./tinfo/setbuf.c */
#undef _nc_set_buffer_sp
void _nc_set_buffer_sp(
SCREEN *sp,
FILE *ofp,
int buffered)
{ /* void */ }
#undef _nc_set_buffer
void _nc_set_buffer(
FILE *ofp,
int buffered)
{ /* void */ }
/* ./tinfo/strings.c */
#undef _nc_str_init

76
ncurses/llib-ltinfow
View File

@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2012 Free Software Foundation, Inc. *
* Copyright (c) 2012,2013 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 *
@ -289,6 +289,12 @@ int _nc_getenv_num(
const char *name)
{ return(*(int *)0); }
#undef _nc_setenv_num
void _nc_setenv_num(
const char *name,
int value)
{ /* void */ }
/* ./tinfo/home_terminfo.c */
#undef _nc_home_terminfo
@ -694,17 +700,17 @@ void use_env_sp(
NCURSES_BOOL f)
{ /* void */ }
#undef use_env
void use_env(
NCURSES_BOOL f)
{ /* void */ }
#undef use_tioctl_sp
void use_tioctl_sp(
SCREEN *sp,
NCURSES_BOOL f)
{ /* void */ }
#undef use_env
void use_env(
NCURSES_BOOL f)
{ /* void */ }
#undef use_tioctl
void use_tioctl(
NCURSES_BOOL f)
@ -891,7 +897,7 @@ int _nc_tparm_err;
int _nc_tparm_analyze(
const char *string,
char *p_is_s[9],
int *popcount)
int *_nc_popcount)
{ return(*(int *)0); }
#undef tparm
@ -951,12 +957,28 @@ int _nc_outch(
int ch)
{ return(*(int *)0); }
#undef _nc_putchar_sp
int _nc_putchar_sp(
SCREEN *sp,
int ch)
{ return(*(int *)0); }
#undef _nc_putchar
int _nc_putchar(
int ch)
{ return(*(int *)0); }
#undef putp_sp
int putp_sp(
SCREEN *sp,
const char *string)
{ return(*(int *)0); }
#undef putp
int putp(
const char *string)
{ return(*(int *)0); }
#undef _nc_putp_sp
int _nc_putp_sp(
SCREEN *sp,
@ -964,11 +986,6 @@ int _nc_putp_sp(
const char *string)
{ return(*(int *)0); }
#undef putp
int putp(
const char *string)
{ return(*(int *)0); }
#undef _nc_putp
int _nc_putp(
const char *name,
@ -1269,10 +1286,30 @@ char *const strnames[] = {0};
#undef strfnames
char *const strfnames[] = {0};
/* ./tinfo/obsolete.c */
#undef _nc_set_buffer_sp
void _nc_set_buffer_sp(
SCREEN *sp,
FILE *ofp,
int buffered)
{ /* void */ }
#undef _nc_set_buffer
void _nc_set_buffer(
FILE *ofp,
int buffered)
{ /* void */ }
/* ./tinfo/read_entry.c */
#include <hashed_db.h>
#undef _nc_init_termtype
void _nc_init_termtype(
TERMTYPE *const tp)
{ /* void */ }
#undef _nc_read_termtype
int _nc_read_termtype(
TERMTYPE *ptr,
@ -1301,21 +1338,6 @@ int _nc_read_entry(
void _nc_read_termcap(void)
{ /* void */ }
/* ./tinfo/setbuf.c */
#undef _nc_set_buffer_sp
void _nc_set_buffer_sp(
SCREEN *sp,
FILE *ofp,
int buffered)
{ /* void */ }
#undef _nc_set_buffer
void _nc_set_buffer(
FILE *ofp,
int buffered)
{ /* void */ }
/* ./tinfo/strings.c */
#undef _nc_str_init

12
ncurses/tinfo/db_iterator.c
View File

@ -43,7 +43,7 @@
#include <hashed_db.h>
#endif
MODULE_ID("$Id: db_iterator.c,v 1.37 2013/11/16 19:42:56 tom Exp $")
MODULE_ID("$Id: db_iterator.c,v 1.38 2013/12/14 21:23:20 tom Exp $")
#define HaveTicDirectory _nc_globals.have_tic_directory
#define KeepTicDirectory _nc_globals.keep_tic_directory
@ -185,10 +185,12 @@ _nc_tic_dir(const char *path)
if (path != 0) {
TicDirectory = path;
HaveTicDirectory = TRUE;
} else if (HaveTicDirectory == 0 && use_terminfo_vars()) {
char *envp;
if ((envp = getenv("TERMINFO")) != 0)
return _nc_tic_dir(envp);
} else if (HaveTicDirectory == 0) {
if (use_terminfo_vars()) {
char *envp;
if ((envp = getenv("TERMINFO")) != 0)
return _nc_tic_dir(envp);
}
}
}
return TicDirectory ? TicDirectory : TERMINFO;

6
ncurses/tinfo/hashed_db.c
View File

@ -36,7 +36,7 @@
#if USE_HASHED_DB
MODULE_ID("$Id: hashed_db.c,v 1.16 2013/02/16 21:50:03 tom Exp $")
MODULE_ID("$Id: hashed_db.c,v 1.17 2013/12/15 00:33:01 tom Exp $")
#if HASHED_DB_API >= 2
static DBC *cursor;
@ -286,7 +286,7 @@ NCURSES_EXPORT(bool)
_nc_db_have_index(DBT * key, DBT * data, char **buffer, int *size)
{
bool result = FALSE;
int used = data->size - 1;
int used = (int) data->size - 1;
char *have = (char *) data->data;
(void) key;
@ -309,7 +309,7 @@ NCURSES_EXPORT(bool)
_nc_db_have_data(DBT * key, DBT * data, char **buffer, int *size)
{
bool result = FALSE;
int used = data->size - 1;
int used = (int) data->size - 1;
char *have = (char *) data->data;
if (*have++ == 0) {

69
ncurses/tinfo/lib_baudrate.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
* Copyright (c) 1998-2010,2013 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 *
@ -49,7 +49,7 @@
* of the indices up to B115200 fit nicely in a 'short', allowing us to retain
* ospeed's type for compatibility.
*/
#if (defined(__FreeBSD__) && (__FreeBSD_version < 700000)) || defined(__NetBSD__) || defined(__OpenBSD__)
#if NCURSES_OSPEED_COMPAT && ((defined(__FreeBSD__) && (__FreeBSD_version < 700000)) || defined(__NetBSD__) || defined(__OpenBSD__))
#undef B0
#undef B50
#undef B75
@ -79,7 +79,7 @@
#undef USE_OLD_TTY
#endif /* USE_OLD_TTY */
MODULE_ID("$Id: lib_baudrate.c,v 1.31 2010/12/19 01:50:50 tom Exp $")
MODULE_ID("$Id: lib_baudrate.c,v 1.34 2013/12/15 01:29:02 tom Exp $")
/*
* int
@ -90,54 +90,55 @@ MODULE_ID("$Id: lib_baudrate.c,v 1.31 2010/12/19 01:50:50 tom Exp $")
*/
struct speed {
int s; /* value for 'ospeed' is an index */
NCURSES_OSPEED s; /* values for 'ospeed' */
int sp; /* the actual speed */
};
#define DATA(number) { B##number, number }
static struct speed const speeds[] =
{
{B0, 0},
{B50, 50},
{B75, 75},
{B110, 110},
{B134, 134},
{B150, 150},
{B200, 200},
{B300, 300},
{B600, 600},
{B1200, 1200},
{B1800, 1800},
{B2400, 2400},
{B4800, 4800},
{B9600, 9600},
DATA(0),
DATA(50),
DATA(75),
DATA(110),
DATA(134),
DATA(150),
DATA(200),
DATA(300),
DATA(600),
DATA(1200),
DATA(1800),
DATA(2400),
DATA(4800),
DATA(9600),
#ifdef B19200
{B19200, 19200},
#else
#ifdef EXTA
DATA(19200),
#elif defined(EXTA)
{EXTA, 19200},
#endif
#endif
#ifdef B38400
{B38400, 38400},
#else
#ifdef EXTB
DATA(38400),
#elif defined(EXTB)
{EXTB, 38400},
#endif
#endif
#ifdef B57600
{B57600, 57600},
DATA(57600),
#endif
/* ifdef to prevent overflow when OLD_TTY is not available */
#if !(NCURSES_OSPEED_COMPAT && defined(__FreeBSD__) && (__FreeBSD_version > 700000))
#ifdef B115200
{B115200, 115200},
DATA(115200),
#endif
#ifdef B230400
{B230400, 230400},
DATA(230400),
#endif
#ifdef B460800
{B460800, 460800},
DATA(460800),
#endif
#ifdef B921600
{B921600, 921600},
DATA(921600),
#endif
#endif
};
@ -167,7 +168,7 @@ _nc_baudrate(int OSpeed)
}
}
#if !USE_REENTRANT
if (OSpeed == last_OSpeed) {
if (OSpeed != last_OSpeed) {
last_OSpeed = OSpeed;
last_baudrate = result;
}
@ -219,8 +220,8 @@ NCURSES_SP_NAME(baudrate) (NCURSES_SP_DCL0)
if (IsValidTIScreen(SP_PARM)) {
#ifdef USE_OLD_TTY
result = cfgetospeed(&(TerminalOf(SP_PARM)->Nttyb));
ospeed = _nc_ospeed(result);
result = (int) cfgetospeed(&(TerminalOf(SP_PARM)->Nttyb));
ospeed = (NCURSES_OSPEED) _nc_ospeed(result);
#else /* !USE_OLD_TTY */
#ifdef TERMIOS
ospeed = (NCURSES_OSPEED) cfgetospeed(&(TerminalOf(SP_PARM)->Nttyb));

8
ncurses/tinfo/lib_options.c
View File

@ -46,7 +46,7 @@
#define CUR SP_TERMTYPE
#endif
MODULE_ID("$Id: lib_options.c,v 1.75 2013/11/16 19:25:39 tom Exp $")
MODULE_ID("$Id: lib_options.c,v 1.76 2013/12/14 22:23:58 tom Exp $")
NCURSES_EXPORT(int)
idlok(WINDOW *win, bool flag)
@ -56,7 +56,11 @@ idlok(WINDOW *win, bool flag)
if (win) {
SCREEN *sp = _nc_screen_of(win);
if (sp != 0 && IsTermInfo(sp)) {
if (sp != 0
#ifdef USE_TERM_DRIVER
&& IsTermInfo(sp)
#endif
) {
sp->_nc_sp_idlok =
win->_idlok = (flag && (NCURSES_SP_NAME(has_il) (NCURSES_SP_ARG)
|| change_scroll_region));

10
ncurses/tinfo/read_entry.c
View File

@ -41,7 +41,7 @@
#include <tic.h>
MODULE_ID("$Id: read_entry.c,v 1.125 2013/08/17 19:06:59 tom Exp $")
MODULE_ID("$Id: read_entry.c,v 1.126 2013/12/15 00:35:36 tom Exp $")
#define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
@ -434,9 +434,9 @@ make_db_filename(char *filename, unsigned limit, const char *const path)
{
static const char suffix[] = DBM_SUFFIX;
unsigned lens = sizeof(suffix) - 1;
unsigned size = strlen(path);
unsigned test = lens + size;
size_t lens = sizeof(suffix) - 1;
size_t size = strlen(path);
size_t test = lens + size;
bool result = FALSE;
if (test < limit) {
@ -520,7 +520,7 @@ _nc_read_tic_entry(char *filename,
* (source/binary) by checking the lengths.
*/
while (_nc_db_get(capdbp, &key, &data) == 0) {
int used = data.size - 1;
int used = (int) data.size - 1;
char *have = (char *) data.data;
if (*have++ == 0) {

6
ncurses/tinfo/read_termcap.c
View File

@ -56,7 +56,7 @@
#include <sys/types.h>
#include <tic.h>
MODULE_ID("$Id: read_termcap.c,v 1.88 2013/07/13 22:11:06 tom Exp $")
MODULE_ID("$Id: read_termcap.c,v 1.89 2013/12/15 00:32:43 tom Exp $")
#if !PURE_TERMINFO
@ -770,7 +770,7 @@ copy_tc_token(char *dst, const char *src, size_t len)
dst = 0;
break;
}
*dst++ = ch;
*dst++ = (char) ch;
}
return dst;
}
@ -887,7 +887,7 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name)
}
if (ignore != TRUE) {
list[count++] = tok;
pd = copy_tc_token(pd, tok, TBUFSIZ - (2 + pd - bp));
pd = copy_tc_token(pd, tok, (size_t) (TBUFSIZ - (2 + pd - bp)));
if (pd == 0) {
i = -1;
break;

7
ncurses/tinfo/write_entry.c
View File

@ -47,7 +47,7 @@
#define TRACE_OUT(p) /*nothing */
#endif
MODULE_ID("$Id: write_entry.c,v 1.90 2013/11/16 19:58:14 tom Exp $")
MODULE_ID("$Id: write_entry.c,v 1.91 2013/12/14 21:29:42 tom Exp $")
static int total_written;
@ -191,7 +191,10 @@ _nc_set_writedir(char *dir)
char actual[PATH_MAX];
if (dir == 0
&& use_terminfo_vars())
#ifndef USE_ROOT_ENVIRON
&& use_terminfo_vars()
#endif
)
dir = getenv("TERMINFO");
if (dir != 0)

4
package/debian-mingw/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (5.9-20131207) unstable; urgency=low
ncurses6 (5.9-20131214) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Dec 2013 10:21:58 -0500
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Dec 2013 12:30:25 -0500
ncurses6 (5.9-20131005) unstable; urgency=low

4
package/debian-mingw64/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (5.9-20131207) unstable; urgency=low
ncurses6 (5.9-20131214) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Dec 2013 10:21:58 -0500
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Dec 2013 12:30:25 -0500
ncurses6 (5.9-20131005) unstable; urgency=low

4
package/debian/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (5.9-20131207) unstable; urgency=low
ncurses6 (5.9-20131214) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Dec 2013 10:21:58 -0500
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Dec 2013 12:30:25 -0500
ncurses6 (5.9-20120608) unstable; urgency=low

4
package/mingw-ncurses.nsi
View File

@ -1,4 +1,4 @@
; $Id: mingw-ncurses.nsi,v 1.17 2013/12/07 15:21:58 tom Exp $
; $Id: mingw-ncurses.nsi,v 1.18 2013/12/14 17:30:25 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@ -10,7 +10,7 @@
!define VERSION_MAJOR "5"
!define VERSION_MINOR "9"
!define VERSION_YYYY "2013"
!define VERSION_MMDD "1207"
!define VERSION_MMDD "1214"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"

2
package/mingw-ncurses.spec
View File

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

2
package/ncurses.spec
View File

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

42
progs/dump_entry.c
View File

@ -39,7 +39,7 @@
#include "termsort.c" /* this C file is generated */
#include <parametrized.h> /* so is this */
MODULE_ID("$Id: dump_entry.c,v 1.110 2013/11/16 19:58:01 tom Exp $")
MODULE_ID("$Id: dump_entry.c,v 1.111 2013/12/15 01:05:20 tom Exp $")
#define INDENT 8
#define DISCARD(string) string = ABSENT_STRING
@ -467,7 +467,7 @@ indent_DYN(DYNBUF * buffer, int level)
int n;
for (n = 0; n < level; n++)
strncpy_DYN(buffer, "\t", 1);
strncpy_DYN(buffer, "\t", (size_t) 1);
}
static bool
@ -480,9 +480,9 @@ has_params(const char *src)
bool params = FALSE;
for (n = 0; n < len - 1; ++n) {
if (!strncmp(src + n, "%p", 2)) {
if (!strncmp(src + n, "%p", (size_t) 2)) {
params = TRUE;
} else if (!strncmp(src + n, "%;", 2)) {
} else if (!strncmp(src + n, "%;", (size_t) 2)) {
ifthen = TRUE;
result = params;
break;
@ -504,7 +504,7 @@ fmt_complex(TERMTYPE *tterm, const char *capability, char *src, int level)
switch (*src) {
case '\\':
percent = FALSE;
strncpy_DYN(&tmpbuf, src++, 1);
strncpy_DYN(&tmpbuf, src++, (size_t) 1);
break;
case '%':
percent = TRUE;
@ -518,22 +518,22 @@ fmt_complex(TERMTYPE *tterm, const char *capability, char *src, int level)
/* treat a "%e" as else-if, on the same level */
if (*src == 'e') {
indent_DYN(&tmpbuf, level);
strncpy_DYN(&tmpbuf, "%", 1);
strncpy_DYN(&tmpbuf, src, 1);
strncpy_DYN(&tmpbuf, "%", (size_t) 1);
strncpy_DYN(&tmpbuf, src, (size_t) 1);
src++;
params = has_params(src);
if (!params && *src != '\0' && *src != '%') {
strncpy_DYN(&tmpbuf, "\n", 1);
strncpy_DYN(&tmpbuf, "\n", (size_t) 1);
indent_DYN(&tmpbuf, level + 1);
}
} else {
indent_DYN(&tmpbuf, level + 1);
strncpy_DYN(&tmpbuf, "%", 1);
strncpy_DYN(&tmpbuf, src, 1);
strncpy_DYN(&tmpbuf, "%", (size_t) 1);
strncpy_DYN(&tmpbuf, src, (size_t) 1);
if (*src++ == '?') {
src = fmt_complex(tterm, capability, src, level + 1);
if (*src != '\0' && *src != '%') {
strncpy_DYN(&tmpbuf, "\n", 1);
strncpy_DYN(&tmpbuf, "\n", (size_t) 1);
indent_DYN(&tmpbuf, level + 1);
}
} else if (level == 1) {
@ -551,8 +551,8 @@ fmt_complex(TERMTYPE *tterm, const char *capability, char *src, int level)
if (level > 1) {
tmpbuf.text[tmpbuf.used - 1] = '\n';
indent_DYN(&tmpbuf, level);
strncpy_DYN(&tmpbuf, "%", 1);
strncpy_DYN(&tmpbuf, src++, 1);
strncpy_DYN(&tmpbuf, "%", (size_t) 1);
strncpy_DYN(&tmpbuf, src++, (size_t) 1);
if (src[0] == '%'
&& src[1] != '\0'
&& (strchr("?e;", src[1])) == 0) {
@ -570,20 +570,20 @@ fmt_complex(TERMTYPE *tterm, const char *capability, char *src, int level)
if (percent && params) {
tmpbuf.text[tmpbuf.used - 1] = '\n';
indent_DYN(&tmpbuf, level + 1);
strncpy_DYN(&tmpbuf, "%", 1);
strncpy_DYN(&tmpbuf, "%", (size_t) 1);
}
params = FALSE;
percent = FALSE;
break;
case ' ':
strncpy_DYN(&tmpbuf, "\\s", 2);
strncpy_DYN(&tmpbuf, "\\s", (size_t) 2);
++src;
continue;
default:
percent = FALSE;
break;
}
strncpy_DYN(&tmpbuf, src++, 1);
strncpy_DYN(&tmpbuf, src++, (size_t) 1);
}
return src;
}
@ -594,9 +594,9 @@ fmt_complex(TERMTYPE *tterm, const char *capability, char *src, int level)
int
fmt_entry(TERMTYPE *tterm,
PredFunc pred,
bool content_only,
bool suppress_untranslatable,
bool infodump,
int content_only,
int suppress_untranslatable,
int infodump,
int numbers)
{
PredIdx i, j;
@ -1104,8 +1104,8 @@ purged_acs(TERMTYPE *tterm)
*/
void
dump_entry(TERMTYPE *tterm,
bool suppress_untranslatable,
bool limited,
int suppress_untranslatable,
int limited,
int numbers,
PredFunc pred)
{

8
progs/dump_entry.h
View File

@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 1998-2008,2011 Free Software Foundation, Inc. *
* Copyright (c) 1998-2011,2013 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 *
@ -33,7 +33,7 @@
****************************************************************************/
/*
* $Id: dump_entry.h,v 1.32 2011/08/06 16:33:05 tom Exp $
* $Id: dump_entry.h,v 1.33 2013/12/15 01:08:03 tom Exp $
*
* Dump control definitions and variables
*/
@ -67,10 +67,10 @@ typedef int (*PredFunc) (PredType, PredIdx);
typedef void (*PredHook) (PredType, PredIdx, const char *);
extern NCURSES_CONST char *nametrans(const char *);
extern int fmt_entry(TERMTYPE *, PredFunc, bool, bool, bool, int);
extern int fmt_entry(TERMTYPE *, PredFunc, int, int, int, int);
extern int show_entry(void);
extern void compare_entry(PredHook, TERMTYPE *, bool);
extern void dump_entry(TERMTYPE *, bool, bool, int, PredFunc);
extern void dump_entry(TERMTYPE *, int, int, int, PredFunc);
extern void dump_init(const char *, int, int, int, int, unsigned, bool);
extern void dump_uses(const char *, bool);
extern void repair_acsc(TERMTYPE *tp);

4
progs/infocmp.c
View File

@ -42,7 +42,7 @@
#include <dump_entry.h>
MODULE_ID("$Id: infocmp.c,v 1.127 2013/11/16 20:26:09 tom Exp $")
MODULE_ID("$Id: infocmp.c,v 1.128 2013/12/15 01:06:52 tom Exp $")
#define L_CURL "{"
#define R_CURL "}"
@ -818,7 +818,7 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp)
if (_nc_capcmp(cp, buf2))
continue;
#define ISRS(s) (!strncmp((s), "is", 2) || !strncmp((s), "rs", 2))
#define ISRS(s) (!strncmp((s), "is", (size_t) 2) || !strncmp((s), "rs", (size_t) 2))
/*
* Theoretically we just passed the test for translation
* (equality once the padding is stripped). However, there

12
progs/toe.c
View File

@ -44,7 +44,7 @@
#include <hashed_db.h>
#endif
MODULE_ID("$Id: toe.c,v 1.72 2013/05/25 20:13:07 tom Exp $")
MODULE_ID("$Id: toe.c,v 1.74 2013/12/15 01:08:28 tom Exp $")
#define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
@ -232,9 +232,9 @@ make_db_name(char *dst, const char *src, unsigned limit)
static const char suffix[] = DBM_SUFFIX;
bool result = FALSE;
unsigned lens = sizeof(suffix) - 1;
unsigned size = strlen(src);
unsigned need = lens + size;
size_t lens = sizeof(suffix) - 1;
size_t size = strlen(src);
size_t need = lens + size;
if (need <= limit) {
if (size >= lens
@ -367,7 +367,7 @@ copy_entryname(DIRENT * src)
static int
typelist(int eargc, char *eargv[],
bool verbosity,
int verbosity,
DescHook hook)
/* apply a function to each entry in given terminfo directories */
{
@ -721,7 +721,7 @@ main(int argc, char *argv[])
DBDIRS state;
int offset;
const char *path;
char **eargv = allocArgv(2);
char **eargv = allocArgv((size_t) 2);
size_t count = 0;
if (eargv == 0)

7
progs/tset.c
View File

@ -119,7 +119,7 @@ char *ttyname(int fd);
#include <dump_entry.h>
#include <transform.h>
MODULE_ID("$Id: tset.c,v 1.92 2013/10/12 22:17:20 tom Exp $")
MODULE_ID("$Id: tset.c,v 1.93 2013/12/15 01:05:56 tom Exp $")
/*
* SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS,
@ -635,13 +635,14 @@ get_termcap_entry(char *userarg)
* real entry from /etc/termcap. This prevents us from being fooled
* by out of date stuff in the environment.
*/
found:if ((p = getenv("TERMCAP")) != 0 && !_nc_is_abs_path(p)) {
found:
if ((p = getenv("TERMCAP")) != 0 && !_nc_is_abs_path(p)) {
/* 'unsetenv("TERMCAP")' is not portable.
* The 'environ' array is better.
*/
int n;
for (n = 0; environ[n] != 0; n++) {
if (!strncmp("TERMCAP=", environ[n], 8)) {
if (!strncmp("TERMCAP=", environ[n], (size_t) 8)) {
while ((environ[n] = environ[n + 1]) != 0) {
n++;
}