mirror of
https://https.git.savannah.gnu.org/git/bash.git
synced 2026-06-27 07:43:07 +02:00
commit bash-20051215 snapshot
This commit is contained in:
Chet Ramey
@@ -12501,3 +12501,54 @@ execute_cmd.c
|
||||
|
||||
doc/{bash.1,bashref.texi,version.texi}
|
||||
- add documentation for ulimit -[iqx] and bump revision date
|
||||
|
||||
12/12
|
||||
-----
|
||||
parse.y
|
||||
- make sure parse_compound_assignment saves and restores the
|
||||
PST_ASSIGNOK parser state flag around its calls to read_token.
|
||||
Fixes bug reported by Mike Frysinger
|
||||
|
||||
12/13
|
||||
-----
|
||||
parse.y
|
||||
- change parse_compound_assignment to save and restore the value of
|
||||
last_read_token. Not sure why it was set unconditionally in the
|
||||
first place after parsing the complete compound assignment
|
||||
|
||||
12/14
|
||||
-----
|
||||
lib/readline/text.c
|
||||
- don't use return value of rl_kill_text (which always succeeds and
|
||||
returns the number of characters killed) in rl_delete as an indication
|
||||
of success or failure
|
||||
- ditto for return value of rl_delete_text
|
||||
|
||||
lib/readline/readline.c
|
||||
- don't return the value of the called readline function as the return
|
||||
value from _rl_dispatch_subseq; -1 means something different to the
|
||||
callers (return 0 all the time to indicate that a readline function
|
||||
was found and dispatched). Fix from Andreas Schwab for <DEL><DEL>
|
||||
bug in callback interface first reported by Mike Frysinger
|
||||
|
||||
execute_cmd.c
|
||||
- fixed a typo in execute_case_command
|
||||
|
||||
12/15
|
||||
-----
|
||||
aclocal.m4
|
||||
- add check for wctype() to BASH_CHECK_MULTIBYTE, define HAVE_WCTYPE
|
||||
|
||||
config.h.in
|
||||
- add HAVE_WCTYPE #define
|
||||
|
||||
config-bot.h
|
||||
- add HAVE_WCTYPE to the set of checks for HANDLE_MULTIBYTE. This
|
||||
should catch the deficient NetBSD multibyte support
|
||||
|
||||
12/16
|
||||
-----
|
||||
parse.y
|
||||
- use CTLESC instead of literal '\001' when decode_prompt_string
|
||||
prefixes RL_PROMPT_START_IGNORE and RL_PROMPT_END_IGNORE
|
||||
|
||||
|
||||
@@ -12498,3 +12498,50 @@ builtins/read.def
|
||||
execute_cmd.c
|
||||
- change execute_command_internal to set $PIPESTATUS for ((...)) and
|
||||
[[ ... ]] commands
|
||||
|
||||
doc/{bash.1,bashref.texi,version.texi}
|
||||
- add documentation for ulimit -[iqx] and bump revision date
|
||||
|
||||
12/12
|
||||
-----
|
||||
parse.y
|
||||
- make sure parse_compound_assignment saves and restores the
|
||||
PST_ASSIGNOK parser state flag around its calls to read_token.
|
||||
Fixes bug reported by Mike Frysinger
|
||||
|
||||
12/13
|
||||
-----
|
||||
parse.y
|
||||
- change parse_compound_assignment to save and restore the value of
|
||||
last_read_token. Not sure why it was set unconditionally in the
|
||||
first place after parsing the complete compound assignment
|
||||
|
||||
12/14
|
||||
-----
|
||||
lib/readline/text.c
|
||||
- don't use return value of rl_kill_text (which always succeeds and
|
||||
returns the number of characters killed) in rl_delete as an indication
|
||||
of success or failure
|
||||
- ditto for return value of rl_delete_text
|
||||
|
||||
lib/readline/readline.c
|
||||
- don't return the value of the called readline function as the return
|
||||
value from _rl_dispatch_subseq; -1 means something different to the
|
||||
callers (return 0 all the time to indicate that a readline function
|
||||
was found and dispatched). Fix from Andreas Schwab for <DEL><DEL>
|
||||
bug in callback interface first reported by Mike Frysinger
|
||||
|
||||
execute_cmd.c
|
||||
- fixed a typo in execute_case_command
|
||||
|
||||
12/15
|
||||
-----
|
||||
aclocal.m4
|
||||
- add check for wctype() to BASH_CHECK_MULTIBYTE, define HAVE_WCTYPE
|
||||
|
||||
config.h.in
|
||||
- add HAVE_WCTYPE #define
|
||||
|
||||
config-bot.h
|
||||
- add HAVE_WCTYPE to the set of checks for HANDLE_MULTIBYTE. This
|
||||
should catch the deficient NetBSD multibyte support
|
||||
|
||||
@@ -690,6 +690,7 @@ tests/array.right f
|
||||
tests/array1.sub f
|
||||
tests/array2.sub f
|
||||
tests/array3.sub f
|
||||
tests/array4.sub f
|
||||
tests/array-at-star f
|
||||
tests/array2.right f
|
||||
tests/braces.tests f
|
||||
|
||||
Vendored
+3
@@ -1667,6 +1667,8 @@ fi
|
||||
dnl
|
||||
dnl check for availability of multibyte characters and functions
|
||||
dnl
|
||||
dnl geez, I wish I didn't have to check for all of this stuff separately
|
||||
dnl
|
||||
AC_DEFUN(BASH_CHECK_MULTIBYTE,
|
||||
[
|
||||
AC_CHECK_HEADERS(wctype.h)
|
||||
@@ -1679,6 +1681,7 @@ AC_CHECK_FUNC(mbrlen, AC_DEFINE(HAVE_MBRLEN))
|
||||
AC_CHECK_FUNC(wctomb, AC_DEFINE(HAVE_WCTOMB))
|
||||
AC_CHECK_FUNC(wcwidth, AC_DEFINE(HAVE_WCWIDTH))
|
||||
AC_CHECK_FUNC(wcsdup, AC_DEFINE(HAVE_WCSDUP))
|
||||
AC_CHECK_FUNC(wctype, AC_DEFINE(HAVE_WCTYPE))
|
||||
|
||||
AC_CACHE_CHECK([for mbstate_t], bash_cv_have_mbstate_t,
|
||||
[AC_TRY_COMPILE([
|
||||
|
||||
+109
-12
@@ -1,7 +1,7 @@
|
||||
@%:@! /bin/sh
|
||||
@%:@ From configure.in for Bash 3.1, version 3.182.
|
||||
@%:@ From configure.in for Bash 3.1, version 3.183.
|
||||
@%:@ Guess values for system-dependent variables and create Makefiles.
|
||||
@%:@ Generated by GNU Autoconf 2.59 for bash 3.1-rc2.
|
||||
@%:@ Generated by GNU Autoconf 2.59 for bash 3.2-devel.
|
||||
@%:@
|
||||
@%:@ Report bugs to <bug-bash@gnu.org>.
|
||||
@%:@
|
||||
@@ -270,8 +270,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='bash'
|
||||
PACKAGE_TARNAME='bash'
|
||||
PACKAGE_VERSION='3.1-rc2'
|
||||
PACKAGE_STRING='bash 3.1-rc2'
|
||||
PACKAGE_VERSION='3.2-devel'
|
||||
PACKAGE_STRING='bash 3.2-devel'
|
||||
PACKAGE_BUGREPORT='bug-bash@gnu.org'
|
||||
|
||||
ac_unique_file="shell.h"
|
||||
@@ -785,7 +785,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 bash 3.1-rc2 to adapt to many kinds of systems.
|
||||
\`configure' configures bash 3.2-devel to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -846,7 +846,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of bash 3.1-rc2:";;
|
||||
short | recursive ) echo "Configuration of bash 3.2-devel:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -1039,7 +1039,7 @@ fi
|
||||
test -n "$ac_init_help" && exit 0
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
bash configure 3.1-rc2
|
||||
bash configure 3.2-devel
|
||||
generated by GNU Autoconf 2.59
|
||||
|
||||
Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
@@ -1053,7 +1053,7 @@ cat >&5 <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by bash $as_me 3.1-rc2, which was
|
||||
It was created by bash $as_me 3.2-devel, which was
|
||||
generated by GNU Autoconf 2.59. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@@ -1421,8 +1421,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
|
||||
ac_config_headers="$ac_config_headers config.h"
|
||||
|
||||
|
||||
BASHVERS=3.1
|
||||
RELSTATUS=rc2
|
||||
BASHVERS=3.2
|
||||
RELSTATUS=devel
|
||||
|
||||
case "$RELSTATUS" in
|
||||
alp*|bet*|dev*|rc*) DEBUG='-DDEBUG' MALLOC_DEBUG='-DMALLOC_DEBUG' ;;
|
||||
@@ -16110,6 +16110,103 @@ _ACEOF
|
||||
|
||||
fi
|
||||
|
||||
echo "$as_me:$LINENO: checking for wctype" >&5
|
||||
echo $ECHO_N "checking for wctype... $ECHO_C" >&6
|
||||
if test "${ac_cv_func_wctype+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 wctype to an innocuous variant, in case <limits.h> declares wctype.
|
||||
For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
||||
#define wctype innocuous_wctype
|
||||
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char wctype (); 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 wctype
|
||||
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char wctype ();
|
||||
/* 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_wctype) || defined (__stub___wctype)
|
||||
choke me
|
||||
#else
|
||||
char (*f) () = wctype;
|
||||
#endif
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return f != wctype;
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_func_wctype=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_func_wctype=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_func_wctype" >&5
|
||||
echo "${ECHO_T}$ac_cv_func_wctype" >&6
|
||||
if test $ac_cv_func_wctype = yes; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
@%:@define HAVE_WCTYPE 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking for mbstate_t" >&5
|
||||
echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6
|
||||
@@ -27212,7 +27309,7 @@ _ASBOX
|
||||
} >&5
|
||||
cat >&5 <<_CSEOF
|
||||
|
||||
This file was extended by bash $as_me 3.1-rc2, which was
|
||||
This file was extended by bash $as_me 3.2-devel, which was
|
||||
generated by GNU Autoconf 2.59. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -27275,7 +27372,7 @@ _ACEOF
|
||||
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
ac_cs_version="\\
|
||||
bash config.status 3.1-rc2
|
||||
bash config.status 3.2-devel
|
||||
configured by $0, generated by GNU Autoconf 2.59,
|
||||
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
||||
+53
-52
@@ -1,4 +1,4 @@
|
||||
m4trace:configure.in:30: -1- AC_INIT([bash], [3.1-rc2], [bug-bash@gnu.org])
|
||||
m4trace:configure.in:30: -1- AC_INIT([bash], [3.2-devel], [bug-bash@gnu.org])
|
||||
m4trace:configure.in:30: -1- m4_pattern_forbid([^_?A[CHUM]_])
|
||||
m4trace:configure.in:30: -1- m4_pattern_forbid([_AC_])
|
||||
m4trace:configure.in:30: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
|
||||
@@ -64,7 +64,7 @@ m4trace:configure.in:52: -1- AC_SUBST([host_vendor], [`echo $ac_cv_host | sed 's
|
||||
m4trace:configure.in:52: -1- AC_SUBST([host_os], [`echo $ac_cv_host | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\3/'`])
|
||||
m4trace:configure.in:102: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
|
||||
You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
|
||||
aclocal.m4:1929: AM_PATH_LISPDIR is expanded from...
|
||||
aclocal.m4:1932: 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([lispdir])
|
||||
@@ -315,7 +315,7 @@ m4trace:configure.in:481: -1- AC_CHECK_LIB([ncurses], [tgetent], [bash_cv_termca
|
||||
m4trace:configure.in:481: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
|
||||
You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
|
||||
autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
|
||||
aclocal.m4:1822: RL_LIB_READLINE_VERSION is expanded from...
|
||||
aclocal.m4:1825: RL_LIB_READLINE_VERSION is expanded from...
|
||||
configure.in:481: the top level])
|
||||
m4trace:configure.in:481: -1- AC_DEFINE_TRACE_LITERAL([RL_READLINE_VERSION])
|
||||
m4trace:configure.in:481: -1- AH_OUTPUT([RL_READLINE_VERSION], [/* encoded version of the installed readline library */
|
||||
@@ -397,16 +397,16 @@ m4trace:configure.in:625: -1- AC_SUBST([XGETTEXT])
|
||||
m4trace:configure.in:625: -1- AC_SUBST([MSGMERGE])
|
||||
m4trace:configure.in:625: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete.
|
||||
You should run autoupdate.], [autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from...
|
||||
aclocal.m4:3785: AM_PO_SUBDIRS is expanded from...
|
||||
aclocal.m4:3788: AM_PO_SUBDIRS is expanded from...
|
||||
configure.in:625: AM_PO_SUBDIRS is required by...
|
||||
aclocal.m4:2297: AM_GNU_GETTEXT is expanded from...
|
||||
aclocal.m4:2300: AM_GNU_GETTEXT is expanded from...
|
||||
configure.in:625: the top level])
|
||||
m4trace:configure.in:625: -3- _m4_warn([obsolete], [The macro `_AC_OUTPUT_COMMANDS_CNT' is obsolete.
|
||||
You should run autoupdate.], [autoconf/status.m4:321: _AC_OUTPUT_COMMANDS_CNT is expanded from...
|
||||
autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from...
|
||||
aclocal.m4:3785: AM_PO_SUBDIRS is expanded from...
|
||||
aclocal.m4:3788: AM_PO_SUBDIRS is expanded from...
|
||||
configure.in:625: AM_PO_SUBDIRS is required by...
|
||||
aclocal.m4:2297: AM_GNU_GETTEXT is expanded from...
|
||||
aclocal.m4:2300: AM_GNU_GETTEXT is expanded from...
|
||||
configure.in:625: the top level])
|
||||
m4trace:configure.in:625: -1- AC_TYPE_OFF_T
|
||||
m4trace:configure.in:625: -1- AC_DEFINE_TRACE_LITERAL([off_t])
|
||||
@@ -459,11 +459,11 @@ m4trace:configure.in:625: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is ob
|
||||
You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
|
||||
autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
|
||||
autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
|
||||
aclocal.m4:2578: gt_INTDIV0 is expanded from...
|
||||
aclocal.m4:2581: gt_INTDIV0 is expanded from...
|
||||
configure.in:625: gt_INTDIV0 is required by...
|
||||
aclocal.m4:2367: AM_INTL_SUBDIR is expanded from...
|
||||
aclocal.m4:2370: AM_INTL_SUBDIR is expanded from...
|
||||
configure.in:625: AM_INTL_SUBDIR is required by...
|
||||
aclocal.m4:2297: AM_GNU_GETTEXT is expanded from...
|
||||
aclocal.m4:2300: AM_GNU_GETTEXT is expanded from...
|
||||
configure.in:625: the top level])
|
||||
m4trace:configure.in:625: -1- AC_DEFINE_TRACE_LITERAL([INTDIV0_RAISES_SIGFPE])
|
||||
m4trace:configure.in:625: -1- AH_OUTPUT([INTDIV0_RAISES_SIGFPE], [/* Define if integer division by zero raises signal SIGFPE. */
|
||||
@@ -472,13 +472,13 @@ m4trace:configure.in:625: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' i
|
||||
You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
|
||||
autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
|
||||
autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
|
||||
aclocal.m4:2633: jm_AC_HEADER_INTTYPES_H is expanded from...
|
||||
aclocal.m4:2636: jm_AC_HEADER_INTTYPES_H is expanded from...
|
||||
configure.in:625: jm_AC_HEADER_INTTYPES_H is required by...
|
||||
aclocal.m4:3936: jm_AC_TYPE_UINTMAX_T is expanded from...
|
||||
aclocal.m4:3939: jm_AC_TYPE_UINTMAX_T is expanded from...
|
||||
configure.in:625: jm_AC_TYPE_UINTMAX_T is required by...
|
||||
aclocal.m4:2367: AM_INTL_SUBDIR is expanded from...
|
||||
aclocal.m4:2370: AM_INTL_SUBDIR is expanded from...
|
||||
configure.in:625: AM_INTL_SUBDIR is required by...
|
||||
aclocal.m4:2297: AM_GNU_GETTEXT is expanded from...
|
||||
aclocal.m4:2300: AM_GNU_GETTEXT is expanded from...
|
||||
configure.in:625: the top level])
|
||||
m4trace:configure.in:625: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTTYPES_H_WITH_UINTMAX])
|
||||
m4trace:configure.in:625: -1- AH_OUTPUT([HAVE_INTTYPES_H_WITH_UINTMAX], [/* Define if <inttypes.h> exists, doesn\'t clash with <sys/types.h>, and
|
||||
@@ -488,13 +488,13 @@ m4trace:configure.in:625: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' i
|
||||
You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
|
||||
autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
|
||||
autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
|
||||
aclocal.m4:3904: jm_AC_HEADER_STDINT_H is expanded from...
|
||||
aclocal.m4:3907: jm_AC_HEADER_STDINT_H is expanded from...
|
||||
configure.in:625: jm_AC_HEADER_STDINT_H is required by...
|
||||
aclocal.m4:3936: jm_AC_TYPE_UINTMAX_T is expanded from...
|
||||
aclocal.m4:3939: jm_AC_TYPE_UINTMAX_T is expanded from...
|
||||
configure.in:625: jm_AC_TYPE_UINTMAX_T is required by...
|
||||
aclocal.m4:2367: AM_INTL_SUBDIR is expanded from...
|
||||
aclocal.m4:2370: AM_INTL_SUBDIR is expanded from...
|
||||
configure.in:625: AM_INTL_SUBDIR is required by...
|
||||
aclocal.m4:2297: AM_GNU_GETTEXT is expanded from...
|
||||
aclocal.m4:2300: AM_GNU_GETTEXT is expanded from...
|
||||
configure.in:625: the top level])
|
||||
m4trace:configure.in:625: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDINT_H_WITH_UINTMAX])
|
||||
m4trace:configure.in:625: -1- AH_OUTPUT([HAVE_STDINT_H_WITH_UINTMAX], [/* Define if <stdint.h> exists, doesn\'t clash with <sys/types.h>, and declares
|
||||
@@ -504,13 +504,13 @@ m4trace:configure.in:625: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is o
|
||||
You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
|
||||
autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
|
||||
autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
|
||||
aclocal.m4:3959: jm_AC_TYPE_UNSIGNED_LONG_LONG is expanded from...
|
||||
aclocal.m4:3962: jm_AC_TYPE_UNSIGNED_LONG_LONG is expanded from...
|
||||
configure.in:625: jm_AC_TYPE_UNSIGNED_LONG_LONG is required by...
|
||||
aclocal.m4:3936: jm_AC_TYPE_UINTMAX_T is expanded from...
|
||||
aclocal.m4:3939: jm_AC_TYPE_UINTMAX_T is expanded from...
|
||||
configure.in:625: jm_AC_TYPE_UINTMAX_T is required by...
|
||||
aclocal.m4:2367: AM_INTL_SUBDIR is expanded from...
|
||||
aclocal.m4:2370: AM_INTL_SUBDIR is expanded from...
|
||||
configure.in:625: AM_INTL_SUBDIR is required by...
|
||||
aclocal.m4:2297: AM_GNU_GETTEXT is expanded from...
|
||||
aclocal.m4:2300: AM_GNU_GETTEXT is expanded from...
|
||||
configure.in:625: the top level])
|
||||
m4trace:configure.in:625: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNSIGNED_LONG_LONG])
|
||||
m4trace:configure.in:625: -1- AH_OUTPUT([HAVE_UNSIGNED_LONG_LONG], [/* Define if you have the unsigned long long type. */
|
||||
@@ -526,11 +526,11 @@ m4trace:configure.in:625: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' i
|
||||
You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
|
||||
autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
|
||||
autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
|
||||
aclocal.m4:2605: gt_HEADER_INTTYPES_H is expanded from...
|
||||
aclocal.m4:2608: gt_HEADER_INTTYPES_H is expanded from...
|
||||
configure.in:625: gt_HEADER_INTTYPES_H is required by...
|
||||
aclocal.m4:2367: AM_INTL_SUBDIR is expanded from...
|
||||
aclocal.m4:2370: AM_INTL_SUBDIR is expanded from...
|
||||
configure.in:625: AM_INTL_SUBDIR is required by...
|
||||
aclocal.m4:2297: AM_GNU_GETTEXT is expanded from...
|
||||
aclocal.m4:2300: AM_GNU_GETTEXT is expanded from...
|
||||
configure.in:625: the top level])
|
||||
m4trace:configure.in:625: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTTYPES_H])
|
||||
m4trace:configure.in:625: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define if <inttypes.h> exists and doesn\'t clash with <sys/types.h>. */
|
||||
@@ -539,11 +539,11 @@ m4trace:configure.in:625: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' i
|
||||
You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
|
||||
autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
|
||||
autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
|
||||
aclocal.m4:2665: gt_INTTYPES_PRI is expanded from...
|
||||
aclocal.m4:2668: gt_INTTYPES_PRI is expanded from...
|
||||
configure.in:625: gt_INTTYPES_PRI is required by...
|
||||
aclocal.m4:2367: AM_INTL_SUBDIR is expanded from...
|
||||
aclocal.m4:2370: AM_INTL_SUBDIR is expanded from...
|
||||
configure.in:625: AM_INTL_SUBDIR is required by...
|
||||
aclocal.m4:2297: AM_GNU_GETTEXT is expanded from...
|
||||
aclocal.m4:2300: AM_GNU_GETTEXT is expanded from...
|
||||
configure.in:625: the top level])
|
||||
m4trace:configure.in:625: -1- AC_DEFINE_TRACE_LITERAL([PRI_MACROS_BROKEN])
|
||||
m4trace:configure.in:625: -1- AH_OUTPUT([PRI_MACROS_BROKEN], [/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
|
||||
@@ -622,21 +622,21 @@ m4trace:configure.in:625: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is o
|
||||
You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
|
||||
autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
|
||||
autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
|
||||
aclocal.m4:2478: AM_ICONV_LINK is expanded from...
|
||||
aclocal.m4:2506: AM_ICONV is expanded from...
|
||||
aclocal.m4:2367: AM_INTL_SUBDIR is expanded from...
|
||||
aclocal.m4:2481: AM_ICONV_LINK is expanded from...
|
||||
aclocal.m4:2509: AM_ICONV is expanded from...
|
||||
aclocal.m4:2370: AM_INTL_SUBDIR is expanded from...
|
||||
configure.in:625: AM_INTL_SUBDIR is required by...
|
||||
aclocal.m4:2297: AM_GNU_GETTEXT is expanded from...
|
||||
aclocal.m4:2300: AM_GNU_GETTEXT is expanded from...
|
||||
configure.in:625: the top level])
|
||||
m4trace:configure.in:625: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
|
||||
You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
|
||||
autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
|
||||
autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
|
||||
aclocal.m4:2478: AM_ICONV_LINK is expanded from...
|
||||
aclocal.m4:2506: AM_ICONV is expanded from...
|
||||
aclocal.m4:2367: AM_INTL_SUBDIR is expanded from...
|
||||
aclocal.m4:2481: AM_ICONV_LINK is expanded from...
|
||||
aclocal.m4:2509: AM_ICONV is expanded from...
|
||||
aclocal.m4:2370: AM_INTL_SUBDIR is expanded from...
|
||||
configure.in:625: AM_INTL_SUBDIR is required by...
|
||||
aclocal.m4:2297: AM_GNU_GETTEXT is expanded from...
|
||||
aclocal.m4:2300: AM_GNU_GETTEXT is expanded from...
|
||||
configure.in:625: the top level])
|
||||
m4trace:configure.in:625: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ICONV])
|
||||
m4trace:configure.in:625: -1- AH_OUTPUT([HAVE_ICONV], [/* Define if you have the iconv() function. */
|
||||
@@ -646,10 +646,10 @@ m4trace:configure.in:625: -1- AC_SUBST([LTLIBICONV])
|
||||
m4trace:configure.in:625: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
|
||||
You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
|
||||
autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
|
||||
aclocal.m4:2506: AM_ICONV is expanded from...
|
||||
aclocal.m4:2367: AM_INTL_SUBDIR is expanded from...
|
||||
aclocal.m4:2509: AM_ICONV is expanded from...
|
||||
aclocal.m4:2370: AM_INTL_SUBDIR is expanded from...
|
||||
configure.in:625: AM_INTL_SUBDIR is required by...
|
||||
aclocal.m4:2297: AM_GNU_GETTEXT is expanded from...
|
||||
aclocal.m4:2300: AM_GNU_GETTEXT is expanded from...
|
||||
configure.in:625: the top level])
|
||||
m4trace:configure.in:625: -1- AC_DEFINE_TRACE_LITERAL([ICONV_CONST])
|
||||
m4trace:configure.in:625: -1- AH_OUTPUT([ICONV_CONST], [/* Define as const if the declaration of iconv() needs const. */
|
||||
@@ -658,10 +658,10 @@ m4trace:configure.in:625: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is o
|
||||
You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
|
||||
autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
|
||||
autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
|
||||
aclocal.m4:1956: AM_LANGINFO_CODESET is expanded from...
|
||||
aclocal.m4:2367: AM_INTL_SUBDIR is expanded from...
|
||||
aclocal.m4:1959: AM_LANGINFO_CODESET is expanded from...
|
||||
aclocal.m4:2370: AM_INTL_SUBDIR is expanded from...
|
||||
configure.in:625: AM_INTL_SUBDIR is required by...
|
||||
aclocal.m4:2297: AM_GNU_GETTEXT is expanded from...
|
||||
aclocal.m4:2300: AM_GNU_GETTEXT is expanded from...
|
||||
configure.in:625: the top level])
|
||||
m4trace:configure.in:625: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LANGINFO_CODESET])
|
||||
m4trace:configure.in:625: -1- AH_OUTPUT([HAVE_LANGINFO_CODESET], [/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
|
||||
@@ -670,10 +670,10 @@ m4trace:configure.in:625: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is o
|
||||
You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
|
||||
autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
|
||||
autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
|
||||
aclocal.m4:2723: AM_LC_MESSAGES is expanded from...
|
||||
aclocal.m4:2367: AM_INTL_SUBDIR is expanded from...
|
||||
aclocal.m4:2726: AM_LC_MESSAGES is expanded from...
|
||||
aclocal.m4:2370: AM_INTL_SUBDIR is expanded from...
|
||||
configure.in:625: AM_INTL_SUBDIR is required by...
|
||||
aclocal.m4:2297: AM_GNU_GETTEXT is expanded from...
|
||||
aclocal.m4:2300: AM_GNU_GETTEXT is expanded from...
|
||||
configure.in:625: the top level])
|
||||
m4trace:configure.in:625: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LC_MESSAGES])
|
||||
m4trace:configure.in:625: -1- AH_OUTPUT([HAVE_LC_MESSAGES], [/* Define if your <locale.h> file defines LC_MESSAGES. */
|
||||
@@ -684,19 +684,19 @@ m4trace:configure.in:625: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is o
|
||||
You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
|
||||
autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
|
||||
autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
|
||||
aclocal.m4:2297: AM_GNU_GETTEXT is expanded from...
|
||||
aclocal.m4:2300: AM_GNU_GETTEXT is expanded from...
|
||||
configure.in:625: the top level])
|
||||
m4trace:configure.in:625: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
|
||||
You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
|
||||
autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
|
||||
autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
|
||||
aclocal.m4:2297: AM_GNU_GETTEXT is expanded from...
|
||||
aclocal.m4:2300: AM_GNU_GETTEXT is expanded from...
|
||||
configure.in:625: the top level])
|
||||
m4trace:configure.in:625: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
|
||||
You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
|
||||
autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
|
||||
autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
|
||||
aclocal.m4:2297: AM_GNU_GETTEXT is expanded from...
|
||||
aclocal.m4:2300: AM_GNU_GETTEXT is expanded from...
|
||||
configure.in:625: the top level])
|
||||
m4trace:configure.in:625: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS])
|
||||
m4trace:configure.in:625: -1- AH_OUTPUT([ENABLE_NLS], [/* Define to 1 if translation of program messages to the user\'s native
|
||||
@@ -1212,18 +1212,19 @@ m4trace:configure.in:773: -2- AC_DEFINE_TRACE_LITERAL([HAVE_MBRLEN])
|
||||
m4trace:configure.in:773: -2- AC_DEFINE_TRACE_LITERAL([HAVE_WCTOMB])
|
||||
m4trace:configure.in:773: -2- AC_DEFINE_TRACE_LITERAL([HAVE_WCWIDTH])
|
||||
m4trace:configure.in:773: -2- AC_DEFINE_TRACE_LITERAL([HAVE_WCSDUP])
|
||||
m4trace:configure.in:773: -2- AC_DEFINE_TRACE_LITERAL([HAVE_WCTYPE])
|
||||
m4trace:configure.in:773: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
|
||||
You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
|
||||
autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
|
||||
autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
|
||||
aclocal.m4:1703: BASH_CHECK_MULTIBYTE is expanded from...
|
||||
aclocal.m4:1706: BASH_CHECK_MULTIBYTE is expanded from...
|
||||
configure.in:773: the top level])
|
||||
m4trace:configure.in:773: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MBSTATE_T])
|
||||
m4trace:configure.in:773: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
|
||||
You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
|
||||
autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
|
||||
autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
|
||||
aclocal.m4:1703: BASH_CHECK_MULTIBYTE is expanded from...
|
||||
aclocal.m4:1706: BASH_CHECK_MULTIBYTE is expanded from...
|
||||
configure.in:773: the top level])
|
||||
m4trace:configure.in:773: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LANGINFO_CODESET])
|
||||
m4trace:configure.in:777: -1- AC_CHECK_LIB([dl], [dlopen])
|
||||
@@ -1467,7 +1468,7 @@ m4trace:configure.in:849: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LSTAT])
|
||||
m4trace:configure.in:853: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
|
||||
You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
|
||||
autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
|
||||
aclocal.m4:1866: BASH_FUNC_CTYPE_NONASCII is expanded from...
|
||||
aclocal.m4:1869: BASH_FUNC_CTYPE_NONASCII is expanded from...
|
||||
configure.in:853: the top level])
|
||||
m4trace:configure.in:853: -1- AC_DEFINE_TRACE_LITERAL([CTYPE_NON_ASCII])
|
||||
m4trace:configure.in:854: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
|
||||
@@ -1721,7 +1722,7 @@ m4trace:configure.in:923: -1- AC_DEFINE_TRACE_LITERAL([FIONREAD_IN_SYS_IOCTL])
|
||||
m4trace:configure.in:925: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
|
||||
You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
|
||||
autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
|
||||
aclocal.m4:1899: BASH_CHECK_WCONTINUED is expanded from...
|
||||
aclocal.m4:1902: BASH_CHECK_WCONTINUED is expanded from...
|
||||
configure.in:925: the top level])
|
||||
m4trace:configure.in:925: -1- AC_DEFINE_TRACE_LITERAL([WCONTINUED_BROKEN])
|
||||
m4trace:configure.in:928: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
|
||||
|
||||
+1
-1
@@ -133,7 +133,7 @@
|
||||
#if defined (HAVE_WCTYPE_H) && defined (HAVE_WCHAR_H)
|
||||
# include <wchar.h>
|
||||
# include <wctype.h>
|
||||
# if defined (HAVE_MBSRTOWCS) && defined (HAVE_MBRTOWC) && defined (HAVE_MBRLEN) && defined (HAVE_WCWIDTH)
|
||||
# if defined (HAVE_MBSRTOWCS) && defined (HAVE_MBRTOWC) && defined (HAVE_MBRLEN) && defined (HAVE_WCWIDTH) && defined (HAVE_WCTYPE)
|
||||
/* system is supposed to support XPG5 */
|
||||
# define HANDLE_MULTIBYTE 1
|
||||
# endif
|
||||
|
||||
@@ -769,6 +769,9 @@
|
||||
/* Define if you have the wctomb function. */
|
||||
#undef HAVE_WCTOMB
|
||||
|
||||
/* Define if you have the wctype function. */
|
||||
#undef HAVE_WCTYPE
|
||||
|
||||
/* Define if you have the wcwidth function. */
|
||||
#undef HAVE_WCWIDTH
|
||||
|
||||
|
||||
+2
-2
@@ -24,8 +24,8 @@ dnl Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_REVISION([for Bash 3.1, version 3.183])dnl
|
||||
|
||||
define(bashvers, 3.1)
|
||||
define(relstatus, release)
|
||||
define(bashvers, 3.2)
|
||||
define(relstatus, devel)
|
||||
|
||||
AC_INIT(bash, bashvers-relstatus, bug-bash@gnu.org)
|
||||
|
||||
|
||||
+1
-1
@@ -2198,7 +2198,7 @@ execute_case_command (case_command)
|
||||
if (echo_command_at_execute)
|
||||
xtrace_print_case_command_head (case_command);
|
||||
|
||||
if (signal_in_progress (DEBUG_TRAP == 0) && (this_command_name == 0 || (STREQ (this_command_name, "trap") == 0)))
|
||||
if (signal_in_progress (DEBUG_TRAP) == 0 && (this_command_name == 0 || (STREQ (this_command_name, "trap") == 0)))
|
||||
{
|
||||
FREE (the_printed_command_except_trap);
|
||||
the_printed_command_except_trap = savestring (the_printed_command);
|
||||
|
||||
@@ -220,7 +220,7 @@ expand_prompt (pmt, lp, lip, niflp, vlp)
|
||||
char *pmt;
|
||||
int *lp, *lip, *niflp, *vlp;
|
||||
{
|
||||
char *r, *ret, *p;
|
||||
char *r, *ret, *p, *igstart;
|
||||
int l, rl, last, ignoring, ninvis, invfl, invflset, ind, pind, physchars;
|
||||
|
||||
/* Short-circuit if we can. */
|
||||
@@ -244,13 +244,15 @@ expand_prompt (pmt, lp, lip, niflp, vlp)
|
||||
invfl = 0; /* invisible chars in first line of prompt */
|
||||
invflset = 0; /* we only want to set invfl once */
|
||||
|
||||
igstart = -1;
|
||||
for (rl = ignoring = last = ninvis = physchars = 0, p = pmt; p && *p; p++)
|
||||
{
|
||||
/* This code strips the invisible character string markers
|
||||
RL_PROMPT_START_IGNORE and RL_PROMPT_END_IGNORE */
|
||||
if (*p == RL_PROMPT_START_IGNORE)
|
||||
if (*p == RL_PROMPT_START_IGNORE) /* XXX - check ignoring? */
|
||||
{
|
||||
ignoring++;
|
||||
ignoring = 1;
|
||||
igstart = p;
|
||||
continue;
|
||||
}
|
||||
else if (ignoring && *p == RL_PROMPT_END_IGNORE)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -714,7 +714,7 @@ _rl_dispatch_subseq (key, map, got_subseq)
|
||||
|
||||
rl_dispatching = 1;
|
||||
RL_SETSTATE(RL_STATE_DISPATCHING);
|
||||
r = (*map[key].function)(rl_numeric_arg * rl_arg_sign, key);
|
||||
(*map[key].function)(rl_numeric_arg * rl_arg_sign, key);
|
||||
RL_UNSETSTATE(RL_STATE_DISPATCHING);
|
||||
rl_dispatching = 0;
|
||||
|
||||
|
||||
+7
-9
@@ -1071,7 +1071,7 @@ int
|
||||
rl_delete (count, key)
|
||||
int count, key;
|
||||
{
|
||||
int r;
|
||||
int xpoint;
|
||||
|
||||
if (count < 0)
|
||||
return (_rl_rubout_char (-count, key));
|
||||
@@ -1084,23 +1084,21 @@ rl_delete (count, key)
|
||||
|
||||
if (count > 1 || rl_explicit_arg)
|
||||
{
|
||||
int orig_point = rl_point;
|
||||
xpoint = rl_point;
|
||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||
rl_forward_char (count, key);
|
||||
else
|
||||
rl_forward_byte (count, key);
|
||||
|
||||
r = rl_kill_text (orig_point, rl_point);
|
||||
rl_point = orig_point;
|
||||
return r;
|
||||
rl_kill_text (xpoint, rl_point);
|
||||
rl_point = xpoint;
|
||||
}
|
||||
else
|
||||
{
|
||||
int new_point;
|
||||
|
||||
new_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO);
|
||||
return (rl_delete_text (rl_point, new_point));
|
||||
xpoint = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO);
|
||||
rl_delete_text (rl_point, xpoint);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Delete the character under the cursor, unless the insertion
|
||||
|
||||
@@ -3695,7 +3695,9 @@ got_token:
|
||||
struct builtin *b;
|
||||
b = builtin_address_internal (token, 0);
|
||||
if (b && (b->flags & ASSIGNMENT_BUILTIN))
|
||||
parser_state |= PST_ASSIGNOK;
|
||||
parser_state |= PST_ASSIGNOK;
|
||||
else if (STREQ (token, "eval") || STREQ (token, "let"))
|
||||
parser_state |= PST_ASSIGNOK;
|
||||
}
|
||||
|
||||
yylval.word = the_word;
|
||||
@@ -4246,7 +4248,7 @@ decode_prompt_string (string)
|
||||
break;
|
||||
}
|
||||
temp = (char *)xmalloc (3);
|
||||
temp[0] = '\001';
|
||||
temp[0] = CTLESC;
|
||||
temp[1] = (c == '[') ? RL_PROMPT_START_IGNORE : RL_PROMPT_END_IGNORE;
|
||||
temp[2] = '\0';
|
||||
goto add_string;
|
||||
@@ -4686,18 +4688,21 @@ parse_compound_assignment (retlenp)
|
||||
int *retlenp;
|
||||
{
|
||||
WORD_LIST *wl, *rl;
|
||||
int tok, orig_line_number, orig_token_size;
|
||||
int tok, orig_line_number, orig_token_size, orig_last_token, assignok;
|
||||
char *saved_token, *ret;
|
||||
|
||||
saved_token = token;
|
||||
orig_token_size = token_buffer_size;
|
||||
orig_line_number = line_number;
|
||||
orig_last_token = last_read_token;
|
||||
|
||||
last_read_token = WORD; /* WORD to allow reserved words here */
|
||||
|
||||
token = (char *)NULL;
|
||||
token_buffer_size = 0;
|
||||
|
||||
assignok = parser_state&PST_ASSIGNOK; /* XXX */
|
||||
|
||||
wl = (WORD_LIST *)NULL; /* ( */
|
||||
parser_state |= PST_COMPASSIGN;
|
||||
|
||||
@@ -4740,7 +4745,7 @@ parse_compound_assignment (retlenp)
|
||||
jump_to_top_level (DISCARD);
|
||||
}
|
||||
|
||||
last_read_token = WORD;
|
||||
last_read_token = orig_last_token; /* XXX - was WORD? */
|
||||
if (wl)
|
||||
{
|
||||
rl = REVERSE_LIST (wl, WORD_LIST *);
|
||||
@@ -4752,6 +4757,10 @@ parse_compound_assignment (retlenp)
|
||||
|
||||
if (retlenp)
|
||||
*retlenp = (ret && *ret) ? strlen (ret) : 0;
|
||||
|
||||
if (assignok)
|
||||
parser_state |= PST_ASSIGNOK;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
+6
-4
@@ -137,6 +137,8 @@ value = new1 new2 new3
|
||||
|
||||
|
||||
7 8 9
|
||||
8 11
|
||||
8 11
|
||||
|
||||
a b c d e f g
|
||||
for case if then else
|
||||
@@ -144,10 +146,10 @@ for case if then else
|
||||
12 14 16 18 20
|
||||
4414758999202
|
||||
aaa bbb
|
||||
./array.tests: line 282: syntax error near unexpected token `<>'
|
||||
./array.tests: line 282: `metas=( <> < > ! )'
|
||||
./array.tests: line 283: syntax error near unexpected token `<>'
|
||||
./array.tests: line 283: `metas=( [1]=<> [2]=< [3]=> [4]=! )'
|
||||
./array.tests: line 285: syntax error near unexpected token `<>'
|
||||
./array.tests: line 285: `metas=( <> < > ! )'
|
||||
./array.tests: line 286: syntax error near unexpected token `<>'
|
||||
./array.tests: line 286: `metas=( [1]=<> [2]=< [3]=> [4]=! )'
|
||||
abc 3
|
||||
case 4
|
||||
abc case if then else 5
|
||||
|
||||
@@ -242,6 +242,9 @@ ${THIS_SH} ./array2.sub
|
||||
# some old bugs and ksh93 compatibility tests
|
||||
${THIS_SH} ./array3.sub
|
||||
|
||||
# some compound assingment parsing problems that showed up in bash-3.1-release
|
||||
${THIS_SH} ./array4.sub
|
||||
|
||||
set +u
|
||||
cd /tmp
|
||||
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
# compound assignment parsing problems in bash-3.1-release
|
||||
func()
|
||||
{
|
||||
local -a x=() y=()
|
||||
}
|
||||
|
||||
a=() b=()
|
||||
eval foo=()
|
||||
eval foo=() bar=() qux=( "bash" )
|
||||
|
||||
foo=( "bash" )
|
||||
eval foo=( "bash" )
|
||||
eval bar=( "bash" ) bax=( "bash" )
|
||||
|
||||
let a=(5 + 3) b=(4 + 7)
|
||||
echo $a $b
|
||||
|
||||
typeset -i a b
|
||||
a=(5+3) b=(4+7)
|
||||
echo $a $b
|
||||
Reference in New Issue
Block a user