From: Chet Ramey Date: Wed, 7 Dec 2011 14:15:18 +0000 (-0500) Subject: commit bash-20071121 snapshot X-Git-Tag: bash-4.0-alpha~33 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d85af6d70010e90363e56950783b6a519f7916c;p=thirdparty%2Fbash.git commit bash-20071121 snapshot --- diff --git a/CWRU/CWRU.chlog b/CWRU/CWRU.chlog index 9e94cd5e1..4e479eb3a 100644 --- a/CWRU/CWRU.chlog +++ b/CWRU/CWRU.chlog @@ -14999,7 +14999,7 @@ execute_cmd.c ---- builtins/read.def - make sure the return value from get_word_from_string is freed if - non-null. Fixes bug reported by Lars Ellenberg + non-null. Fixes memory leak bug reported by Lars Ellenberg 11/10 @@ -15038,3 +15038,14 @@ variables.c - replace the rng in brand() with a slightly better one from FreeBSD (filtered through Mac OS X 10.5). Replacement suggested by Steve Grubb + + 11/21 + ----- +configure.in + - darwin 9 also requires linking against libreadline.a and + libhistory.a because of Apple's questionable decision to ship a + libreadline "replacement" that doesn't provide all functions + +doc/{bash.1,bashref.texi} + - slight change to the text describing the effect of set -e when + in a || or && list diff --git a/CWRU/CWRU.chlog~ b/CWRU/CWRU.chlog~ index fcdd3856b..79ae7d8d2 100644 --- a/CWRU/CWRU.chlog~ +++ b/CWRU/CWRU.chlog~ @@ -15024,7 +15024,7 @@ subst.c unchanged in that case. Fixes tab completion bug reported by Heikki Hokkanen (debian bug 451263) -lib/readline/display.c +lib/readline/mbutil.c - fix _rl_find_next_mbchar_internal to deal with invalid multibyte character sequences when finding non-zero-length chars. Fixes bug reported by Morita Sho @@ -15038,3 +15038,14 @@ variables.c - replace the rng in brand() with a slightly better one from FreeBSD (filtered through Mac OS X 10.5). Replacement suggested by Steve Grubb + + 11/21 + ----- +configure.in + - darwin 9 also requires linking against libreadline.a and + libhistory.a because of Apple's questionable decision to ship a + libreadline "replacement" that doesn't provide all functions + +doc/{bash.1,bashref.texi} + - slight change to the text describing the effect of set -e when + in a || or && list diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0 index c7f900068..0c0b6b094 100644 --- a/autom4te.cache/output.0 +++ b/autom4te.cache/output.0 @@ -1,5 +1,5 @@ @%:@! /bin/sh -@%:@ From configure.in for Bash 3.2, version 3.196. +@%:@ From configure.in for Bash 3.2, version 3.197. @%:@ Guess values for system-dependent variables and create Makefiles. @%:@ Generated by GNU Autoconf 2.60 for bash 3.2-maint. @%:@ @@ -5847,7 +5847,7 @@ _ACEOF # static version specified as -llibname to override the # dynamic version case "${host_os}" in - darwin8*) READLINE_LIB='${READLINE_LIBRARY}' ;; + darwin[89]*) READLINE_LIB='${READLINE_LIBRARY}' ;; *) READLINE_LIB=-lreadline ;; esac fi @@ -5888,7 +5888,7 @@ _ACEOF # static version specified as -llibname to override the # dynamic version case "${host_os}" in - darwin8*) HISTORY_LIB='${HISTORY_LIBRARY}' ;; + darwin[89]*) HISTORY_LIB='${HISTORY_LIBRARY}' ;; *) HISTORY_LIB=-lhistory ;; esac fi diff --git a/autom4te.cache/requests b/autom4te.cache/requests index 2f79940c6..eb547fc11 100644 --- a/autom4te.cache/requests +++ b/autom4te.cache/requests @@ -79,8 +79,8 @@ 'AC_CANONICAL_HOST' => 1, 'AC_FUNC_GETPGRP' => 1, 'AC_PROG_RANLIB' => 1, - 'AC_FUNC_SETPGRP' => 1, 'AM_INIT_AUTOMAKE' => 1, + 'AC_FUNC_SETPGRP' => 1, 'AC_CONFIG_SUBDIRS' => 1, 'AC_FUNC_MMAP' => 1, 'AC_FUNC_REALLOC' => 1, @@ -125,115 +125,6 @@ 'AC_HEADER_DIRENT' => 1, 'AC_CHECK_FUNCS' => 1 } - ], 'Autom4te::Request' ), - bless( [ - '1', - 1, - [ - '/usr/local/share/autoconf' - ], - [ - '/usr/local/share/autoconf/autoconf/autoconf.m4f', - 'aclocal.m4', - 'configure.in' - ], - { - 'm4_pattern_forbid' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 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_HEADER_TIME' => 1, - 'AC_FUNC_WAIT3' => 1, - 'AM_AUTOMAKE_VERSION' => 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, - 'm4_sinclude' => 1, - 'AC_PROG_CXX' => 1, - 'AC_PATH_X' => 1, - 'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1, - 'AC_PROG_AWK' => 1, - '_m4_warn' => 1, - 'AC_HEADER_STDC' => 1, - 'AC_HEADER_MAJOR' => 1, - 'AC_FUNC_ERROR_AT_LINE' => 1, - 'AC_PROG_GCC_TRADITIONAL' => 1, - 'AC_LIBSOURCE' => 1, - 'AC_FUNC_MBRTOWC' => 1, - 'AC_STRUCT_ST_BLOCKS' => 1, - 'AC_TYPE_SIGNAL' => 1, - 'AC_TYPE_UID_T' => 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_VPRINTF' => 1, - 'AC_FUNC_STRCOLL' => 1, - 'AC_PROG_YACC' => 1, - 'AC_INIT' => 1, - 'AC_STRUCT_TIMEZONE' => 1, - 'AC_FUNC_CHOWN' => 1, - 'AC_SUBST' => 1, - 'AC_FUNC_ALLOCA' => 1, - 'AC_CANONICAL_HOST' => 1, - 'AC_FUNC_GETPGRP' => 1, - 'AC_PROG_RANLIB' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'AC_FUNC_SETPGRP' => 1, - 'AC_CONFIG_SUBDIRS' => 1, - 'AC_FUNC_MMAP' => 1, - 'AC_FUNC_REALLOC' => 1, - 'AC_TYPE_SIZE_T' => 1, - 'AC_CONFIG_LINKS' => 1, - 'AC_CHECK_TYPES' => 1, - 'AC_CHECK_MEMBERS' => 1, - 'AM_MAINTAINER_MODE' => 1, - 'AC_FUNC_UTIME_NULL' => 1, - 'AC_FUNC_SELECT_ARGTYPES' => 1, - 'AC_FUNC_STRFTIME' => 1, - 'AC_HEADER_STAT' => 1, - 'AC_C_INLINE' => 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_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, - 'AM_CONDITIONAL' => 1, - 'AC_CANONICAL_SYSTEM' => 1, - 'AC_FUNC_MKTIME' => 1, - 'AC_CONFIG_HEADERS' => 1, - 'AC_HEADER_SYS_WAIT' => 1, - 'AC_FUNC_MEMCMP' => 1, - 'AC_PROG_LN_S' => 1, - 'm4_include' => 1, - 'AC_HEADER_DIRENT' => 1, - 'AC_CHECK_FUNCS' => 1 - } ], 'Autom4te::Request' ) ); diff --git a/configure b/configure index 2896509fe..0adc75bb6 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in for Bash 3.2, version 3.196. +# From configure.in for Bash 3.2, version 3.197. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.60 for bash 3.2-maint. # @@ -5847,7 +5847,7 @@ _ACEOF # static version specified as -llibname to override the # dynamic version case "${host_os}" in - darwin8*) READLINE_LIB='${READLINE_LIBRARY}' ;; + darwin[89]*) READLINE_LIB='${READLINE_LIBRARY}' ;; *) READLINE_LIB=-lreadline ;; esac fi @@ -5888,7 +5888,7 @@ _ACEOF # static version specified as -llibname to override the # dynamic version case "${host_os}" in - darwin8*) HISTORY_LIB='${HISTORY_LIBRARY}' ;; + darwin[89]*) HISTORY_LIB='${HISTORY_LIBRARY}' ;; *) HISTORY_LIB=-lhistory ;; esac fi diff --git a/configure.in b/configure.in index 7b6ca0089..ade171466 100644 --- a/configure.in +++ b/configure.in @@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure script. # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -AC_REVISION([for Bash 3.2, version 3.196])dnl +AC_REVISION([for Bash 3.2, version 3.197])dnl define(bashvers, 3.2) define(relstatus, maint) @@ -518,7 +518,7 @@ if test $opt_readline = yes; then # static version specified as -llibname to override the # dynamic version case "${host_os}" in - darwin8*) READLINE_LIB='${READLINE_LIBRARY}' ;; + darwin[[89]]*) READLINE_LIB='${READLINE_LIBRARY}' ;; *) READLINE_LIB=-lreadline ;; esac fi @@ -553,7 +553,7 @@ if test $opt_history = yes || test $opt_bang_history = yes; then # static version specified as -llibname to override the # dynamic version case "${host_os}" in - darwin8*) HISTORY_LIB='${HISTORY_LIBRARY}' ;; + darwin[[89]]*) HISTORY_LIB='${HISTORY_LIBRARY}' ;; *) HISTORY_LIB=-lhistory ;; esac fi diff --git a/configure.in~ b/configure.in~ index 0254e760d..440bde9f7 100644 --- a/configure.in~ +++ b/configure.in~ @@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure script. # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -AC_REVISION([for Bash 3.2, version 3.195])dnl +AC_REVISION([for Bash 3.2, version 3.196])dnl define(bashvers, 3.2) define(relstatus, maint) @@ -518,7 +518,7 @@ if test $opt_readline = yes; then # static version specified as -llibname to override the # dynamic version case "${host_os}" in - darwin8*) READLINE_LIB='${READLINE_LIBRARY}' ;; + darwin[[89]]*) READLINE_LIB='${READLINE_LIBRARY}' ;; *) READLINE_LIB=-lreadline ;; esac fi @@ -553,7 +553,7 @@ if test $opt_history = yes || test $opt_bang_history = yes; then # static version specified as -llibname to override the # dynamic version case "${host_os}" in - darwin8*) HISTORY_LIB='${HISTORY_LIBRARY}' ;; + darwin[[89]]*) HISTORY_LIB='${HISTORY_LIBRARY}' ;; *) HISTORY_LIB=-lhistory ;; esac fi @@ -893,6 +893,7 @@ dnl presence and behavior of C library functions BASH_FUNC_STRSIGNAL BASH_FUNC_OPENDIR_CHECK BASH_FUNC_ULIMIT_MAXFDS +BASH_FUNC_FPURGE BASH_FUNC_GETENV if test "$ac_cv_func_getcwd" = "yes"; then BASH_FUNC_GETCWD @@ -1077,12 +1078,17 @@ esac if test -z "$localedir"; then localedir='${datarootdir}/locale' fi +if test -z "$datarootdir"; then + datarootdir='${prefix}/share' +fi AC_SUBST(PROFILE_FLAGS) AC_SUBST(incdir) AC_SUBST(BUILD_DIR) +# Some versions of autoconf don't substitute these automatically +AC_SUBST(datarootdir) AC_SUBST(localedir) AC_SUBST(YACC) diff --git a/ddd1 b/ddd1 new file mode 100644 index 000000000..7f075f9cd --- /dev/null +++ b/ddd1 @@ -0,0 +1,13 @@ +*** ../bash-3.2-patched/version.c 2005-05-16 11:58:34.000000000 -0400 +--- version.c 2007-11-23 16:03:40.000000000 -0500 +*************** +*** 80,83 **** + printf ("GNU bash, version %s (%s)\n", shell_version_string (), MACHTYPE); + if (extended) +! printf (_("Copyright (C) 2005 Free Software Foundation, Inc.\n")); + } +--- 80,83 ---- + printf ("GNU bash, version %s (%s)\n", shell_version_string (), MACHTYPE); + if (extended) +! printf (_("Copyright (C) 2007 Free Software Foundation, Inc.\n")); + } diff --git a/ddd1~ b/ddd1~ index 408781620..591be62e6 100644 --- a/ddd1~ +++ b/ddd1~ @@ -1,54 +1,42 @@ -*** builtins/printf.def Fri Feb 2 20:00:48 2007 ---- ../bash-3.2-patched/builtins/printf.def Mon Nov 13 08:58:52 2006 +*** ../bash-3.2-patched/version.c 2005-05-16 11:58:34.000000000 -0400 +--- version.c 2007-11-23 16:03:40.000000000 -0500 *************** -*** 2,6 **** - It implements the builtin "printf" in Bash. +*** 34,46 **** -! Copyright (C) 1997-2006 Free Software Foundation, Inc. + /* Defines from version.h */ +! const char *dist_version = DISTVERSION; +! int patch_level = PATCHLEVEL; +! int build_version = BUILDVERSION; + #ifdef RELSTATUS +! const char *release_status = RELSTATUS; + #else +! const char *release_status = (char *)0; + #endif +! const char *sccs_version = SCCSVERSION; - This file is part of GNU Bash, the Bourne Again SHell. ---- 2,6 ---- - It implements the builtin "printf" in Bash. + /* Functions for getting, setting, and displaying the shell version. */ +--- 34,46 ---- -! Copyright (C) 1997-2005 Free Software Foundation, Inc. + /* Defines from version.h */ +! const char * const dist_version = DISTVERSION; +! const int patch_level = PATCHLEVEL; +! const int build_version = BUILDVERSION; + #ifdef RELSTATUS +! const char * const release_status = RELSTATUS; + #else +! const char * const release_status = (char *)0; + #endif +! const char * const sccs_version = SCCSVERSION; - This file is part of GNU Bash, the Bourne Again SHell. + /* Functions for getting, setting, and displaying the shell version. */ *************** -*** 27,32 **** - printf formats and prints ARGUMENTS under control of the FORMAT. FORMAT - is a character string which contains three types of objects: plain -! characters, which are simply copied to standard output; character escape -! sequences, which are converted and copied to the standard output; and - format specifications, each of which causes printing of the next successive - argument. In addition to the standard printf(1) formats, %b means to ---- 27,32 ---- - printf formats and prints ARGUMENTS under control of the FORMAT. FORMAT - is a character string which contains three types of objects: plain -! characters, which are simply copied to standard output, character escape -! sequences which are converted and copied to the standard output, and - format specifications, each of which causes printing of the next successive - argument. In addition to the standard printf(1) formats, %b means to -*************** -*** 71,78 **** - #include "common.h" - -- #if defined (PRI_MACROS_BROKEN) -- # undef PRIdMAX -- #endif -- - #if !defined (PRIdMAX) - # if HAVE_LONG_LONG ---- 71,74 ---- -*************** -*** 555,559 **** - char *s; - { -! builtin_error (_("warning: %s: %s"), s, strerror(ERANGE)); +*** 80,83 **** + printf ("GNU bash, version %s (%s)\n", shell_version_string (), MACHTYPE); + if (extended) +! printf (_("Copyright (C) 2005 Free Software Foundation, Inc.\n")); } - ---- 551,555 ---- - char *s; - { -! builtin_error ("warning: %s: %s", s, strerror(ERANGE)); +--- 80,83 ---- + printf ("GNU bash, version %s (%s)\n", shell_version_string (), MACHTYPE); + if (extended) +! printf (_("Copyright (C) 2007 Free Software Foundation, Inc.\n")); } - diff --git a/doc/Makefile b/doc/Makefile index cdc927f6b..15c972610 120000 --- a/doc/Makefile +++ b/doc/Makefile @@ -1 +1 @@ -/usr/local/build/chet/bash/bash-current/doc/Makefile \ No newline at end of file +/usr/local/build/bash/bash-current/doc/Makefile \ No newline at end of file diff --git a/doc/bash.1 b/doc/bash.1 index 080f3cbb7..556c8c5fa 100644 --- a/doc/bash.1 +++ b/doc/bash.1 @@ -5,12 +5,13 @@ .\" Case Western Reserve University .\" chet@po.cwru.edu .\" -.\" Last Change: Fri Sep 14 13:44:37 EDT 2007 +.\" Last Change: Wed Nov 21 22:39:33 EST 2007 + .\" .\" bash_builtins, strip all but Built-Ins section .if \n(zZ=1 .ig zZ .if \n(zY=1 .ig zY -.TH BASH 1 "2007 September 14" "GNU Bash-3.2" +.TH BASH 1 "2007 November 21" "GNU Bash-3.2" .\" .\" There's some problem with having a `@' .\" in a tagged paragraph with the BSD man macros. @@ -7665,7 +7666,7 @@ or keyword, part of the test in an .B if -statement, part of a +statement, part of a command executed in a .B && or .B \(bv\(bv @@ -8491,7 +8492,7 @@ or keyword, part of the test in an .I if -statement, part of a +statement, part of a command executed in a .B && or .B \(bv\(bv diff --git a/doc/bash.1~ b/doc/bash.1~ index c1b4c5c9f..85476b3c2 100644 --- a/doc/bash.1~ +++ b/doc/bash.1~ @@ -10,7 +10,7 @@ .\" bash_builtins, strip all but Built-Ins section .if \n(zZ=1 .ig zZ .if \n(zY=1 .ig zY -.TH BASH 1 "2007 September 14" "GNU Bash-3.2" +.TH BASH 1 "2007 November 21" "GNU Bash-3.2" .\" .\" There's some problem with having a `@' .\" in a tagged paragraph with the BSD man macros. @@ -1291,8 +1291,10 @@ The command argument to the \fB\-c\fP invocation option. .B BASH_LINENO An array variable whose members are the line numbers in source files corresponding to each member of \fBFUNCNAME\fP. -\fB${BASH_LINENO[\fP\fI$i-1\fP\fB]}\fP is the line number in the source -file where \fB${FUNCNAME[\fP\fI$i\fP\fB]}\fP was called. +\fB${BASH_LINENO[\fP\fI$i\fP\fB]}\fP is the line number in the source +file where \fB${FUNCNAME[\fP\fI$i\fP\fB]}\fP was called +(or \fB${BASH_LINENO[\fP\fI$i-1\fP\fB]}\fP if referenced within another +shell function). The corresponding source file name is \fB${BASH_SOURCE[\fP\fI$i\fP\fB]}\fB. Use \fBLINENO\fP to obtain the current line number. .TP @@ -8489,7 +8491,7 @@ or keyword, part of the test in an .I if -statement, part of a +statement, part of a command executed in a .B && or .B \(bv\(bv diff --git a/doc/bashref.info b/doc/bashref.info index a03c925b8..62795d3e4 100644 --- a/doc/bashref.info +++ b/doc/bashref.info @@ -1,11 +1,11 @@ This is bashref.info, produced by makeinfo version 4.8 from -/Users/chet/src/bash/src/doc/bashref.texi. +/usr/src/local/bash/bash-20071121/doc/bashref.texi. This text is a brief description of the features that are present in -the Bash shell (version 3.2, 14 September 2007). +the Bash shell (version 3.2, 21 November 2007). - This is Edition 3.2, last updated 14 September 2007, of `The GNU -Bash Reference Manual', for `Bash', Version 3.2. + This is Edition 3.2, last updated 21 November 2007, of `The GNU Bash +Reference Manual', for `Bash', Version 3.2. Copyright (C) 1988-2005 Free Software Foundation, Inc. @@ -37,10 +37,10 @@ Bash Features ************* This text is a brief description of the features that are present in -the Bash shell (version 3.2, 14 September 2007). +the Bash shell (version 3.2, 21 November 2007). - This is Edition 3.2, last updated 14 September 2007, of `The GNU -Bash Reference Manual', for `Bash', Version 3.2. + This is Edition 3.2, last updated 21 November 2007, of `The GNU Bash +Reference Manual', for `Bash', Version 3.2. Bash contains features that appear in other popular shells, and some features that only appear in Bash. Some of the shells that Bash has @@ -64,9 +64,9 @@ on shell behavior. * Bash Features:: Features found only in Bash. * Job Control:: What job control is and how Bash allows you to use it. -* Using History Interactively:: Command History Expansion * Command Line Editing:: Chapter describing the command line editing features. +* Using History Interactively:: Command History Expansion * Installing Bash:: How to build and install Bash on your system. * Reporting Bugs:: How to report bugs in Bash. * Major Differences From The Bourne Shell:: A terse list of the differences @@ -2589,12 +2589,12 @@ standard. subject to the following conditions. The `ERR' trap is not executed if the failed command is part of the command list immediately following an `until' or `while' keyword, part of the - test in an `if' statement, part of a `&&' or `||' list, or if the - command's return status is being inverted using `!'. These are - the same conditions obeyed by the `errexit' option. If a SIGSPEC - is `RETURN', the command ARG is executed each time a shell - function or a script executed with the `.' or `source' builtins - finishes executing. + test in an `if' statement, part of a command executed in a `&&' or + `||' list, or if the command's return status is being inverted + using `!'. These are the same conditions obeyed by the `errexit' + option. If a SIGSPEC is `RETURN', the command ARG is executed + each time a shell function or a script executed with the `.' or + `source' builtins finishes executing. Signals ignored upon entry to the shell cannot be trapped or reset. Trapped signals that are not being ignored are reset to their @@ -3195,13 +3195,13 @@ parameters, or to display the names and values of shell variables. Commands::) exits with a non-zero status, unless the command that fails is part of the command list immediately following a `while' or `until' keyword, part of the test in an `if' - statement, part of a `&&' or `||' list, any command in a - pipeline but the last, or if the command's return status is - being inverted using `!'. Failing simple commands that are - part of shell functions or command lists enclosed in braces - or parentheses satisfying the above conditions do not cause - the shell to exit. A trap on `ERR', if set, is executed - before the shell exits. + statement, part of a command executed in a `&&' or `||b' list, + any command in a pipeline but the last, or if the command's + return status is being inverted using `!'. Failing simple + commands that are part of shell functions or command lists + enclosed in braces or parentheses satisfying the above + conditions do not cause the shell to exit. A trap on `ERR', + if set, is executed before the shell exits. `-f' Disable file name generation (globbing). @@ -3825,9 +3825,10 @@ Variables::). An array variable whose members are the line numbers in source files corresponding to each member of FUNCNAME. `${BASH_LINENO[$i]}' is the line number in the source file where - `${FUNCNAME[$i]}' was called. The corresponding source file name - is `${BASH_SOURCE[$i]}'. Use `LINENO' to obtain the current line - number. + `${FUNCNAME[$i]}' was called (or `${BASH_LINENO[$i-1]}' if + referenced within another shell function). The corresponding + source file name is `${BASH_SOURCE[$i]}'. Use `LINENO' to obtain + the current line number. `BASH_REMATCH' An array variable whose members are assigned by the `=~' binary @@ -5484,7 +5485,7 @@ specifying the `--enable-strict-posix-default' to `configure' when building (*note Optional Features::).  -File: bashref.info, Node: Job Control, Next: Using History Interactively, Prev: Bash Features, Up: Top +File: bashref.info, Node: Job Control, Next: Command Line Editing, Prev: Bash Features, Up: Top 7 Job Control ************* @@ -5713,7 +5714,7 @@ File: bashref.info, Node: Job Control Variables, Prev: Job Control Builtins,  -File: bashref.info, Node: Command Line Editing, Next: Installing Bash, Prev: Using History Interactively, Up: Top +File: bashref.info, Node: Command Line Editing, Next: Using History Interactively, Prev: Job Control, Up: Top 8 Command Line Editing ********************** @@ -7376,7 +7377,7 @@ completion facilities.  -File: bashref.info, Node: Using History Interactively, Next: Command Line Editing, Prev: Job Control, Up: Top +File: bashref.info, Node: Using History Interactively, Next: Installing Bash, Prev: Command Line Editing, Up: Top 9 Using History Interactively ***************************** @@ -7749,7 +7750,7 @@ more of the following modifiers, each preceded by a `:'.  -File: bashref.info, Node: Installing Bash, Next: Reporting Bugs, Prev: Command Line Editing, Up: Top +File: bashref.info, Node: Installing Bash, Next: Reporting Bugs, Prev: Using History Interactively, Up: Top 10 Installing Bash ****************** @@ -9223,11 +9224,11 @@ D.3 Parameter and Variable Index * BASH_ENV: Bash Variables. (line 46) * BASH_EXECUTION_STRING: Bash Variables. (line 52) * BASH_LINENO: Bash Variables. (line 55) -* BASH_REMATCH: Bash Variables. (line 63) -* BASH_SOURCE: Bash Variables. (line 71) -* BASH_SUBSHELL: Bash Variables. (line 75) -* BASH_VERSINFO: Bash Variables. (line 79) -* BASH_VERSION: Bash Variables. (line 103) +* BASH_REMATCH: Bash Variables. (line 64) +* BASH_SOURCE: Bash Variables. (line 72) +* BASH_SUBSHELL: Bash Variables. (line 76) +* BASH_VERSINFO: Bash Variables. (line 80) +* BASH_VERSION: Bash Variables. (line 104) * BASHPID: Bash Variables. (line 16) * bell-style: Readline Init File Syntax. (line 38) @@ -9235,77 +9236,77 @@ D.3 Parameter and Variable Index (line 45) * CDPATH: Bourne Shell Variables. (line 9) -* COLUMNS: Bash Variables. (line 106) +* COLUMNS: Bash Variables. (line 107) * comment-begin: Readline Init File Syntax. (line 50) -* COMP_CWORD: Bash Variables. (line 111) -* COMP_KEY: Bash Variables. (line 140) -* COMP_LINE: Bash Variables. (line 117) -* COMP_POINT: Bash Variables. (line 122) -* COMP_TYPE: Bash Variables. (line 130) -* COMP_WORDBREAKS: Bash Variables. (line 144) -* COMP_WORDS: Bash Variables. (line 150) +* COMP_CWORD: Bash Variables. (line 112) +* COMP_KEY: Bash Variables. (line 141) +* COMP_LINE: Bash Variables. (line 118) +* COMP_POINT: Bash Variables. (line 123) +* COMP_TYPE: Bash Variables. (line 131) +* COMP_WORDBREAKS: Bash Variables. (line 145) +* COMP_WORDS: Bash Variables. (line 151) * completion-query-items: Readline Init File Syntax. (line 60) -* COMPREPLY: Bash Variables. (line 157) +* COMPREPLY: Bash Variables. (line 158) * convert-meta: Readline Init File Syntax. (line 70) -* DIRSTACK: Bash Variables. (line 162) +* DIRSTACK: Bash Variables. (line 163) * disable-completion: Readline Init File Syntax. (line 76) * editing-mode: Readline Init File Syntax. (line 81) -* EMACS: Bash Variables. (line 172) +* EMACS: Bash Variables. (line 173) * enable-keypad: Readline Init File Syntax. (line 87) -* EUID: Bash Variables. (line 177) +* EUID: Bash Variables. (line 178) * expand-tilde: Readline Init File Syntax. (line 92) -* FCEDIT: Bash Variables. (line 181) -* FIGNORE: Bash Variables. (line 185) -* FUNCNAME: Bash Variables. (line 191) -* GLOBIGNORE: Bash Variables. (line 200) -* GROUPS: Bash Variables. (line 206) -* histchars: Bash Variables. (line 212) -* HISTCMD: Bash Variables. (line 227) -* HISTCONTROL: Bash Variables. (line 232) -* HISTFILE: Bash Variables. (line 248) -* HISTFILESIZE: Bash Variables. (line 252) -* HISTIGNORE: Bash Variables. (line 260) +* FCEDIT: Bash Variables. (line 182) +* FIGNORE: Bash Variables. (line 186) +* FUNCNAME: Bash Variables. (line 192) +* GLOBIGNORE: Bash Variables. (line 201) +* GROUPS: Bash Variables. (line 207) +* histchars: Bash Variables. (line 213) +* HISTCMD: Bash Variables. (line 228) +* HISTCONTROL: Bash Variables. (line 233) +* HISTFILE: Bash Variables. (line 249) +* HISTFILESIZE: Bash Variables. (line 253) +* HISTIGNORE: Bash Variables. (line 261) * history-preserve-point: Readline Init File Syntax. (line 96) -* HISTSIZE: Bash Variables. (line 279) -* HISTTIMEFORMAT: Bash Variables. (line 283) +* HISTSIZE: Bash Variables. (line 280) +* HISTTIMEFORMAT: Bash Variables. (line 284) * HOME: Bourne Shell Variables. (line 13) * horizontal-scroll-mode: Readline Init File Syntax. (line 102) -* HOSTFILE: Bash Variables. (line 292) -* HOSTNAME: Bash Variables. (line 303) -* HOSTTYPE: Bash Variables. (line 306) +* HOSTFILE: Bash Variables. (line 293) +* HOSTNAME: Bash Variables. (line 304) +* HOSTTYPE: Bash Variables. (line 307) * IFS: Bourne Shell Variables. (line 18) -* IGNOREEOF: Bash Variables. (line 309) +* IGNOREEOF: Bash Variables. (line 310) * input-meta: Readline Init File Syntax. (line 109) -* INPUTRC: Bash Variables. (line 319) +* INPUTRC: Bash Variables. (line 320) * isearch-terminators: Readline Init File Syntax. (line 116) * keymap: Readline Init File Syntax. (line 123) -* LANG: Bash Variables. (line 323) -* LC_ALL: Bash Variables. (line 327) -* LC_COLLATE: Bash Variables. (line 331) -* LC_CTYPE: Bash Variables. (line 338) +* LANG: Bash Variables. (line 324) +* LC_ALL: Bash Variables. (line 328) +* LC_COLLATE: Bash Variables. (line 332) +* LC_CTYPE: Bash Variables. (line 339) * LC_MESSAGES <1>: Locale Translation. (line 11) -* LC_MESSAGES: Bash Variables. (line 343) -* LC_NUMERIC: Bash Variables. (line 347) -* LINENO: Bash Variables. (line 351) -* LINES: Bash Variables. (line 355) -* MACHTYPE: Bash Variables. (line 360) +* LC_MESSAGES: Bash Variables. (line 344) +* LC_NUMERIC: Bash Variables. (line 348) +* LINENO: Bash Variables. (line 352) +* LINES: Bash Variables. (line 356) +* MACHTYPE: Bash Variables. (line 361) * MAIL: Bourne Shell Variables. (line 22) -* MAILCHECK: Bash Variables. (line 364) +* MAILCHECK: Bash Variables. (line 365) * MAILPATH: Bourne Shell Variables. (line 27) * mark-modified-lines: Readline Init File Syntax. @@ -9316,46 +9317,46 @@ D.3 Parameter and Variable Index (line 146) * meta-flag: Readline Init File Syntax. (line 109) -* OLDPWD: Bash Variables. (line 372) +* OLDPWD: Bash Variables. (line 373) * OPTARG: Bourne Shell Variables. (line 34) -* OPTERR: Bash Variables. (line 375) +* OPTERR: Bash Variables. (line 376) * OPTIND: Bourne Shell Variables. (line 38) -* OSTYPE: Bash Variables. (line 379) +* OSTYPE: Bash Variables. (line 380) * output-meta: Readline Init File Syntax. (line 153) * page-completions: Readline Init File Syntax. (line 158) * PATH: Bourne Shell Variables. (line 42) -* PIPESTATUS: Bash Variables. (line 382) -* POSIXLY_CORRECT: Bash Variables. (line 387) -* PPID: Bash Variables. (line 396) -* PROMPT_COMMAND: Bash Variables. (line 400) +* PIPESTATUS: Bash Variables. (line 383) +* POSIXLY_CORRECT: Bash Variables. (line 388) +* PPID: Bash Variables. (line 397) +* PROMPT_COMMAND: Bash Variables. (line 401) * PS1: Bourne Shell Variables. (line 48) * PS2: Bourne Shell Variables. (line 53) -* PS3: Bash Variables. (line 404) -* PS4: Bash Variables. (line 409) -* PWD: Bash Variables. (line 415) -* RANDOM: Bash Variables. (line 418) -* REPLY: Bash Variables. (line 423) -* SECONDS: Bash Variables. (line 426) -* SHELL: Bash Variables. (line 432) -* SHELLOPTS: Bash Variables. (line 437) -* SHLVL: Bash Variables. (line 446) +* PS3: Bash Variables. (line 405) +* PS4: Bash Variables. (line 410) +* PWD: Bash Variables. (line 416) +* RANDOM: Bash Variables. (line 419) +* REPLY: Bash Variables. (line 424) +* SECONDS: Bash Variables. (line 427) +* SHELL: Bash Variables. (line 433) +* SHELLOPTS: Bash Variables. (line 438) +* SHLVL: Bash Variables. (line 447) * show-all-if-ambiguous: Readline Init File Syntax. (line 168) * show-all-if-unmodified: Readline Init File Syntax. (line 174) * TEXTDOMAIN: Locale Translation. (line 11) * TEXTDOMAINDIR: Locale Translation. (line 11) -* TIMEFORMAT: Bash Variables. (line 451) -* TMOUT: Bash Variables. (line 489) -* TMPDIR: Bash Variables. (line 501) -* UID: Bash Variables. (line 505) +* TIMEFORMAT: Bash Variables. (line 452) +* TMOUT: Bash Variables. (line 490) +* TMPDIR: Bash Variables. (line 502) +* UID: Bash Variables. (line 506) * visible-stats: Readline Init File Syntax. (line 183) @@ -9623,132 +9624,132 @@ D.5 Concept Index  Tag Table: -Node: Top1359 -Node: Introduction3171 -Node: What is Bash?3399 -Node: What is a shell?4512 -Node: Definitions7052 -Node: Basic Shell Features9821 -Node: Shell Syntax11040 -Node: Shell Operation12070 -Node: Quoting13364 -Node: Escape Character14667 -Node: Single Quotes15152 -Node: Double Quotes15500 -Node: ANSI-C Quoting16625 -Node: Locale Translation17581 -Node: Comments18477 -Node: Shell Commands19095 -Node: Simple Commands19861 -Node: Pipelines20492 -Node: Lists22367 -Node: Compound Commands23998 -Node: Looping Constructs24782 -Node: Conditional Constructs27229 -Node: Command Grouping34789 -Node: Shell Functions36268 -Node: Shell Parameters40729 -Node: Positional Parameters43059 -Node: Special Parameters43959 -Node: Shell Expansions46923 -Node: Brace Expansion48848 -Node: Tilde Expansion51174 -Node: Shell Parameter Expansion53525 -Node: Command Substitution61225 -Node: Arithmetic Expansion62558 -Node: Process Substitution63408 -Node: Word Splitting64458 -Node: Filename Expansion66081 -Node: Pattern Matching68221 -Node: Quote Removal71539 -Node: Redirections71834 -Node: Executing Commands79564 -Node: Simple Command Expansion80234 -Node: Command Search and Execution82164 -Node: Command Execution Environment84170 -Node: Environment86969 -Node: Exit Status88629 -Node: Signals89833 -Node: Shell Scripts91801 -Node: Shell Builtin Commands94319 -Node: Bourne Shell Builtins95996 -Node: Bash Builtins113204 -Node: Modifying Shell Behavior133336 -Node: The Set Builtin133681 -Node: The Shopt Builtin142506 -Node: Special Builtins152736 -Node: Shell Variables153715 -Node: Bourne Shell Variables154155 -Node: Bash Variables156136 -Node: Bash Features177431 -Node: Invoking Bash178314 -Node: Bash Startup Files184123 -Node: Interactive Shells188982 -Node: What is an Interactive Shell?189392 -Node: Is this Shell Interactive?190041 -Node: Interactive Shell Behavior190856 -Node: Bash Conditional Expressions194136 -Node: Shell Arithmetic197715 -Node: Aliases200461 -Node: Arrays203033 -Node: The Directory Stack206382 -Node: Directory Stack Builtins207096 -Node: Printing a Prompt209988 -Node: The Restricted Shell212702 -Node: Bash POSIX Mode214534 -Node: Job Control222293 -Node: Job Control Basics222760 -Node: Job Control Builtins227269 -Node: Job Control Variables231596 -Node: Command Line Editing232754 -Node: Introduction and Notation233753 -Node: Readline Interaction235375 -Node: Readline Bare Essentials236566 -Node: Readline Movement Commands238355 -Node: Readline Killing Commands239320 -Node: Readline Arguments241240 -Node: Searching242284 -Node: Readline Init File244470 -Node: Readline Init File Syntax245617 -Node: Conditional Init Constructs257992 -Node: Sample Init File260525 -Node: Bindable Readline Commands263642 -Node: Commands For Moving264849 -Node: Commands For History265710 -Node: Commands For Text268865 -Node: Commands For Killing271538 -Node: Numeric Arguments273680 -Node: Commands For Completion274819 -Node: Keyboard Macros278412 -Node: Miscellaneous Commands278983 -Node: Readline vi Mode284294 -Node: Programmable Completion285208 -Node: Programmable Completion Builtins291026 -Node: Using History Interactively298622 -Node: Bash History Facilities299302 -Node: Bash History Builtins302216 -Node: History Interaction306073 -Node: Event Designators308778 -Node: Word Designators309793 -Node: Modifiers311432 -Node: Installing Bash312836 -Node: Basic Installation313966 -Node: Compilers and Options316658 -Node: Compiling For Multiple Architectures317399 -Node: Installation Names319063 -Node: Specifying the System Type319881 -Node: Sharing Defaults320597 -Node: Operation Controls321270 -Node: Optional Features322228 -Node: Reporting Bugs331159 -Node: Major Differences From The Bourne Shell332353 -Node: Copying This Manual349022 -Node: GNU Free Documentation License349292 -Node: Indexes371698 -Node: Builtin Index372141 -Node: Reserved Word Index378674 -Node: Variable Index381122 -Node: Function Index392286 -Node: Concept Index399018 +Node: Top1366 +Node: Introduction3176 +Node: What is Bash?3404 +Node: What is a shell?4517 +Node: Definitions7057 +Node: Basic Shell Features9826 +Node: Shell Syntax11045 +Node: Shell Operation12075 +Node: Quoting13369 +Node: Escape Character14672 +Node: Single Quotes15157 +Node: Double Quotes15505 +Node: ANSI-C Quoting16630 +Node: Locale Translation17586 +Node: Comments18482 +Node: Shell Commands19100 +Node: Simple Commands19866 +Node: Pipelines20497 +Node: Lists22372 +Node: Compound Commands24003 +Node: Looping Constructs24787 +Node: Conditional Constructs27234 +Node: Command Grouping34794 +Node: Shell Functions36273 +Node: Shell Parameters40734 +Node: Positional Parameters43064 +Node: Special Parameters43964 +Node: Shell Expansions46928 +Node: Brace Expansion48853 +Node: Tilde Expansion51179 +Node: Shell Parameter Expansion53530 +Node: Command Substitution61230 +Node: Arithmetic Expansion62563 +Node: Process Substitution63413 +Node: Word Splitting64463 +Node: Filename Expansion66086 +Node: Pattern Matching68226 +Node: Quote Removal71544 +Node: Redirections71839 +Node: Executing Commands79569 +Node: Simple Command Expansion80239 +Node: Command Search and Execution82169 +Node: Command Execution Environment84175 +Node: Environment86974 +Node: Exit Status88634 +Node: Signals89838 +Node: Shell Scripts91806 +Node: Shell Builtin Commands94324 +Node: Bourne Shell Builtins96001 +Node: Bash Builtins113231 +Node: Modifying Shell Behavior133363 +Node: The Set Builtin133708 +Node: The Shopt Builtin142556 +Node: Special Builtins152786 +Node: Shell Variables153765 +Node: Bourne Shell Variables154205 +Node: Bash Variables156186 +Node: Bash Features177558 +Node: Invoking Bash178441 +Node: Bash Startup Files184250 +Node: Interactive Shells189109 +Node: What is an Interactive Shell?189519 +Node: Is this Shell Interactive?190168 +Node: Interactive Shell Behavior190983 +Node: Bash Conditional Expressions194263 +Node: Shell Arithmetic197842 +Node: Aliases200588 +Node: Arrays203160 +Node: The Directory Stack206509 +Node: Directory Stack Builtins207223 +Node: Printing a Prompt210115 +Node: The Restricted Shell212829 +Node: Bash POSIX Mode214661 +Node: Job Control222420 +Node: Job Control Basics222880 +Node: Job Control Builtins227389 +Node: Job Control Variables231716 +Node: Command Line Editing232874 +Node: Introduction and Notation233869 +Node: Readline Interaction235491 +Node: Readline Bare Essentials236682 +Node: Readline Movement Commands238471 +Node: Readline Killing Commands239436 +Node: Readline Arguments241356 +Node: Searching242400 +Node: Readline Init File244586 +Node: Readline Init File Syntax245733 +Node: Conditional Init Constructs258108 +Node: Sample Init File260641 +Node: Bindable Readline Commands263758 +Node: Commands For Moving264965 +Node: Commands For History265826 +Node: Commands For Text268981 +Node: Commands For Killing271654 +Node: Numeric Arguments273796 +Node: Commands For Completion274935 +Node: Keyboard Macros278528 +Node: Miscellaneous Commands279099 +Node: Readline vi Mode284410 +Node: Programmable Completion285324 +Node: Programmable Completion Builtins291142 +Node: Using History Interactively298738 +Node: Bash History Facilities299422 +Node: Bash History Builtins302336 +Node: History Interaction306193 +Node: Event Designators308898 +Node: Word Designators309913 +Node: Modifiers311552 +Node: Installing Bash312956 +Node: Basic Installation314093 +Node: Compilers and Options316785 +Node: Compiling For Multiple Architectures317526 +Node: Installation Names319190 +Node: Specifying the System Type320008 +Node: Sharing Defaults320724 +Node: Operation Controls321397 +Node: Optional Features322355 +Node: Reporting Bugs331286 +Node: Major Differences From The Bourne Shell332480 +Node: Copying This Manual349149 +Node: GNU Free Documentation License349419 +Node: Indexes371825 +Node: Builtin Index372268 +Node: Reserved Word Index378801 +Node: Variable Index381249 +Node: Function Index392413 +Node: Concept Index399145  End Tag Table diff --git a/doc/bashref.texi b/doc/bashref.texi index 0507cc5e9..fbf22a57b 100644 --- a/doc/bashref.texi +++ b/doc/bashref.texi @@ -102,9 +102,9 @@ reference on shell behavior. * Bash Features:: Features found only in Bash. * Job Control:: What job control is and how Bash allows you to use it. -* Using History Interactively:: Command History Expansion * Command Line Editing:: Chapter describing the command line editing features. +* Using History Interactively:: Command History Expansion * Installing Bash:: How to build and install Bash on your system. * Reporting Bugs:: How to report bugs in Bash. * Major Differences From The Bourne Shell:: A terse list of the differences @@ -3028,7 +3028,8 @@ subject to the following conditions. The @code{ERR} trap is not executed if the failed command is part of the command list immediately following an @code{until} or @code{while} keyword, part of the test in an @code{if} statement, -part of a @code{&&} or @code{||} list, or if the command's return +part of a command executed in a @code{&&} or @code{||} list, +or if the command's return status is being inverted using @code{!}. These are the same conditions obeyed by the @code{errexit} option. If a @var{sigspec} is @code{RETURN}, the command @var{arg} is executed @@ -3729,7 +3730,7 @@ Exit immediately if a simple command (@pxref{Simple Commands}) exits with a non-zero status, unless the command that fails is part of the command list immediately following a @code{while} or @code{until} keyword, part of the test in an @code{if} statement, -part of a @code{&&} or @code{||} list, +part of a command executed in a @code{&&} or @code{||b} list, any command in a pipeline but the last, or if the command's return status is being inverted using @code{!}. Failing simple commands that are part of shell functions or command lists diff --git a/doc/bashref.texi~ b/doc/bashref.texi~ index d34f6370f..ccb2ef90b 100644 --- a/doc/bashref.texi~ +++ b/doc/bashref.texi~ @@ -3028,7 +3028,8 @@ subject to the following conditions. The @code{ERR} trap is not executed if the failed command is part of the command list immediately following an @code{until} or @code{while} keyword, part of the test in an @code{if} statement, -part of a @code{&&} or @code{||} list, or if the command's return +part of a command executed in a @code{&&} or @code{||} list, +or if the command's return status is being inverted using @code{!}. These are the same conditions obeyed by the @code{errexit} option. If a @var{sigspec} is @code{RETURN}, the command @var{arg} is executed @@ -3729,7 +3730,7 @@ Exit immediately if a simple command (@pxref{Simple Commands}) exits with a non-zero status, unless the command that fails is part of the command list immediately following a @code{while} or @code{until} keyword, part of the test in an @code{if} statement, -part of a @code{&&} or @code{||} list, +part of a command executed in a @code{&&} or @code{||b} list, any command in a pipeline but the last, or if the command's return status is being inverted using @code{!}. Failing simple commands that are part of shell functions or command lists @@ -4395,7 +4396,8 @@ The command argument to the @option{-c} invocation option. An array variable whose members are the line numbers in source files corresponding to each member of @var{FUNCNAME}. @code{$@{BASH_LINENO[$i]@}} is the line number in the source file where -@code{$@{FUNCNAME[$i]@}} was called. +@code{$@{FUNCNAME[$i]@}} was called (or @code{$@{BASH_LINENO[$i-1]@}} if +referenced within another shell function). The corresponding source file name is @code{$@{BASH_SOURCE[$i]@}}. Use @code{LINENO} to obtain the current line number. diff --git a/doc/version.texi b/doc/version.texi index c016a52f4..6d23fe956 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -2,9 +2,9 @@ Copyright (C) 1988-2007 Free Software Foundation, Inc. @end ignore -@set LASTCHANGE Fri Sep 14 13:44:15 EDT 2007 +@set LASTCHANGE Wed Nov 21 22:41:34 EST 2007 @set EDITION 3.2 @set VERSION 3.2 -@set UPDATED 14 September 2007 -@set UPDATED-MONTH September 2007 +@set UPDATED 21 November 2007 +@set UPDATED-MONTH November 2007 diff --git a/doc/version.texi~ b/doc/version.texi~ index dc36632b5..c016a52f4 100644 --- a/doc/version.texi~ +++ b/doc/version.texi~ @@ -2,9 +2,9 @@ Copyright (C) 1988-2007 Free Software Foundation, Inc. @end ignore -@set LASTCHANGE Tue May 1 10:05:36 EDT 2007 +@set LASTCHANGE Fri Sep 14 13:44:15 EDT 2007 @set EDITION 3.2 @set VERSION 3.2 -@set UPDATED 1 May 2007 -@set UPDATED-MONTH May 2007 +@set UPDATED 14 September 2007 +@set UPDATED-MONTH September 2007 diff --git a/tests/RUN-ONE-TEST b/tests/RUN-ONE-TEST index 72ec06a2c..3efcf32d6 100755 --- a/tests/RUN-ONE-TEST +++ b/tests/RUN-ONE-TEST @@ -1,4 +1,4 @@ -BUILD_DIR=/usr/local/build/bash/bash-current +BUILD_DIR=/usr/local/build/chet/bash/bash-current THIS_SH=$BUILD_DIR/bash PATH=$PATH:$BUILD_DIR diff --git a/version.c b/version.c index d16e6e3c3..94410e064 100644 --- a/version.c +++ b/version.c @@ -79,5 +79,5 @@ show_shell_version (extended) { printf (_("GNU bash, version %s (%s)\n"), shell_version_string (), MACHTYPE); if (extended) - printf (_("Copyright (C) 2006 Free Software Foundation, Inc.\n")); + printf (_("Copyright (C) 2007 Free Software Foundation, Inc.\n")); } diff --git a/version.c~ b/version.c~ index d484738c3..94410e064 100644 --- a/version.c~ +++ b/version.c~ @@ -33,15 +33,15 @@ extern char *shell_name; /* Defines from version.h */ -const char *dist_version = DISTVERSION; -int patch_level = PATCHLEVEL; -int build_version = BUILDVERSION; +const char * const dist_version = DISTVERSION; +const int patch_level = PATCHLEVEL; +const int build_version = BUILDVERSION; #ifdef RELSTATUS -const char *release_status = RELSTATUS; +const char * const release_status = RELSTATUS; #else -const char *release_status = (char *)0; +const char * const release_status = (char *)0; #endif -const char *sccs_version = SCCSVERSION; +const char * const sccs_version = SCCSVERSION; /* Functions for getting, setting, and displaying the shell version. */ @@ -79,5 +79,5 @@ show_shell_version (extended) { printf (_("GNU bash, version %s (%s)\n"), shell_version_string (), MACHTYPE); if (extended) - printf (_("Copyright (C) 2006 Free Software Foundation, Inc.\n")); + printf (_("Copyright (C) 2007 Free Software Foundation, Inc.\n")); }