提交 aa290a3e 编写于 作者: J Jim Meyering

Pull vc-list-files from gnulib, and update.

* bootstrap (gnulib_tool): Add the vc-list-files module.
上级 b5433aaa
Fri Feb 1 20:46:07 CET 2008 Jim Meyering <meyering@redhat.com>
Pull vc-list-files from gnulib, and update.
* bootstrap (gnulib_tool): Add the vc-list-files module.
Thu Jan 31 20:12:40 CET 2008 Guido Guenther <agx@sigxcpu.org> Thu Jan 31 20:12:40 CET 2008 Guido Guenther <agx@sigxcpu.org>
Avoid compilation failure when building --without-xen. Avoid compilation failure when building --without-xen.
......
...@@ -77,7 +77,8 @@ $gnulib_tool \ ...@@ -77,7 +77,8 @@ $gnulib_tool \
--tests-base=gnulib/tests \ --tests-base=gnulib/tests \
--import physmem getaddrinfo \ --import physmem getaddrinfo \
sys_stat vasprintf strndup \ sys_stat vasprintf strndup \
strsep poll gettext getpass strsep poll gettext getpass \
vc-list-files
rm -f \ rm -f \
.gitignore \ .gitignore \
......
#!/bin/sh #!/bin/sh
# List the specified version-controlled files. # List version-controlled file names.
# Copyright (C) 2006, 2007 Free Software Foundation, Inc. # Copyright (C) 2006-2008 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -18,7 +18,8 @@ ...@@ -18,7 +18,8 @@
# List the specified version-controlled files. # List the specified version-controlled files.
# With no argument, list them all. # With no argument, list them all. With a single DIRECTORY argument,
# list the version-controlled files in that directory.
# This script must be run solely from the top of a $srcdir build directory. # This script must be run solely from the top of a $srcdir build directory.
# If there's an argument, it must be a single, "."-relative directory name. # If there's an argument, it must be a single, "."-relative directory name.
...@@ -28,12 +29,17 @@ dir= ...@@ -28,12 +29,17 @@ dir=
case $# in case $# in
0) ;; 0) ;;
1) dir=$1 ;; 1) dir=$1 ;;
*) echo "$0: too many arguments" 1>&2; exit 1 ;; *) echo "$0: too many arguments" 1>&2
echo "Usage: $0 [DIR]" 1>&2; exit 1;;
esac esac
test "x$dir" = x && dir=. test "x$dir" = x && dir=.
if test -d CVS; then if test -d .git; then
exec git ls-files "$dir"
elif test -d .hg; then
exec hg locate "$dir/*"
elif test -d CVS; then
if test -x build-aux/cvsu; then if test -x build-aux/cvsu; then
build-aux/cvsu --find --types=AFGM "$dir" build-aux/cvsu --find --types=AFGM "$dir"
else else
...@@ -46,5 +52,6 @@ if test -d CVS; then ...@@ -46,5 +52,6 @@ if test -d CVS; then
$(find ${*-*} -name Entries -print) /dev/null; $(find ${*-*} -name Entries -print) /dev/null;
fi fi
else else
git-ls-files "$dir" echo "$0: Failed to determine type of version control used in "`pwd` 1>&2
exit 1
fi fi
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
# the same distribution terms as the rest of that program. # the same distribution terms as the rest of that program.
# #
# Generated by gnulib-tool. # Generated by gnulib-tool.
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=build-aux --with-tests --lgpl=2 --libtool --macro-prefix=gl getaddrinfo getpass gettext physmem poll strndup strsep sys_stat vasprintf # Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=build-aux --with-tests --lgpl=2 --libtool --macro-prefix=gl getaddrinfo getpass gettext physmem poll strndup strsep sys_stat vasprintf vc-list-files
AUTOMAKE_OPTIONS = 1.5 gnits AUTOMAKE_OPTIONS = 1.5 gnits
...@@ -719,6 +719,13 @@ EXTRA_libgnu_la_SOURCES += asprintf.c vasprintf.c ...@@ -719,6 +719,13 @@ EXTRA_libgnu_la_SOURCES += asprintf.c vasprintf.c
## end gnulib module vasprintf ## end gnulib module vasprintf
## begin gnulib module vc-list-files
EXTRA_DIST += $(top_srcdir)/build-aux/vc-list-files
## end gnulib module vc-list-files
## begin gnulib module wchar ## begin gnulib module wchar
BUILT_SOURCES += $(WCHAR_H) BUILT_SOURCES += $(WCHAR_H)
......
/* vsprintf with automatic memory allocation. /* vsprintf with automatic memory allocation.
Copyright (C) 1999, 2002-2007 Free Software Foundation, Inc. Copyright (C) 1999, 2002-2008 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by it under the terms of the GNU Lesser General Public License as published by
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
#if (NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE) && !defined IN_LIBINTL #if (NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE) && !defined IN_LIBINTL
# include <math.h> # include <math.h>
# include "isnan.h" # include "isnand.h"
#endif #endif
#if (NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE) && !defined IN_LIBINTL #if (NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE) && !defined IN_LIBINTL
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_DOUBLE) && !defined IN_LIBINTL #if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_DOUBLE) && !defined IN_LIBINTL
# include <math.h> # include <math.h>
# include "isnan.h" # include "isnand.h"
# include "printf-frexp.h" # include "printf-frexp.h"
#endif #endif
...@@ -236,7 +236,7 @@ decimal_point_char () ...@@ -236,7 +236,7 @@ decimal_point_char ()
static int static int
is_infinite_or_zero (double x) is_infinite_or_zero (double x)
{ {
return isnan (x) || x + x == x; return isnand (x) || x + x == x;
} }
#endif #endif
...@@ -2327,7 +2327,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, ...@@ -2327,7 +2327,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
# if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_DOUBLE # if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_DOUBLE
double arg = a.arg[dp->arg_index].a.a_double; double arg = a.arg[dp->arg_index].a.a_double;
if (isnan (arg)) if (isnand (arg))
{ {
if (dp->conversion == 'A') if (dp->conversion == 'A')
{ {
...@@ -2676,7 +2676,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, ...@@ -2676,7 +2676,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
if (dp->conversion == 'f' || dp->conversion == 'F') if (dp->conversion == 'f' || dp->conversion == 'F')
{ {
double arg = a.arg[dp->arg_index].a.a_double; double arg = a.arg[dp->arg_index].a.a_double;
if (!(isnan (arg) || arg + arg == arg)) if (!(isnand (arg) || arg + arg == arg))
{ {
/* arg is finite and nonzero. */ /* arg is finite and nonzero. */
int exponent = floorlog10 (arg < 0 ? -arg : arg); int exponent = floorlog10 (arg < 0 ? -arg : arg);
...@@ -3080,7 +3080,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, ...@@ -3080,7 +3080,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
{ {
double arg = a.arg[dp->arg_index].a.a_double; double arg = a.arg[dp->arg_index].a.a_double;
if (isnan (arg)) if (isnand (arg))
{ {
if (dp->conversion >= 'A' && dp->conversion <= 'Z') if (dp->conversion >= 'A' && dp->conversion <= 'Z')
{ {
...@@ -4327,7 +4327,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, ...@@ -4327,7 +4327,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
if (prec_ourselves) if (prec_ourselves)
{ {
/* Handle the precision. */ /* Handle the precision. */
TCHAR_T *prec_ptr = TCHAR_T *prec_ptr =
# if USE_SNPRINTF # if USE_SNPRINTF
(TCHAR_T *) (result + length); (TCHAR_T *) (result + length);
# else # else
...@@ -4654,6 +4654,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, ...@@ -4654,6 +4654,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
not have this limitation. */ not have this limitation. */
return result; return result;
#if USE_SNPRINTF
overflow: overflow:
if (!(result == resultbuf || result == NULL)) if (!(result == resultbuf || result == NULL))
free (result); free (result);
...@@ -4662,6 +4663,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, ...@@ -4662,6 +4663,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
CLEANUP (); CLEANUP ();
errno = EOVERFLOW; errno = EOVERFLOW;
return NULL; return NULL;
#endif
out_of_memory: out_of_memory:
if (!(result == resultbuf || result == NULL)) if (!(result == resultbuf || result == NULL))
......
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
# Specification in the form of a command-line invocation: # Specification in the form of a command-line invocation:
# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=build-aux --with-tests --lgpl=2 --libtool --macro-prefix=gl getaddrinfo getpass gettext physmem poll strndup strsep sys_stat vasprintf # gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=build-aux --with-tests --lgpl=2 --libtool --macro-prefix=gl getaddrinfo getpass gettext physmem poll strndup strsep sys_stat vasprintf vc-list-files
# Specification in the form of a few gnulib-tool.m4 macro invocations: # Specification in the form of a few gnulib-tool.m4 macro invocations:
gl_LOCAL_DIR([]) gl_LOCAL_DIR([])
gl_MODULES([getaddrinfo getpass gettext physmem poll strndup strsep sys_stat vasprintf]) gl_MODULES([getaddrinfo getpass gettext physmem poll strndup strsep sys_stat vasprintf vc-list-files])
gl_AVOID([]) gl_AVOID([])
gl_SOURCE_BASE([gnulib/lib]) gl_SOURCE_BASE([gnulib/lib])
gl_M4_BASE([gnulib/m4]) gl_M4_BASE([gnulib/m4])
......
...@@ -225,6 +225,7 @@ AC_DEFUN([gltests_LIBSOURCES], [ ...@@ -225,6 +225,7 @@ AC_DEFUN([gltests_LIBSOURCES], [
AC_DEFUN([gl_FILE_LIST], [ AC_DEFUN([gl_FILE_LIST], [
build-aux/config.rpath build-aux/config.rpath
build-aux/link-warning.h build-aux/link-warning.h
build-aux/vc-list-files
lib/alloca.in.h lib/alloca.in.h
lib/asnprintf.c lib/asnprintf.c
lib/asprintf.c lib/asprintf.c
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册