kpathsea: Version 6.2.1dev for TL 2014

          Avoid useless char subscript warnings

git-svn-id: svn://tug.org/texlive/trunk@34284 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 99 insertions, 89 deletions

diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index c087d6a1a50..e3bf55810cc 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,13 @@
+2014-06-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* c-ctype.h: Avoid useless char subscript warnings.
+
+2014-06-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (kpathsea.h): Drop c-auto.h, c-ctype.h, c-errno.h,
+	and more from the list of files; they are included via others.
+	* version.ac: Update version number 6.2.0 => 6.2.1dev.
+
 2014-05-07  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* win32lib.c: Update win32_popen() (w32 only).
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index 52f8951a1c9..ae78eee38d3 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -3,8 +3,6 @@
 ## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
-ACLOCAL_AMFLAGS = -I ../../m4
-
 SUBDIRS = . doc man
 
 EXTRA_DIST = PROJECTS
@@ -120,56 +118,57 @@ nodist_kpseinclude_HEADERS = \
 	kpathsea.h \
 	paths.h
 
-kpseinclude_HEADERS = $(special_headers) $(normal_headers)
+kpseinclude_HEADERS = config.h $(direct_headers) $(indirect_headers)
 
-# Headers treated specially when building kpathsea.h
+# Headers included directly into kpathsea.h
 #
-special_headers = \
-	config.h \
-	knj.h \
-	mingw32.h \
-	win32lib.h
-
-normal_headers = \
+direct_headers = \
 	absolute.h \
-	c-ctype.h \
 	c-dir.h \
-	c-errno.h \
 	c-fopen.h \
-	c-limits.h \
-	c-memstr.h \
-	c-minmax.h \
 	c-namemx.h \
 	c-pathch.h \
 	c-pathmx.h \
-	c-proto.h \
 	c-stat.h \
-	c-std.h \
-	c-unistd.h \
 	cnf.h \
 	concatn.h \
-	debug.h \
 	expand.h \
 	getopt.h \
-	hash.h \
-	lib.h \
 	line.h \
 	magstep.h \
 	pathsearch.h \
 	proginit.h \
-	progname.h \
 	readable.h \
+	tex-glyph.h \
+	tex-hush.h \
+	tex-make.h \
+	variable.h \
+	version.h
+
+# Headers included indirectly into kpathsea.h
+#
+indirect_headers = \
+	c-ctype.h \
+	c-errno.h \
+	c-limits.h \
+	c-memstr.h \
+	c-minmax.h \
+	c-proto.h \
+	c-std.h \
+	c-unistd.h \
+	debug.h \
+	hash.h \
+	knj.h \
+	lib.h \
+	mingw32.h \
+	progname.h \
 	simpletypes.h \
 	str-list.h \
 	str-llist.h \
 	systypes.h \
 	tex-file.h \
-	tex-glyph.h \
-	tex-hush.h \
-	tex-make.h \
 	types.h \
-	variable.h \
-	version.h
+	win32lib.h
 
 noinst_HEADERS = \
 	db.h \
@@ -215,7 +214,7 @@ stamp-kpathsea: Makefile paths.h
 	$(AM_V_GEN)rm -f $@; \
 	( echo '/* This is a generated file */'; \
 	  echo '/* collecting all public kpathsea headers. */'; \
-	  for f in config.h c-auto.h paths.h $(normal_headers); do \
+	  for f in config.h paths.h $(direct_headers); do \
 	    echo "#include <kpathsea/$$f>"; \
 	  done ) >kpathsea.tmp
 	@if cmp -s kpathsea.h kpathsea.tmp 2>/dev/null; then \
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index 72873d11d28..ab5b79d6b6a 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -109,8 +109,8 @@ EXTRA_PROGRAMS = progname-test$(EXEEXT) xdirtest$(EXEEXT)
 DIST_COMMON = $(top_srcdir)/../../am/bin_links.am \
 	$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
 	$(srcdir)/Makefile.am $(top_srcdir)/configure \
-	$(am__configure_deps) $(srcdir)/c-auto.in strcasecmp.c \
-	strtol.c strstr.c putenv.c $(dist_noinst_SCRIPTS) \
+	$(am__configure_deps) $(srcdir)/c-auto.in putenv.c strtol.c \
+	strstr.c strcasecmp.c $(dist_noinst_SCRIPTS) \
 	$(dist_web2c_SCRIPTS) $(top_srcdir)/../../build-aux/depcomp \
 	$(dist_noinst_DATA) $(dist_web2c_DATA) $(kpseinclude_HEADERS) \
 	$(noinst_HEADERS) $(top_srcdir)/../../build-aux/test-driver \
@@ -679,7 +679,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I ../../m4
 SUBDIRS = . doc man $(am__append_6)
 EXTRA_DIST = PROJECTS putenv.c strcasecmp.c strtol.c strstr.c bsnl.awk \
 	cnf-to-paths.awk $(TESTS) tests/cnfnewline/texmf.cnf mktex.cnf
@@ -708,56 +707,58 @@ nodist_kpseinclude_HEADERS = \
 	kpathsea.h \
 	paths.h
 
-kpseinclude_HEADERS = $(special_headers) $(normal_headers)
+kpseinclude_HEADERS = config.h $(direct_headers) $(indirect_headers)
 
-# Headers treated specially when building kpathsea.h
+# Headers included directly into kpathsea.h
 #
-special_headers = \
-	config.h \
-	knj.h \
-	mingw32.h \
-	win32lib.h
-
-normal_headers = \
+direct_headers = \
 	absolute.h \
-	c-ctype.h \
 	c-dir.h \
-	c-errno.h \
 	c-fopen.h \
-	c-limits.h \
-	c-memstr.h \
-	c-minmax.h \
 	c-namemx.h \
 	c-pathch.h \
 	c-pathmx.h \
-	c-proto.h \
 	c-stat.h \
-	c-std.h \
-	c-unistd.h \
 	cnf.h \
 	concatn.h \
-	debug.h \
 	expand.h \
 	getopt.h \
-	hash.h \
-	lib.h \
 	line.h \
 	magstep.h \
 	pathsearch.h \
 	proginit.h \
-	progname.h \
 	readable.h \
+	tex-glyph.h \
+	tex-hush.h \
+	tex-make.h \
+	variable.h \
+	version.h
+
+
+# Headers included indirectly into kpathsea.h
+#
+indirect_headers = \
+	c-ctype.h \
+	c-errno.h \
+	c-limits.h \
+	c-memstr.h \
+	c-minmax.h \
+	c-proto.h \
+	c-std.h \
+	c-unistd.h \
+	debug.h \
+	hash.h \
+	knj.h \
+	lib.h \
+	mingw32.h \
+	progname.h \
 	simpletypes.h \
 	str-list.h \
 	str-llist.h \
 	systypes.h \
 	tex-file.h \
-	tex-glyph.h \
-	tex-hush.h \
-	tex-make.h \
 	types.h \
-	variable.h \
-	version.h
+	win32lib.h
 
 noinst_HEADERS = \
 	db.h \
@@ -2223,7 +2224,7 @@ stamp-kpathsea: Makefile paths.h
 	$(AM_V_GEN)rm -f $@; \
 	( echo '/* This is a generated file */'; \
 	  echo '/* collecting all public kpathsea headers. */'; \
-	  for f in config.h c-auto.h paths.h $(normal_headers); do \
+	  for f in config.h paths.h $(direct_headers); do \
 	    echo "#include <kpathsea/$$f>"; \
 	  done ) >kpathsea.tmp
 	@if cmp -s kpathsea.h kpathsea.tmp 2>/dev/null; then \
diff --git a/Build/source/texk/kpathsea/c-auto.in b/Build/source/texk/kpathsea/c-auto.in
index b586b02a44c..48511820600 100644
--- a/Build/source/texk/kpathsea/c-auto.in
+++ b/Build/source/texk/kpathsea/c-auto.in
@@ -23,7 +23,7 @@
 #define KPATHSEA_C_AUTO_H
 
 /* kpathsea: the version string. */
-#define KPSEVERSION "kpathsea version 6.2.0"
+#define KPSEVERSION "kpathsea version 6.2.1dev"
 
 /* Define to 1 if the `closedir' function returns void instead of `int'. */
 #undef CLOSEDIR_VOID
diff --git a/Build/source/texk/kpathsea/c-ctype.h b/Build/source/texk/kpathsea/c-ctype.h
index 1a80197b1de..72fbf370a8f 100644
--- a/Build/source/texk/kpathsea/c-ctype.h
+++ b/Build/source/texk/kpathsea/c-ctype.h
@@ -28,28 +28,28 @@
 #endif
 #endif
 
-#define ISALNUM(c) (isascii (c) && isalnum(c))
-#define ISALPHA(c) (isascii (c) && isalpha(c))
+#define ISALNUM(c) (isascii (c) && isalnum((unsigned char)c))
+#define ISALPHA(c) (isascii (c) && isalpha((unsigned char)c))
 #define ISASCII isascii
-#define ISCNTRL(c) (isascii (c) && iscntrl(c))
-#define ISDIGIT(c) (isascii (c) && isdigit (c))
-#define ISGRAPH(c) (isascii (c) && isgraph(c))
-#define ISLOWER(c) (isascii (c) && islower(c))
-#define ISPRINT(c) (isascii (c) && isprint(c))
-#define ISPUNCT(c) (isascii (c) && ispunct(c))
-#define ISSPACE(c) (isascii (c) && isspace(c))
-#define ISUPPER(c) (isascii (c) && isupper(c))
-#define ISXDIGIT(c) (isascii (c) && isxdigit(c))
+#define ISCNTRL(c) (isascii (c) && iscntrl((unsigned char)c))
+#define ISDIGIT(c) (isascii (c) && isdigit ((unsigned char)c))
+#define ISGRAPH(c) (isascii (c) && isgraph((unsigned char)c))
+#define ISLOWER(c) (isascii (c) && islower((unsigned char)c))
+#define ISPRINT(c) (isascii (c) && isprint((unsigned char)c))
+#define ISPUNCT(c) (isascii (c) && ispunct((unsigned char)c))
+#define ISSPACE(c) (isascii (c) && isspace((unsigned char)c))
+#define ISUPPER(c) (isascii (c) && isupper((unsigned char)c))
+#define ISXDIGIT(c) (isascii (c) && isxdigit((unsigned char)c))
 #define TOASCII toascii
-#define TOLOWER(c) (ISUPPER (c) ? tolower (c) : (c))
-#define TOUPPER(c) (ISLOWER (c) ? toupper (c) : (c))
+#define TOLOWER(c) (ISUPPER (c) ? tolower ((unsigned char)c) : (c))
+#define TOUPPER(c) (ISLOWER (c) ? toupper ((unsigned char)c) : (c))
 
 /* This isn't part of the usual <ctype.h>, but it's useful sometimes.  */
 #ifndef isblank
 #define isblank(c) ((c) == ' ' || (c) == '\t')
 #endif
 
-#define ISBLANK(c) (isascii (c) && isblank (c))
+#define ISBLANK(c) (isascii (c) && isblank ((unsigned char)c))
 
 
 /* Here's why this mess is necessary:
diff --git a/Build/source/texk/kpathsea/config.h b/Build/source/texk/kpathsea/config.h
index 067777ab584..d9a1948b66a 100644
--- a/Build/source/texk/kpathsea/config.h
+++ b/Build/source/texk/kpathsea/config.h
@@ -88,7 +88,7 @@
 #include <kpathsea/c-std.h>    /* <stdio.h>, <math.h>, etc.  */
 #endif
 
-#include <kpathsea/c-proto.h>  /* Macros to discard or keep prototypes.  */
+#include <kpathsea/c-proto.h>  /* KPSEDLL.  */
 
 /*
   This must be included after "c-proto.h"
diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure
index 163fe2a7d06..81cbf4b8f11 100755
--- a/Build/source/texk/kpathsea/configure
+++ b/Build/source/texk/kpathsea/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Kpathsea 6.2.0.
+# Generated by GNU Autoconf 2.69 for Kpathsea 6.2.1dev.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Kpathsea'
 PACKAGE_TARNAME='kpathsea'
-PACKAGE_VERSION='6.2.0'
-PACKAGE_STRING='Kpathsea 6.2.0'
+PACKAGE_VERSION='6.2.1dev'
+PACKAGE_STRING='Kpathsea 6.2.1dev'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1336,7 +1336,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Kpathsea 6.2.0 to adapt to many kinds of systems.
+\`configure' configures Kpathsea 6.2.1dev to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1406,7 +1406,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Kpathsea 6.2.0:";;
+     short | recursive ) echo "Configuration of Kpathsea 6.2.1dev:";;
    esac
   cat <<\_ACEOF
 
@@ -1529,7 +1529,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Kpathsea configure 6.2.0
+Kpathsea configure 6.2.1dev
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2368,7 +2368,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Kpathsea $as_me 6.2.0, which was
+It was created by Kpathsea $as_me 6.2.1dev, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2749,14 +2749,14 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-KPSEVERSION=6.2.0
+KPSEVERSION=6.2.1dev
 
 
-KPSE_LT_VERSINFO=8:0:2
+KPSE_LT_VERSINFO=8:1:2
 
 
 
- WEB2CVERSION=2014
+ WEB2CVERSION=2015/dev
 
 
 am__api_version='1.14'
@@ -7868,7 +7868,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='kpathsea'
- VERSION='6.2.0'
+ VERSION='6.2.1dev'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14237,7 +14237,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Kpathsea $as_me 6.2.0, which was
+This file was extended by Kpathsea $as_me 6.2.1dev, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14303,7 +14303,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Kpathsea config.status 6.2.0
+Kpathsea config.status 6.2.1dev
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/kpathsea/version.ac b/Build/source/texk/kpathsea/version.ac
index 164924d24c9..9038e5345eb 100644
--- a/Build/source/texk/kpathsea/version.ac
+++ b/Build/source/texk/kpathsea/version.ac
@@ -18,4 +18,4 @@ dnl     append "dev", to distinguish binaries built between releases.
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current kpathsea version
-m4_define([kpse_version], [6.2.0])
+m4_define([kpse_version], [6.2.1dev])