pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-07-01 01:20:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

commit bash-20080214 snapshot

Browse Source
This commit is contained in:
Chet Ramey
2011-12-07 09:18:57 -05:00
parent 9cbcc93b30
commit 57a071246a
25 changed files with 7207 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CWRU/CWRU.chlog
+13 -3
View File
@@ -12954,8 +12954,8 @@ lib/readline/complete.c
Andrew Parker <andrewparker@bigfoot.com>
bashline.c
- add necessary directory name dequoting to bash_directory_completion_hook
and bash_directory_expansion
- add necessary directory name dequoting to bash_directory_expansion
and bash_directory_completion_hook
lib/readline/doc/rltech.texi
- add note to description of rl_directory_completion_hook that it
@@ -14967,7 +14967,7 @@ pcomplete.c
10/16
-----
bashline.c
- When completing a command name beginnig with a tilde and containing
- When completing a command name beginning with a tilde and containing
escaped specical characters, dequote the filename before prefixing
it to the matches, so the escapes are not quoted again. Reported
by neil@s-z.org
@@ -15271,3 +15271,13 @@ general.c
builtins/*.def
- changes to text and formatting suggested by Jan Schampera
<jan.schampera@web.de>
2/16
----
bashline.c
- change command_word_completion_function to use the word completion
found by readline, which matters only when ignoring case is on
and the completion found in the file system differs in case from
the text the user typed (this is what readline does for normal
filename completion). Fixes issue reported by Jian Wang
<jwang@a10networks.com.cn>.
CWRU/CWRU.chlog~
+4 -3
View File
@@ -12954,8 +12954,8 @@ lib/readline/complete.c
Andrew Parker <andrewparker@bigfoot.com>
bashline.c
- add necessary directory name dequoting to bash_directory_completion_hook
and bash_directory_expansion
- add necessary directory name dequoting to bash_directory_expansion
and bash_directory_completion_hook
lib/readline/doc/rltech.texi
- add note to description of rl_directory_completion_hook that it
@@ -14967,7 +14967,7 @@ pcomplete.c
10/16
-----
bashline.c
- When completing a command name beginnig with a tilde and containing
- When completing a command name beginning with a tilde and containing
escaped specical characters, dequote the filename before prefixing
it to the matches, so the escapes are not quoted again. Reported
by neil@s-z.org
@@ -15270,3 +15270,4 @@ general.c
---
builtins/*.def
- changes to text and formatting suggested by Jan Schampera
<jan.schampera@web.de>
MANIFEST
+1
View File
@@ -387,6 +387,7 @@ lib/sh/inet_aton.c f
lib/sh/itos.c f
lib/sh/mailstat.c f
lib/sh/makepath.c f
lib/sh/mbscmp.c f
lib/sh/memset.c f
lib/sh/mktime.c f
lib/sh/netconn.c f
MANIFEST~
+1
View File
@@ -426,6 +426,7 @@ lib/sh/wcsdup.c f
lib/sh/winsize.c f
lib/sh/xstrchr.c f
lib/sh/zcatfd.c f
lib/sh/zgetline.c f
lib/sh/zmapfd.c f
lib/sh/zread.c f
lib/sh/zwrite.c f
Makefile.in
+1 -1
View File
@@ -211,7 +211,7 @@ SHLIB_SOURCE = ${SH_LIBSRC}/clktck.c ${SH_LIBSRC}/getcwd.c \
${SH_LIBSRC}/strnlen.c ${SH_LIBSRC}/winsize.c \
${SH_LIBSRC}/eaccess.c ${SH_LIBSRC}/wcsdup.c \
${SH_LIBSRC}/zmapfd.c ${SH_LIBSRC}/fpurge.c \
${SH_LIBSRC}/zgetline.c
${SH_LIBSRC}/zgetline.c ${SH_LIBSRC}/mbscmp.c
SHLIB_LIB = -lsh
SHLIB_LIBNAME = libsh.a
Makefile.in~
+2 -1
View File
@@ -210,7 +210,8 @@ SHLIB_SOURCE = ${SH_LIBSRC}/clktck.c ${SH_LIBSRC}/getcwd.c \
${SH_LIBSRC}/zcatfd.c ${SH_LIBSRC}/shmatch.c \
${SH_LIBSRC}/strnlen.c ${SH_LIBSRC}/winsize.c \
${SH_LIBSRC}/eaccess.c ${SH_LIBSRC}/wcsdup.c \
${SH_LIBSRC}/zmapfd.c ${SH_LIBSRC}/fpurge.c
${SH_LIBSRC}/zmapfd.c ${SH_LIBSRC}/fpurge.c \
${SH_LIBSRC}/zgetline.c
SHLIB_LIB = -lsh
SHLIB_LIBNAME = libsh.a
aclocal.m4
Vendored
+2 -1
View File
@@ -1677,8 +1677,9 @@ AC_CHECK_HEADERS(wctype.h)
AC_CHECK_HEADERS(wchar.h)
AC_CHECK_HEADERS(langinfo.h)
AC_CHECK_FUNC(mbsrtowcs, AC_DEFINE(HAVE_MBSRTOWCS))
AC_CHECK_FUNC(mbrlen, AC_DEFINE(HAVE_MBRLEN))
AC_CHECK_FUNC(mbscmp, AC_DEFINE(HAVE_MBSCMP))
AC_CHECK_FUNC(mbsrtowcs, AC_DEFINE(HAVE_MBSRTOWCS))
AC_CHECK_FUNC(wcrtomb, AC_DEFINE(HAVE_WCRTOMB))
AC_CHECK_FUNC(wcscoll, AC_DEFINE(HAVE_WCSCOLL))
aclocal.m4~
Vendored
+10 -2
View File
@@ -215,7 +215,7 @@ AC_CACHE_VAL(bash_cv_sys_siglist,
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifndef SYS_SIGLIST_DECLARED
#if !HAVE_DECL_SYS_SIGLIST
extern char *sys_siglist[];
#endif
main()
@@ -685,7 +685,7 @@ fi
])
AC_DEFUN(BASH_FUNC_GETCWD,
[AC_MSG_CHECKING([if getcwd() will dynamically allocate memory])
[AC_MSG_CHECKING([if getcwd() will dynamically allocate memory with 0 size])
AC_CACHE_VAL(bash_cv_getcwd_malloc,
[AC_TRY_RUN([
#include <stdio.h>
@@ -3997,3 +3997,11 @@ AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
[Define if you have the unsigned long long type.])
fi
])
dnl From gnulib
AC_DEFUN([BASH_FUNC_FPURGE],
[
AC_CHECK_FUNCS_ONCE([fpurge])
AC_CHECK_FUNCS_ONCE([__fpurge])
AC_CHECK_DECLS([fpurge], , , [#include <stdio.h>])
])
autom4te.cache/output.0
+208 -104
View File
@@ -17793,110 +17793,6 @@ fi
done
{ echo "$as_me:$LINENO: checking for mbsrtowcs" >&5
echo $ECHO_N "checking for mbsrtowcs... $ECHO_C" >&6; }
if test "${ac_cv_func_mbsrtowcs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define mbsrtowcs to an innocuous variant, in case <limits.h> declares mbsrtowcs.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define mbsrtowcs innocuous_mbsrtowcs
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mbsrtowcs (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef mbsrtowcs
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char mbsrtowcs ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined __stub_mbsrtowcs || defined __stub___mbsrtowcs
choke me
#endif
int
main ()
{
return mbsrtowcs ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_mbsrtowcs=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_mbsrtowcs=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_mbsrtowcs" >&5
echo "${ECHO_T}$ac_cv_func_mbsrtowcs" >&6; }
if test $ac_cv_func_mbsrtowcs = yes; then
cat >>confdefs.h <<\_ACEOF
@%:@define HAVE_MBSRTOWCS 1
_ACEOF
fi
{ echo "$as_me:$LINENO: checking for mbrlen" >&5
echo $ECHO_N "checking for mbrlen... $ECHO_C" >&6; }
if test "${ac_cv_func_mbrlen+set}" = set; then
@@ -18001,6 +17897,214 @@ _ACEOF
fi
{ echo "$as_me:$LINENO: checking for mbscmp" >&5
echo $ECHO_N "checking for mbscmp... $ECHO_C" >&6; }
if test "${ac_cv_func_mbscmp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define mbscmp to an innocuous variant, in case <limits.h> declares mbscmp.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define mbscmp innocuous_mbscmp
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mbscmp (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef mbscmp
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char mbscmp ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined __stub_mbscmp || defined __stub___mbscmp
choke me
#endif
int
main ()
{
return mbscmp ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_mbscmp=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_mbscmp=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_mbscmp" >&5
echo "${ECHO_T}$ac_cv_func_mbscmp" >&6; }
if test $ac_cv_func_mbscmp = yes; then
cat >>confdefs.h <<\_ACEOF
@%:@define HAVE_MBSCMP 1
_ACEOF
fi
{ echo "$as_me:$LINENO: checking for mbsrtowcs" >&5
echo $ECHO_N "checking for mbsrtowcs... $ECHO_C" >&6; }
if test "${ac_cv_func_mbsrtowcs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define mbsrtowcs to an innocuous variant, in case <limits.h> declares mbsrtowcs.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define mbsrtowcs innocuous_mbsrtowcs
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mbsrtowcs (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef mbsrtowcs
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char mbsrtowcs ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined __stub_mbsrtowcs || defined __stub___mbsrtowcs
choke me
#endif
int
main ()
{
return mbsrtowcs ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_mbsrtowcs=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_mbsrtowcs=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_mbsrtowcs" >&5
echo "${ECHO_T}$ac_cv_func_mbsrtowcs" >&6; }
if test $ac_cv_func_mbsrtowcs = yes; then
cat >>confdefs.h <<\_ACEOF
@%:@define HAVE_MBSRTOWCS 1
_ACEOF
fi
{ echo "$as_me:$LINENO: checking for wcrtomb" >&5
echo $ECHO_N "checking for wcrtomb... $ECHO_C" >&6; }
autom4te.cache/requests
+43 -43
View File
@@ -15,26 +15,26 @@
'configure.in'
],
{
'AM_PROG_F77_C_O' => 1,
'_LT_AC_TAGCONFIG' => 1,
'AM_PROG_F77_C_O' => 1,
'm4_pattern_forbid' => 1,
'AC_CANONICAL_TARGET' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
'AC_C_VOLATILE' => 1,
'AC_TYPE_OFF_T' => 1,
'AC_C_VOLATILE' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
'AC_FUNC_WAIT3' => 1,
'AC_HEADER_TIME' => 1,
'AC_FUNC_LSTAT' => 1,
'AC_STRUCT_TM' => 1,
'AC_FUNC_WAIT3' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AC_FUNC_GETMNTENT' => 1,
'AC_STRUCT_TM' => 1,
'AC_FUNC_LSTAT' => 1,
'AC_TYPE_MODE_T' => 1,
'AC_CHECK_HEADERS' => 1,
'AC_FUNC_GETMNTENT' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_CHECK_HEADERS' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
'AC_FUNC_STRNLEN' => 1,
'm4_sinclude' => 1,
@@ -52,22 +52,22 @@
'AC_LIBSOURCE' => 1,
'AC_FUNC_MBRTOWC' => 1,
'AC_STRUCT_ST_BLOCKS' => 1,
'AC_TYPE_SIGNAL' => 1,
'AC_CANONICAL_BUILD' => 1,
'AM_PROG_FC_C_O' => 1,
'AC_CANONICAL_BUILD' => 1,
'AC_TYPE_SIGNAL' => 1,
'AC_TYPE_UID_T' => 1,
'AC_PROG_MAKE_SET' => 1,
'AC_CONFIG_AUX_DIR' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'm4_pattern_allow' => 1,
'AC_CONFIG_AUX_DIR' => 1,
'AC_PROG_MAKE_SET' => 1,
'sinclude' => 1,
'm4_pattern_allow' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_FORK' => 1,
'AC_FUNC_STRCOLL' => 1,
'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_VPRINTF' => 1,
'AC_FUNC_STRCOLL' => 1,
'AC_PROG_YACC' => 1,
'AC_SUBST_TRACE' => 1,
'AC_INIT' => 1,
@@ -79,48 +79,48 @@
'AC_CANONICAL_HOST' => 1,
'AC_FUNC_GETPGRP' => 1,
'AC_PROG_RANLIB' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_FUNC_SETPGRP' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_CONFIG_SUBDIRS' => 1,
'AC_FUNC_MMAP' => 1,
'AC_FUNC_REALLOC' => 1,
'AC_TYPE_SIZE_T' => 1,
'AC_CHECK_TYPES' => 1,
'AC_CONFIG_LINKS' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
'AC_CONFIG_LINKS' => 1,
'AC_CHECK_TYPES' => 1,
'LT_SUPPORTED_TAG' => 1,
'AC_CHECK_MEMBERS' => 1,
'AM_MAINTAINER_MODE' => 1,
'AC_FUNC_UTIME_NULL' => 1,
'AC_FUNC_SELECT_ARGTYPES' => 1,
'AC_HEADER_STAT' => 1,
'AC_FUNC_STRFTIME' => 1,
'AC_PROG_CPP' => 1,
'AC_HEADER_STAT' => 1,
'AC_C_INLINE' => 1,
'AC_PROG_LEX' => 1,
'AC_C_CONST' => 1,
'AC_PROG_CPP' => 1,
'AC_TYPE_PID_T' => 1,
'AC_C_CONST' => 1,
'AC_PROG_LEX' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
'AC_FUNC_SETVBUF_REVERSED' => 1,
'AC_PROG_INSTALL' => 1,
'AM_GNU_GETTEXT' => 1,
'AC_CHECK_LIB' => 1,
'AC_FUNC_OBSTACK' => 1,
'AC_CHECK_LIB' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_FUNC_GETGROUPS' => 1,
'AC_FUNC_GETLOADAVG' => 1,
'AC_FC_FREEFORM' => 1,
'AC_FUNC_GETLOADAVG' => 1,
'AH_OUTPUT' => 1,
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
'AC_FUNC_MKTIME' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AM_CONDITIONAL' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AC_FUNC_MKTIME' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
'AC_PROG_LN_S' => 1,
'AC_FUNC_MEMCMP' => 1,
'AC_PROG_LN_S' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
'AC_CHECK_FUNCS' => 1
@@ -140,19 +140,19 @@
{
'm4_pattern_forbid' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
'AC_C_VOLATILE' => 1,
'AC_TYPE_OFF_T' => 1,
'AC_C_VOLATILE' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
'AC_FUNC_WAIT3' => 1,
'AC_HEADER_TIME' => 1,
'AC_FUNC_LSTAT' => 1,
'AC_STRUCT_TM' => 1,
'AC_FUNC_WAIT3' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AC_FUNC_GETMNTENT' => 1,
'AC_STRUCT_TM' => 1,
'AC_FUNC_LSTAT' => 1,
'AC_TYPE_MODE_T' => 1,
'AC_FUNC_GETMNTENT' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_CHECK_HEADERS' => 1,
'AC_FUNC_STRNLEN' => 1,
@@ -171,17 +171,17 @@
'AC_STRUCT_ST_BLOCKS' => 1,
'AC_TYPE_SIGNAL' => 1,
'AC_TYPE_UID_T' => 1,
'AC_PROG_MAKE_SET' => 1,
'AC_CONFIG_AUX_DIR' => 1,
'm4_pattern_allow' => 1,
'AC_PROG_MAKE_SET' => 1,
'sinclude' => 1,
'm4_pattern_allow' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
'AC_FUNC_FORK' => 1,
'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_STRCOLL' => 1,
'AC_FUNC_FORK' => 1,
'AC_FUNC_VPRINTF' => 1,
'AC_FUNC_STRCOLL' => 1,
'AC_PROG_YACC' => 1,
'AC_INIT' => 1,
'AC_STRUCT_TIMEZONE' => 1,
@@ -203,33 +203,33 @@
'AM_MAINTAINER_MODE' => 1,
'AC_FUNC_UTIME_NULL' => 1,
'AC_FUNC_SELECT_ARGTYPES' => 1,
'AC_HEADER_STAT' => 1,
'AC_FUNC_STRFTIME' => 1,
'AC_PROG_CPP' => 1,
'AC_HEADER_STAT' => 1,
'AC_C_INLINE' => 1,
'AC_TYPE_PID_T' => 1,
'AC_PROG_LEX' => 1,
'AC_PROG_CPP' => 1,
'AC_C_CONST' => 1,
'AC_PROG_LEX' => 1,
'AC_TYPE_PID_T' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
'AC_FUNC_SETVBUF_REVERSED' => 1,
'AC_PROG_INSTALL' => 1,
'AM_GNU_GETTEXT' => 1,
'AC_CHECK_LIB' => 1,
'AC_FUNC_OBSTACK' => 1,
'AC_CHECK_LIB' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_FUNC_GETGROUPS' => 1,
'AC_FUNC_GETLOADAVG' => 1,
'AH_OUTPUT' => 1,
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
'AC_FUNC_MKTIME' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AM_CONDITIONAL' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AC_FUNC_MKTIME' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
'AC_PROG_LN_S' => 1,
'AC_FUNC_MEMCMP' => 1,
'AC_PROG_LN_S' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
'AC_CHECK_FUNCS' => 1
autom4te.cache/traces.0
+55 -53
View File
@@ -171,7 +171,7 @@ m4trace:configure.in:52: -1- AC_SUBST_TRACE([host_os])
m4trace:configure.in:52: -1- m4_pattern_allow([^host_os$])
m4trace:configure.in:102: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [autoconf/general.m4:209: AC_HELP_STRING is expanded from...
aclocal.m4:1969: AM_PATH_LISPDIR is expanded from...
aclocal.m4:1970: AM_PATH_LISPDIR is expanded from...
configure.in:102: the top level])
m4trace:configure.in:102: -1- AC_SUBST([EMACS])
m4trace:configure.in:102: -1- AC_SUBST_TRACE([EMACS])
@@ -547,7 +547,7 @@ m4trace:configure.in:483: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is ob
You should run autoupdate.], [autoconf/general.m4:2490: AC_TRY_RUN is expanded from...
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
aclocal.m4:1862: RL_LIB_READLINE_VERSION is expanded from...
aclocal.m4:1863: RL_LIB_READLINE_VERSION is expanded from...
configure.in:483: the top level])
m4trace:configure.in:483: -1- AC_DEFINE_TRACE_LITERAL([RL_READLINE_VERSION])
m4trace:configure.in:483: -1- m4_pattern_allow([^RL_READLINE_VERSION$])
@@ -711,8 +711,8 @@ m4trace:configure.in:627: -1- AC_SUBST_TRACE([MSGMERGE])
m4trace:configure.in:627: -1- m4_pattern_allow([^MSGMERGE$])
m4trace:configure.in:627: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete.
You should run autoupdate.], [autoconf/status.m4:853: AC_OUTPUT_COMMANDS is expanded from...
aclocal.m4:3825: AM_PO_SUBDIRS is expanded from...
aclocal.m4:2337: AM_GNU_GETTEXT is expanded from...
aclocal.m4:3826: AM_PO_SUBDIRS is expanded from...
aclocal.m4:2338: AM_GNU_GETTEXT is expanded from...
configure.in:627: the top level])
m4trace:configure.in:627: -1- AC_TYPE_OFF_T
m4trace:configure.in:627: -1- AC_DEFINE_TRACE_LITERAL([off_t])
@@ -778,9 +778,9 @@ You should run autoupdate.], [autoconf/general.m4:2490: AC_TRY_RUN is expanded f
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
autoconf/general.m4:1935: AC_CACHE_CHECK is expanded from...
aclocal.m4:2618: gt_INTDIV0 is expanded from...
aclocal.m4:2407: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2337: AM_GNU_GETTEXT is expanded from...
aclocal.m4:2619: gt_INTDIV0 is expanded from...
aclocal.m4:2408: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2338: AM_GNU_GETTEXT is expanded from...
configure.in:627: the top level])
m4trace:configure.in:627: -1- AC_DEFINE_TRACE_LITERAL([INTDIV0_RAISES_SIGFPE])
m4trace:configure.in:627: -1- m4_pattern_allow([^INTDIV0_RAISES_SIGFPE$])
@@ -791,10 +791,10 @@ You should run autoupdate.], [autoconf/general.m4:2384: AC_TRY_COMPILE is expand
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
autoconf/general.m4:1935: AC_CACHE_CHECK is expanded from...
aclocal.m4:2673: jm_AC_HEADER_INTTYPES_H is expanded from...
aclocal.m4:3976: jm_AC_TYPE_UINTMAX_T is expanded from...
aclocal.m4:2407: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2337: AM_GNU_GETTEXT is expanded from...
aclocal.m4:2674: jm_AC_HEADER_INTTYPES_H is expanded from...
aclocal.m4:3977: jm_AC_TYPE_UINTMAX_T is expanded from...
aclocal.m4:2408: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2338: AM_GNU_GETTEXT is expanded from...
configure.in:627: the top level])
m4trace:configure.in:627: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTTYPES_H_WITH_UINTMAX])
m4trace:configure.in:627: -1- m4_pattern_allow([^HAVE_INTTYPES_H_WITH_UINTMAX$])
@@ -806,10 +806,10 @@ You should run autoupdate.], [autoconf/general.m4:2384: AC_TRY_COMPILE is expand
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
autoconf/general.m4:1935: AC_CACHE_CHECK is expanded from...
aclocal.m4:3944: jm_AC_HEADER_STDINT_H is expanded from...
aclocal.m4:3976: jm_AC_TYPE_UINTMAX_T is expanded from...
aclocal.m4:2407: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2337: AM_GNU_GETTEXT is expanded from...
aclocal.m4:3945: jm_AC_HEADER_STDINT_H is expanded from...
aclocal.m4:3977: jm_AC_TYPE_UINTMAX_T is expanded from...
aclocal.m4:2408: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2338: AM_GNU_GETTEXT is expanded from...
configure.in:627: the top level])
m4trace:configure.in:627: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDINT_H_WITH_UINTMAX])
m4trace:configure.in:627: -1- m4_pattern_allow([^HAVE_STDINT_H_WITH_UINTMAX$])
@@ -821,10 +821,10 @@ You should run autoupdate.], [autoconf/general.m4:2426: AC_TRY_LINK is expanded
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
autoconf/general.m4:1935: AC_CACHE_CHECK is expanded from...
aclocal.m4:3999: jm_AC_TYPE_UNSIGNED_LONG_LONG is expanded from...
aclocal.m4:3976: jm_AC_TYPE_UINTMAX_T is expanded from...
aclocal.m4:2407: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2337: AM_GNU_GETTEXT is expanded from...
aclocal.m4:4000: jm_AC_TYPE_UNSIGNED_LONG_LONG is expanded from...
aclocal.m4:3977: jm_AC_TYPE_UINTMAX_T is expanded from...
aclocal.m4:2408: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2338: AM_GNU_GETTEXT is expanded from...
configure.in:627: the top level])
m4trace:configure.in:627: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNSIGNED_LONG_LONG])
m4trace:configure.in:627: -1- m4_pattern_allow([^HAVE_UNSIGNED_LONG_LONG$])
@@ -844,9 +844,9 @@ You should run autoupdate.], [autoconf/general.m4:2384: AC_TRY_COMPILE is expand
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
autoconf/general.m4:1935: AC_CACHE_CHECK is expanded from...
aclocal.m4:2645: gt_HEADER_INTTYPES_H is expanded from...
aclocal.m4:2407: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2337: AM_GNU_GETTEXT is expanded from...
aclocal.m4:2646: gt_HEADER_INTTYPES_H is expanded from...
aclocal.m4:2408: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2338: AM_GNU_GETTEXT is expanded from...
configure.in:627: the top level])
m4trace:configure.in:627: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTTYPES_H])
m4trace:configure.in:627: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
@@ -857,9 +857,9 @@ You should run autoupdate.], [autoconf/general.m4:2384: AC_TRY_COMPILE is expand
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
autoconf/general.m4:1935: AC_CACHE_CHECK is expanded from...
aclocal.m4:2705: gt_INTTYPES_PRI is expanded from...
aclocal.m4:2407: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2337: AM_GNU_GETTEXT is expanded from...
aclocal.m4:2706: gt_INTTYPES_PRI is expanded from...
aclocal.m4:2408: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2338: AM_GNU_GETTEXT is expanded from...
configure.in:627: the top level])
m4trace:configure.in:627: -1- AC_DEFINE_TRACE_LITERAL([PRI_MACROS_BROKEN])
m4trace:configure.in:627: -1- m4_pattern_allow([^PRI_MACROS_BROKEN$])
@@ -942,20 +942,20 @@ You should run autoupdate.], [autoconf/general.m4:2426: AC_TRY_LINK is expanded
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
autoconf/general.m4:1935: AC_CACHE_CHECK is expanded from...
aclocal.m4:2518: AM_ICONV_LINK is expanded from...
aclocal.m4:2546: AM_ICONV is expanded from...
aclocal.m4:2407: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2337: AM_GNU_GETTEXT is expanded from...
aclocal.m4:2519: AM_ICONV_LINK is expanded from...
aclocal.m4:2547: AM_ICONV is expanded from...
aclocal.m4:2408: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2338: AM_GNU_GETTEXT is expanded from...
configure.in:627: the top level])
m4trace:configure.in:627: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
You should run autoupdate.], [autoconf/general.m4:2426: AC_TRY_LINK is expanded from...
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
autoconf/general.m4:1935: AC_CACHE_CHECK is expanded from...
aclocal.m4:2518: AM_ICONV_LINK is expanded from...
aclocal.m4:2546: AM_ICONV is expanded from...
aclocal.m4:2407: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2337: AM_GNU_GETTEXT is expanded from...
aclocal.m4:2519: AM_ICONV_LINK is expanded from...
aclocal.m4:2547: AM_ICONV is expanded from...
aclocal.m4:2408: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2338: AM_GNU_GETTEXT is expanded from...
configure.in:627: the top level])
m4trace:configure.in:627: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ICONV])
m4trace:configure.in:627: -1- m4_pattern_allow([^HAVE_ICONV$])
@@ -971,9 +971,9 @@ m4trace:configure.in:627: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' i
You should run autoupdate.], [autoconf/general.m4:2384: AC_TRY_COMPILE is expanded from...
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
aclocal.m4:2546: AM_ICONV is expanded from...
aclocal.m4:2407: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2337: AM_GNU_GETTEXT is expanded from...
aclocal.m4:2547: AM_ICONV is expanded from...
aclocal.m4:2408: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2338: AM_GNU_GETTEXT is expanded from...
configure.in:627: the top level])
m4trace:configure.in:627: -1- AC_DEFINE_TRACE_LITERAL([ICONV_CONST])
m4trace:configure.in:627: -1- m4_pattern_allow([^ICONV_CONST$])
@@ -984,9 +984,9 @@ You should run autoupdate.], [autoconf/general.m4:2426: AC_TRY_LINK is expanded
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
autoconf/general.m4:1935: AC_CACHE_CHECK is expanded from...
aclocal.m4:1996: AM_LANGINFO_CODESET is expanded from...
aclocal.m4:2407: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2337: AM_GNU_GETTEXT is expanded from...
aclocal.m4:1997: AM_LANGINFO_CODESET is expanded from...
aclocal.m4:2408: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2338: AM_GNU_GETTEXT is expanded from...
configure.in:627: the top level])
m4trace:configure.in:627: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LANGINFO_CODESET])
m4trace:configure.in:627: -1- m4_pattern_allow([^HAVE_LANGINFO_CODESET$])
@@ -997,9 +997,9 @@ You should run autoupdate.], [autoconf/general.m4:2426: AC_TRY_LINK is expanded
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
autoconf/general.m4:1935: AC_CACHE_CHECK is expanded from...
aclocal.m4:2763: AM_LC_MESSAGES is expanded from...
aclocal.m4:2407: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2337: AM_GNU_GETTEXT is expanded from...
aclocal.m4:2764: AM_LC_MESSAGES is expanded from...
aclocal.m4:2408: AM_INTL_SUBDIR is expanded from...
aclocal.m4:2338: AM_GNU_GETTEXT is expanded from...
configure.in:627: the top level])
m4trace:configure.in:627: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LC_MESSAGES])
m4trace:configure.in:627: -1- m4_pattern_allow([^HAVE_LC_MESSAGES$])
@@ -1016,21 +1016,21 @@ You should run autoupdate.], [autoconf/general.m4:2426: AC_TRY_LINK is expanded
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
autoconf/general.m4:1935: AC_CACHE_CHECK is expanded from...
aclocal.m4:2337: AM_GNU_GETTEXT is expanded from...
aclocal.m4:2338: AM_GNU_GETTEXT is expanded from...
configure.in:627: the top level])
m4trace:configure.in:627: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
You should run autoupdate.], [autoconf/general.m4:2426: AC_TRY_LINK is expanded from...
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
autoconf/general.m4:1935: AC_CACHE_CHECK is expanded from...
aclocal.m4:2337: AM_GNU_GETTEXT is expanded from...
aclocal.m4:2338: AM_GNU_GETTEXT is expanded from...
configure.in:627: the top level])
m4trace:configure.in:627: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
You should run autoupdate.], [autoconf/general.m4:2426: AC_TRY_LINK is expanded from...
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
autoconf/general.m4:1935: AC_CACHE_CHECK is expanded from...
aclocal.m4:2337: AM_GNU_GETTEXT is expanded from...
aclocal.m4:2338: AM_GNU_GETTEXT is expanded from...
configure.in:627: the top level])
m4trace:configure.in:627: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS])
m4trace:configure.in:627: -1- m4_pattern_allow([^ENABLE_NLS$])
@@ -1635,10 +1635,12 @@ m4trace:configure.in:777: -1- AH_OUTPUT([HAVE_WCHAR_H], [/* Define to 1 if you h
m4trace:configure.in:777: -1- AC_CHECK_HEADERS([langinfo.h])
m4trace:configure.in:777: -1- AH_OUTPUT([HAVE_LANGINFO_H], [/* Define to 1 if you have the <langinfo.h> header file. */
#undef HAVE_LANGINFO_H])
m4trace:configure.in:777: -2- AC_DEFINE_TRACE_LITERAL([HAVE_MBSRTOWCS])
m4trace:configure.in:777: -2- m4_pattern_allow([^HAVE_MBSRTOWCS$])
m4trace:configure.in:777: -2- AC_DEFINE_TRACE_LITERAL([HAVE_MBRLEN])
m4trace:configure.in:777: -2- m4_pattern_allow([^HAVE_MBRLEN$])
m4trace:configure.in:777: -2- AC_DEFINE_TRACE_LITERAL([HAVE_MBSCMP])
m4trace:configure.in:777: -2- m4_pattern_allow([^HAVE_MBSCMP$])
m4trace:configure.in:777: -2- AC_DEFINE_TRACE_LITERAL([HAVE_MBSRTOWCS])
m4trace:configure.in:777: -2- m4_pattern_allow([^HAVE_MBSRTOWCS$])
m4trace:configure.in:777: -2- AC_DEFINE_TRACE_LITERAL([HAVE_WCRTOMB])
m4trace:configure.in:777: -2- m4_pattern_allow([^HAVE_WCRTOMB$])
m4trace:configure.in:777: -2- AC_DEFINE_TRACE_LITERAL([HAVE_WCSCOLL])
@@ -1672,7 +1674,7 @@ You should run autoupdate.], [autoconf/general.m4:2426: AC_TRY_LINK is expanded
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
autoconf/general.m4:1935: AC_CACHE_CHECK is expanded from...
aclocal.m4:1743: BASH_CHECK_MULTIBYTE is expanded from...
aclocal.m4:1744: BASH_CHECK_MULTIBYTE is expanded from...
configure.in:777: the top level])
m4trace:configure.in:777: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LANGINFO_CODESET])
m4trace:configure.in:777: -1- m4_pattern_allow([^HAVE_LANGINFO_CODESET$])
@@ -1681,7 +1683,7 @@ You should run autoupdate.], [autoconf/general.m4:2384: AC_TRY_COMPILE is expand
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
autoconf/general.m4:1935: AC_CACHE_CHECK is expanded from...
aclocal.m4:1743: BASH_CHECK_MULTIBYTE is expanded from...
aclocal.m4:1744: BASH_CHECK_MULTIBYTE is expanded from...
configure.in:777: the top level])
m4trace:configure.in:777: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WCHAR_T])
m4trace:configure.in:777: -1- m4_pattern_allow([^HAVE_WCHAR_T$])
@@ -1692,7 +1694,7 @@ You should run autoupdate.], [autoconf/general.m4:2384: AC_TRY_COMPILE is expand
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
autoconf/general.m4:1935: AC_CACHE_CHECK is expanded from...
aclocal.m4:1743: BASH_CHECK_MULTIBYTE is expanded from...
aclocal.m4:1744: BASH_CHECK_MULTIBYTE is expanded from...
configure.in:777: the top level])
m4trace:configure.in:777: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WCTYPE_T])
m4trace:configure.in:777: -1- m4_pattern_allow([^HAVE_WCTYPE_T$])
@@ -1703,7 +1705,7 @@ You should run autoupdate.], [autoconf/general.m4:2384: AC_TRY_COMPILE is expand
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
autoconf/general.m4:1935: AC_CACHE_CHECK is expanded from...
aclocal.m4:1743: BASH_CHECK_MULTIBYTE is expanded from...
aclocal.m4:1744: BASH_CHECK_MULTIBYTE is expanded from...
configure.in:777: the top level])
m4trace:configure.in:777: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WINT_T])
m4trace:configure.in:777: -1- m4_pattern_allow([^HAVE_WINT_T$])
@@ -1978,7 +1980,7 @@ m4trace:configure.in:857: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is ob
You should run autoupdate.], [autoconf/general.m4:2490: AC_TRY_RUN is expanded from...
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
aclocal.m4:1906: BASH_FUNC_CTYPE_NONASCII is expanded from...
aclocal.m4:1907: BASH_FUNC_CTYPE_NONASCII is expanded from...
configure.in:857: the top level])
m4trace:configure.in:857: -1- AC_DEFINE_TRACE_LITERAL([CTYPE_NON_ASCII])
m4trace:configure.in:857: -1- m4_pattern_allow([^CTYPE_NON_ASCII$])
@@ -2343,7 +2345,7 @@ m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is ob
You should run autoupdate.], [autoconf/general.m4:2490: AC_TRY_RUN is expanded from...
../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
aclocal.m4:1939: BASH_CHECK_WCONTINUED is expanded from...
aclocal.m4:1940: BASH_CHECK_WCONTINUED is expanded from...
configure.in:930: the top level])
m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([WCONTINUED_BROKEN])
m4trace:configure.in:930: -1- m4_pattern_allow([^WCONTINUED_BROKEN$])
bashline.c
+46 -32
View File
@@ -1235,6 +1235,7 @@ command_word_completion_function (hint_text, state)
static char *val = (char *)NULL;
static char *filename_hint = (char *)NULL;
static char *dequoted_hint = (char *)NULL;
static char *directory_part = (char *)NULL;
static int path_index, hint_len, dequoted_len, istate, igncase;
static int mapping_over, local_index, searching_path, hint_is_dir;
static SHELL_VAR **varlist = (SHELL_VAR **)NULL;
@@ -1268,7 +1269,18 @@ command_word_completion_function (hint_text, state)
/* Perform tilde expansion on what's passed, so we don't end up
passing filenames with tildes directly to stat(). */
if (*hint_text == '~')
hint = bash_tilde_expand (hint_text, 0);
{
hint = bash_tilde_expand (hint_text, 0);
directory_part = savestring (hint_text);
temp = strchr (directory_part, '/');
if (temp)
*temp = 0;
else
{
free (directory_part);
directory_part = (char *)NULL;
}
}
else
hint = savestring (hint_text);
@@ -1442,7 +1454,6 @@ command_word_completion_function (hint_text, state)
free (filename_hint);
filename_hint = sh_makepath (current_path, hint, 0);
free (current_path);
}
inner:
@@ -1461,9 +1472,6 @@ command_word_completion_function (hint_text, state)
else
{
int match, freetemp;
#if 0
char *temp; /* shadows previous declaration */
#endif
if (absolute_program (hint))
{
@@ -1476,26 +1484,39 @@ command_word_completion_function (hint_text, state)
filename. */
if (*hint_text == '~')
{
int l, tl, vl, dl;
char *rd, *dh;
dh = bash_dequote_filename ((char *)hint_text, 0);
int l, vl, dl, dl2, xl;
char *rd, *dh2, *expdir;
vl = strlen (val);
tl = strlen (dh);
#if 0
l = vl - hint_len; /* # of chars added */
#else
rd = savestring (filename_hint);
bash_directory_expansion (&rd);
dl = strlen (rd);
l = vl - dl; /* # of chars added */
free (rd);
#endif
temp = (char *)xmalloc (l + 2 + tl);
strcpy (temp, dh);
strcpy (temp + tl, val + vl - l);
free (dh);
dh2 = directory_part ? bash_dequote_filename (directory_part, 0) : 0;
bash_directory_expansion (&dh2);
dl2 = strlen (dh2);
expdir = bash_tilde_expand (directory_part, 0);
xl = strlen (expdir);
free (expdir);
/*
dh2 = unexpanded but dequoted tilde-prefix
dl = length of entire passed filename
dl2 = length of tilde-prefix
expdir = tilde-expanded tilde-prefix
xl = length of expanded tilde-prefix
l = length of remainder after tilde-prefix
*/
l = (vl - xl) + 1;
temp = (char *)xmalloc (dl2 + 2 + l);
strcpy (temp, dh2);
strcpy (temp + dl2, val + xl);
free (dh2);
}
else
temp = savestring (val);
@@ -2254,22 +2275,19 @@ filename_completion_ignore (names)
return 0;
}
/* Return 1 if NAME is a directory. */
/* Return 1 if NAME is a directory. NAME undergoes tilde expansion. */
static int
test_for_directory (name)
const char *name;
{
struct stat finfo;
char *fn;
int r;
fn = bash_tilde_expand (name, 0);
if (stat (fn, &finfo) != 0)
{
free (fn);
return 0;
}
r = file_isdir (fn);
free (fn);
return (S_ISDIR (finfo.st_mode));
return (r);
}
/* Remove files from NAMES, leaving directories. */
@@ -2338,9 +2356,6 @@ bash_directory_completion_hook (dirname)
return_value = should_expand_dirname = 0;
local_dirname = *dirname;
#if 0
should_expand_dirname = xstrchr (local_dirname, '$') || xstrchr (local_dirname, '`');
#else
if (xstrchr (local_dirname, '$'))
should_expand_dirname = 1;
else
@@ -2349,7 +2364,6 @@ bash_directory_completion_hook (dirname)
if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`") == 0)
should_expand_dirname = 1;
}
#endif
#if defined (HAVE_LSTAT)
if (should_expand_dirname && lstat (local_dirname, &sb) == 0)
@@ -2390,7 +2404,7 @@ bash_directory_completion_hook (dirname)
local_dirname = *dirname = new_dirname;
}
if (!no_symbolic_links && (local_dirname[0] != '.' || local_dirname[1]))
if (no_symbolic_links == 0 && (local_dirname[0] != '.' || local_dirname[1]))
{
char *temp1, *temp2;
int len1, len2;
bashline.c.save
+3191
View File
File diff suppressed because it is too large Load Diff
bashline.c.save2
+3221
View File
File diff suppressed because it is too large Load Diff
bashline.c~
+47 -32
View File
@@ -1235,6 +1235,7 @@ command_word_completion_function (hint_text, state)
static char *val = (char *)NULL;
static char *filename_hint = (char *)NULL;
static char *dequoted_hint = (char *)NULL;
static char *directory_part = (char *)NULL;
static int path_index, hint_len, dequoted_len, istate, igncase;
static int mapping_over, local_index, searching_path, hint_is_dir;
static SHELL_VAR **varlist = (SHELL_VAR **)NULL;
@@ -1268,7 +1269,18 @@ command_word_completion_function (hint_text, state)
/* Perform tilde expansion on what's passed, so we don't end up
passing filenames with tildes directly to stat(). */
if (*hint_text == '~')
hint = bash_tilde_expand (hint_text, 0);
{
hint = bash_tilde_expand (hint_text, 0);
directory_part = savestring (hint_text);
temp = strchr (directory_part, '/');
if (temp)
*temp = 0;
else
{
free (directory_part);
directory_part = (char *)NULL;
}
}
else
hint = savestring (hint_text);
@@ -1442,7 +1454,6 @@ command_word_completion_function (hint_text, state)
free (filename_hint);
filename_hint = sh_makepath (current_path, hint, 0);
free (current_path);
}
inner:
@@ -1461,9 +1472,6 @@ command_word_completion_function (hint_text, state)
else
{
int match, freetemp;
#if 0
char *temp; /* shadows previous declaration */
#endif
if (absolute_program (hint))
{
@@ -1476,26 +1484,40 @@ command_word_completion_function (hint_text, state)
filename. */
if (*hint_text == '~')
{
int l, tl, vl, dl;
char *rd, *dh;
int l, vl, dl, dl2, xl;
char *rd, *dh2, *expdir;
dh = bash_dequote_filename ((char *)hint_text, 0);
dh2 = directory_part ? bash_dequote_filename (directory_part, 0) : 0;
vl = strlen (val);
tl = strlen (dh);
#if 0
l = vl - hint_len; /* # of chars added */
#else
rd = savestring (filename_hint);
bash_directory_expansion (&rd);
dl = strlen (rd);
l = vl - dl; /* # of chars added */
free (rd);
#endif
temp = (char *)xmalloc (l + 2 + tl);
strcpy (temp, dh);
strcpy (temp + tl, val + vl - l);
free (dh);
bash_directory_expansion (&dh2);
dl2 = strlen (dh2);
expdir = bash_tilde_expand (directory_part, 0);
xl = strlen (expdir);
free (expdir);
/*
dh2 = unexpanded but dequoted tilde-prefix
dl = length of entire passed filename
dl2 = length of tilde-prefix
expdir = tilde-expanded tilde-prefix
xl = length of expanded tilde-prefix
l = length of remainder after tilde-prefix
*/
l = (vl - xl) + 1;
temp = (char *)xmalloc (dl2 + 2 + l);
strcpy (temp, dh2);
strcpy (temp + dl2, val + xl);
free (dh2);
}
else
temp = savestring (val);
@@ -2254,22 +2276,19 @@ filename_completion_ignore (names)
return 0;
}
/* Return 1 if NAME is a directory. */
/* Return 1 if NAME is a directory. NAME undergoes tilde expansion. */
static int
test_for_directory (name)
const char *name;
{
struct stat finfo;
char *fn;
int r;
fn = bash_tilde_expand (name, 0);
if (stat (fn, &finfo) != 0)
{
free (fn);
return 0;
}
r = file_isdir (fn);
free (fn);
return (S_ISDIR (finfo.st_mode));
return (r);
}
/* Remove files from NAMES, leaving directories. */
@@ -2338,9 +2357,6 @@ bash_directory_completion_hook (dirname)
return_value = should_expand_dirname = 0;
local_dirname = *dirname;
#if 0
should_expand_dirname = xstrchr (local_dirname, '$') || xstrchr (local_dirname, '`');
#else
if (xstrchr (local_dirname, '$'))
should_expand_dirname = 1;
else
@@ -2349,7 +2365,6 @@ bash_directory_completion_hook (dirname)
if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`") == 0)
should_expand_dirname = 1;
}
#endif
#if defined (HAVE_LSTAT)
if (should_expand_dirname && lstat (local_dirname, &sb) == 0)
@@ -2361,7 +2376,7 @@ bash_directory_completion_hook (dirname)
if (should_expand_dirname)
{
new_dirname = savestring (local_dirname);
wl = expand_prompt_string (new_dirname, 0); /* does the right thing */
wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB); /* does the right thing */
if (wl)
{
*dirname = string_list (wl);
@@ -2390,7 +2405,7 @@ bash_directory_completion_hook (dirname)
local_dirname = *dirname = new_dirname;
}
if (!no_symbolic_links && (local_dirname[0] != '.' || local_dirname[1]))
if (no_symbolic_links == 0 && (local_dirname[0] != '.' || local_dirname[1]))
{
char *temp1, *temp2;
int len1, len2;
config.h.in
+3
View File
@@ -638,6 +638,9 @@
/* Define if you have the mbrtowc function. */
#undef HAVE_MBRTOWC
/* Define if you have the mbscmp function. */
#undef HAVE_MBSCMP
/* Define if you have the mbsrtowcs function. */
#undef HAVE_MBSRTOWCS
config.h.in~
+11 -1
View File
@@ -356,7 +356,7 @@
#undef HAVE_SYS_ERRLIST
#undef HAVE_TZNAME
#undef HAVE_DECL_TZNAME
/* Characteristics of some of the system structures. */
@@ -413,6 +413,8 @@
#undef HAVE_DECL_STRTOLD
#undef PRI_MACROS_BROKEN
#undef STRTOLD_BROKEN
/* Define if WCONTINUED is defined in system headers, but rejected by waitpid */
@@ -529,6 +531,11 @@
/* Define if you have the fcntl function. */
#undef HAVE_FCNTL
/* Define if you have the fpurge/__fpurge function. */
#undef HAVE_FPURGE
#undef HAVE___FPURGE
#undef HAVE_DECL_FPURGE
/* Define if you have the getaddrinfo function. */
#undef HAVE_GETADDRINFO
@@ -1006,6 +1013,9 @@
/* Define if you have the `dcgettext' function. */
#undef HAVE_DCGETTEXT
/* Define if you have the `localeconv' function. */
#undef HAVE_LOCALECONV
/* Define if your system has a working `malloc' function. */
/* #undef HAVE_MALLOC */
configure
Vendored
+208 -104
View File
@@ -17793,110 +17793,6 @@ fi
done
{ echo "$as_me:$LINENO: checking for mbsrtowcs" >&5
echo $ECHO_N "checking for mbsrtowcs... $ECHO_C" >&6; }
if test "${ac_cv_func_mbsrtowcs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define mbsrtowcs to an innocuous variant, in case <limits.h> declares mbsrtowcs.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define mbsrtowcs innocuous_mbsrtowcs
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mbsrtowcs (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef mbsrtowcs
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char mbsrtowcs ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined __stub_mbsrtowcs || defined __stub___mbsrtowcs
choke me
#endif
int
main ()
{
return mbsrtowcs ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_mbsrtowcs=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_mbsrtowcs=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_mbsrtowcs" >&5
echo "${ECHO_T}$ac_cv_func_mbsrtowcs" >&6; }
if test $ac_cv_func_mbsrtowcs = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_MBSRTOWCS 1
_ACEOF
fi
{ echo "$as_me:$LINENO: checking for mbrlen" >&5
echo $ECHO_N "checking for mbrlen... $ECHO_C" >&6; }
if test "${ac_cv_func_mbrlen+set}" = set; then
@@ -18001,6 +17897,214 @@ _ACEOF
fi
{ echo "$as_me:$LINENO: checking for mbscmp" >&5
echo $ECHO_N "checking for mbscmp... $ECHO_C" >&6; }
if test "${ac_cv_func_mbscmp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define mbscmp to an innocuous variant, in case <limits.h> declares mbscmp.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define mbscmp innocuous_mbscmp
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mbscmp (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef mbscmp
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char mbscmp ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined __stub_mbscmp || defined __stub___mbscmp
choke me
#endif
int
main ()
{
return mbscmp ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_mbscmp=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_mbscmp=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_mbscmp" >&5
echo "${ECHO_T}$ac_cv_func_mbscmp" >&6; }
if test $ac_cv_func_mbscmp = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_MBSCMP 1
_ACEOF
fi
{ echo "$as_me:$LINENO: checking for mbsrtowcs" >&5
echo $ECHO_N "checking for mbsrtowcs... $ECHO_C" >&6; }
if test "${ac_cv_func_mbsrtowcs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define mbsrtowcs to an innocuous variant, in case <limits.h> declares mbsrtowcs.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define mbsrtowcs innocuous_mbsrtowcs
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mbsrtowcs (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef mbsrtowcs
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char mbsrtowcs ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined __stub_mbsrtowcs || defined __stub___mbsrtowcs
choke me
#endif
int
main ()
{
return mbsrtowcs ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_mbsrtowcs=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_mbsrtowcs=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_mbsrtowcs" >&5
echo "${ECHO_T}$ac_cv_func_mbsrtowcs" >&6; }
if test $ac_cv_func_mbsrtowcs = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_MBSRTOWCS 1
_ACEOF
fi
{ echo "$as_me:$LINENO: checking for wcrtomb" >&5
echo $ECHO_N "checking for wcrtomb... $ECHO_C" >&6; }
doc/bash.pdf
BIN
View File
Binary file not shown.
lib/sh/Makefile.in
+8 -2
View File
@@ -91,7 +91,7 @@ CSOURCES = clktck.c clock.c getcwd.c getenv.c oslib.c setlinebuf.c \
fmtulong.c fmtullong.c fmtumax.c shmatch.c strnlen.c \
strtoll.c strtoull.c strtoimax.c strtoumax.c memset.c strstr.c \
mktime.c strftime.c xstrchr.c zcatfd.c zmapfd.c winsize.c eaccess.c \
wcsdup.c fpurge.c zgetline.c
wcsdup.c fpurge.c zgetline.c mbscmp.c
# The header files for this library.
HSOURCES =
@@ -104,7 +104,7 @@ OBJECTS = clktck.o clock.o getenv.o oslib.o setlinebuf.o strnlen.o \
pathphys.o tmpfile.o stringlist.o stringvec.o spell.o shquote.o \
strtrans.o strindex.o snprintf.o mailstat.o fmtulong.o \
fmtullong.o fmtumax.o xstrchr.o zcatfd.o zmapfd.o winsize.o wcsdup.o \
fpurge.o zgetline.o ${LIBOBJS}
fpurge.o zgetline.o mbscmp.o ${LIBOBJS}
SUPPORT = Makefile
@@ -149,6 +149,7 @@ inet_aton.o: inet_aton.c
itos.o: itos.c
mailstat.o: mailstat.c
makepath.o: makepath.c
mbscmp.o: mbscmp.c
memset.o: memset.c
mktime.o: mktime.c
netconn.o: netconn.c
@@ -211,6 +212,7 @@ inet_aton.o: ${BUILD_DIR}/config.h
itos.o: ${BUILD_DIR}/config.h
mailstat.o: ${BUILD_DIR}/config.h
makepath.o: ${BUILD_DIR}/config.h
mbscmp.o: ${BUILD_DIR}/config.h
memset.o: ${BUILD_DIR}/config.h
mktime.o: ${BUILD_DIR}/config.h
netconn.o: ${BUILD_DIR}/config.h
@@ -489,3 +491,7 @@ zgetline.o: ${topdir}/bashansi.h ${BASHINCDIR}/ansi_stdlib.h
zgetline.o: ${BASHINCDIR}/stdc.h
zgetline.o: ${topdir}/xmalloc.h
zgetline.o: ${topdir}/bashtypes.h
mbscmp.o: ${topdir}/bashansi.h ${BASHINCDIR}/ansi_stdlib.h
mbscmp.o: ${BASHINCDIR}/stdc.h
mbscmp.o: ${topdir}/xmalloc.h
lib/sh/Makefile.in~
+9 -2
View File
@@ -91,7 +91,7 @@ CSOURCES = clktck.c clock.c getcwd.c getenv.c oslib.c setlinebuf.c \
fmtulong.c fmtullong.c fmtumax.c shmatch.c strnlen.c \
strtoll.c strtoull.c strtoimax.c strtoumax.c memset.c strstr.c \
mktime.c strftime.c xstrchr.c zcatfd.c zmapfd.c winsize.c eaccess.c \
wcsdup.c fpurge.c
wcsdup.c fpurge.c zgetline.c mbscmp.c
# The header files for this library.
HSOURCES =
@@ -104,7 +104,7 @@ OBJECTS = clktck.o clock.o getenv.o oslib.o setlinebuf.o strnlen.o \
pathphys.o tmpfile.o stringlist.o stringvec.o spell.o shquote.o \
strtrans.o strindex.o snprintf.o mailstat.o fmtulong.o \
fmtullong.o fmtumax.o xstrchr.o zcatfd.o zmapfd.o winsize.o wcsdup.o \
fpurge.o ${LIBOBJS}
fpurge.o zgetline.o mbscmp.o ${LIBOBJS}
SUPPORT = Makefile
@@ -186,6 +186,7 @@ wcsdup.o: wcsdup.c
xstrchr.o: xstrchr.c
zcatfd.o: zcatfd.c
zmapfd.o: zmapfd.c
zgetline.o: zgetline.c
zread.o: zread.c
zwrite.o: zwrite.c
@@ -246,6 +247,7 @@ vprint.o: ${BUILD_DIR}/config.h
wcsdup.o: ${BUILD_DIR}/config.h
xstrchr.o: ${BUILD_DIR}/config.h
zcatfd.o: ${BUILD_DIR}/config.h
zgetline.o: ${BUILD_DIR}/config.h
zmapfd.o: ${BUILD_DIR}/config.h
zread.o: ${BUILD_DIR}/config.h
zwrite.o: ${BUILD_DIR}/config.h
@@ -482,3 +484,8 @@ wcsdup.o: ${topdir}/xmalloc.h
xstrchr.o: ${topdir}/bashansi.h
xstrchr.o: ${BASHINCDIR}/ansi_stdlib.h
xstrchr.o: ${BASHINCDIR}/shmbutil.h
zgetline.o: ${topdir}/bashansi.h ${BASHINCDIR}/ansi_stdlib.h
zgetline.o: ${BASHINCDIR}/stdc.h
zgetline.o: ${topdir}/xmalloc.h
zgetline.o: ${topdir}/bashtypes.h
lib/sh/mbscmp.c
+60
View File
@@ -0,0 +1,60 @@
/* Copyright (C) 1995 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */
#include <config.h>
#if !defined (HAVE_MBSCMP) && defined (HANDLE_MULTIBYTE)
#include <stdlib.h>
#include <stddef.h>
/* Compare MBS1 and MBS2. */
int
mbscmp (mbs1, mbs2)
const char *mbs1;
const char *mbs2;
{
int len1, len2;
wchar_t c1, c2;
len1 = len2 = 0;
/* Reset multibyte characters to their initial state. */
(void) mblen ((char *) NULL, 0);
do
{
len1 = mbtowc ((wchar_t *) &c1, mbs1, MB_CUR_MAX);
len2 = mbtowc ((wchar_t *) &c2, mbs2, MB_CUR_MAX);
if (len1 == 0)
return len2 == 0 ? 0 : -1;
if (len2 == 0)
return 1;
if (len1 < 0 || len2 < 0)
/* FIXME: an illegal character appears. What to do? */
return c1 - c2;
mbs1 += len1;
mbs2 += len2;
}
while (c1 == c2);
return c1 - c2;
}
#endif
lib/sh/mbscmp.c~
+62
View File
@@ -0,0 +1,62 @@
/* Copyright (C) 1995 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */
#include <config.h>
#if !defined (HAVE_MBSCMP) && defined (HANDLE_MULTIBYTE)
#include <stdlib.h>
#include <stddef.h>
/* Compare MBS1 and MBS2. */
int
mbscmp (mbs1, mbs2)
const char *mbs1;
const char *mbs2;
{
int len1 = 0;
int len2 = 0;
uwchar_t c1;
uwchar_t c2;
/* Reset multibyte characters to their initial state. */
(void) mblen ((char *) NULL, 0);
do
{
len1 = mbtowc ((wchar_t *) &c1, mbs1, MB_CUR_MAX);
len2 = mbtowc ((wchar_t *) &c2, mbs2, MB_CUR_MAX);
if (len1 == 0)
return len2 == 0 ? 0 : -1;
if (len2 == 0)
return 1;
if (len1 < 0 || len2 < 0)
/* FIXME: an illegal character appears. What to do? */
return c1 - c2;
mbs1 += len1;
mbs2 += len2;
}
while (c1 == c2);
return c1 - c2;
}
#endif
shell.c
+1 -1
View File
@@ -143,7 +143,7 @@ int hup_on_exit = 0;
int check_jobs_at_exit = 0;
/* Non-zero means to change to a directory name supplied as a command name */
int autocd = 1;
int autocd = 0;
/* Tells what state the shell was in when it started:
0 = non-interactive shell script
shell.c~
-2
View File
@@ -1394,14 +1394,12 @@ open_shell_script (script_name)
GET_ARRAY_FROM_VAR ("BASH_LINENO", bash_lineno_v, bash_lineno_a);
array_push (bash_source_a, filename);
#if 0
if (bash_lineno_a)
{
t = itos (executing_line_number ());
array_push (bash_lineno_a, t);
free (t);
}
#endif
array_push (funcname_a, "main");
#endif