pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-06-23 05:47:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

commit bash-20041111 snapshot

Browse Source
This commit is contained in:
Chet Ramey
2011-12-03 13:39:30 -05:00
parent d11b8b46f0
commit ec2199bd30
27 changed files with 1590 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CWRU/CWRU.chlog
+20
View File
@@ -10551,3 +10551,23 @@ builtins/declare.def
builtins/setattr.def
- add support for `+=' assignment for rest of `assignment builtins':
export, readonly
11/12
-----
lib/readline/display.c
- make sure prompt_physical_chars and prompt_invis_chars_first_line
are reset to 0 if the prompt string passed to rl_expand_prompt is
NULL or empty
11/14
-----
{configure,config.h}.in
- check for `raise', define HAVE_RAISE if available
lib/intl/dcigettext.c
- make sure `raise' is defined if HAVE_RAISE is not before
eval-plurah.h is included
lib/malloc/trace.c
- put extern declaration for imalloc_fopen inside the MALLOC_TRACE
#ifdef
CWRU/CWRU.chlog~
+20
View File
@@ -10547,3 +10547,23 @@ builtins/declare.def
before the assignment is performed, which has implications for things
like `-i' -- if -i is supplied, arithmetic evaluation and increment
will be performed
builtins/setattr.def
- add support for `+=' assignment for rest of `assignment builtins':
export, readonly
11/12
-----
lib/readline/display.c
- make sure prompt_physical_chars and prompt_invis_chars_first_line
are reset to 0 if the prompt string passed to rl_expand_prompt is
NULL or empty
11/14
-----
{configure,config.h}.in
- check for `raise', define HAVE_RAISE if available
lib/intl/dcigettext.c
- make sure `raise' is defined if HAVE_RAISE is not before
eval-plurah.h is included
autom4te.cache/output.0
+3 -2
View File
@@ -1,5 +1,5 @@
@%:@! /bin/sh
@%:@ From configure.in for Bash 3.0, version 3.170, from autoconf version AC_ACVERSION.
@%:@ From configure.in for Bash 3.0, version 3.171, from autoconf version AC_ACVERSION.
@%:@ Guess values for system-dependent variables and create Makefiles.
@%:@ Generated by GNU Autoconf 2.57 for bash 3.1-devel.
@%:@
@@ -11349,11 +11349,12 @@ done
for ac_func in bcopy bzero confstr sysconf pathconf setenv putenv unsetenv \
setlinebuf setvbuf setlocale strchr tcgetattr uname \
ulimit tzset siginterrupt memmove ttyname times \
ulimit tzset siginterrupt memmove ttyname times raise \
getaddrinfo gethostbyname getservbyname getservent inet_aton \
vsnprintf snprintf vasprintf asprintf fnmatch regcomp regexec
do
autom4te.cache/requests
+82 -82
View File
@@ -15,96 +15,96 @@
'configure.in'
],
{
'AM_INIT_AUTOMAKE' => 1,
'AC_DECL_SYS_SIGLIST' => 1,
'AC_STRUCT_TIMEZONE' => 1,
'AC_FUNC_STRNLEN' => 1,
'AM_GNU_GETTEXT' => 1,
'AC_FUNC_CHOWN' => 1,
'AC_FUNC_GETGROUPS' => 1,
'AM_MAINTAINER_MODE' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_CANONICAL_HOST' => 1,
'AM_CONDITIONAL' => 1,
'AC_FUNC_LSTAT' => 1,
'AC_C_CONST' => 1,
'AC_FUNC_STRFTIME' => 1,
'AC_CONFIG_AUX_DIR' => 1,
'AC_FUNC_GETMNTENT' => 1,
'AC_PROG_LN_S' => 1,
'AC_LIBSOURCE' => 1,
'AC_PROG_CC' => 1,
'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
'AC_FUNC_MEMCMP' => 1,
'AC_FUNC_ALLOCA' => 1,
'm4_pattern_forbid' => 1,
'AC_PROG_RANLIB' => 1,
'AC_STRUCT_ST_BLOCKS' => 1,
'AC_FUNC_WAIT3' => 1,
'AC_C_VOLATILE' => 1,
'AC_FUNC_GETPGRP' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
'AC_CONFIG_FILES' => 1,
'AC_PROG_CPP' => 1,
'AC_CHECK_TYPES' => 1,
'AC_LIBSOURCE' => 1,
'AC_STRUCT_TM' => 1,
'AC_C_CONST' => 1,
'AC_FUNC_FORK' => 1,
'AC_HEADER_SYS_WAIT' => 1,
'AM_GNU_GETTEXT' => 1,
'AC_INIT' => 1,
'AC_FUNC_UTIME_NULL' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AC_HEADER_STDC' => 1,
'AC_PROG_CXX' => 1,
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_YACC' => 1,
'AC_FUNC_STRCOLL' => 1,
'AC_FUNC_VPRINTF' => 1,
'AC_PROG_RANLIB' => 1,
'AC_PROG_LEX' => 1,
'AM_PROG_CC_C_O' => 1,
'AC_CHECK_FUNCS' => 1,
'AC_SUBST' => 1,
'AC_FUNC_MBRTOWC' => 1,
'AC_FUNC_GETGROUPS' => 1,
'AC_PROG_LN_S' => 1,
'AC_FUNC_CHOWN' => 1,
'AC_FUNC_GETMNTENT' => 1,
'AC_PROG_MAKE_SET' => 1,
'AC_TYPE_MODE_T' => 1,
'AH_OUTPUT' => 1,
'AC_C_VOLATILE' => 1,
'AC_FUNC_ALLOCA' => 1,
'AC_TYPE_UID_T' => 1,
'AM_MAINTAINER_MODE' => 1,
'AC_FUNC_SETVBUF_REVERSED' => 1,
'AC_STRUCT_ST_BLOCKS' => 1,
'm4_include' => 1,
'AC_CONFIG_AUX_DIR' => 1,
'AC_FUNC_FSEEKO' => 1,
'AC_FUNC_OBSTACK' => 1,
'AC_FUNC_MEMCMP' => 1,
'AC_FUNC_MKTIME' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_FUNC_GETLOADAVG' => 1,
'AC_CHECK_HEADERS' => 1,
'AC_FUNC_SETPGRP' => 1,
'AC_CHECK_LIB' => 1,
'AC_FUNC_SELECT_ARGTYPES' => 1,
'AC_TYPE_OFF_T' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_HEADER_STAT' => 1,
'AC_PROG_LIBTOOL' => 1,
'm4_pattern_forbid' => 1,
'AC_TYPE_PID_T' => 1,
'AC_TYPE_SIZE_T' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_HEADER_DIRENT' => 1,
'AC_PROG_INSTALL' => 1,
'AC_CONFIG_SUBDIRS' => 1,
'AC_FUNC_ERROR_AT_LINE' => 1,
'AC_FUNC_MMAP' => 1,
'AC_HEADER_TIME' => 1,
'AC_FUNC_REALLOC' => 1,
'include' => 1,
'm4_pattern_allow' => 1,
'AC_FUNC_WAIT3' => 1,
'AC_PROG_AWK' => 1,
'AC_HEADER_MAJOR' => 1,
'AM_CONDITIONAL' => 1,
'AC_PROG_CC' => 1,
'AC_CHECK_MEMBERS' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_TYPE_SIZE_T' => 1,
'AC_TYPE_PID_T' => 1,
'm4_pattern_allow' => 1,
'AC_PROG_CXX' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AC_TYPE_SIGNAL' => 1,
'AC_C_INLINE' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_FUNC_LSTAT' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_CHECK_HEADERS' => 1,
'AC_FUNC_OBSTACK' => 1,
'AC_SUBST' => 1,
'AC_FUNC_UTIME_NULL' => 1,
'AC_FUNC_MMAP' => 1,
'AC_DECL_SYS_SIGLIST' => 1,
'AC_PROG_LEX' => 1,
'AC_PROG_AWK' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AM_PROG_CC_C_O' => 1,
'AC_CHECK_TYPES' => 1,
'AC_FUNC_GETLOADAVG' => 1,
'AC_PATH_X' => 1,
'AC_FUNC_STAT' => 1,
'include' => 1,
'AC_PROG_GCC_TRADITIONAL' => 1,
'AC_CANONICAL_HOST' => 1
'AC_FUNC_REALLOC' => 1,
'AC_HEADER_SYS_WAIT' => 1,
'm4_include' => 1,
'AC_HEADER_TIME' => 1,
'AC_CONFIG_SUBDIRS' => 1,
'AC_FUNC_STRERROR_R' => 1,
'AC_INIT' => 1,
'AC_FUNC_STRCOLL' => 1,
'AC_CHECK_MEMBERS' => 1,
'AC_CHECK_FUNCS' => 1,
'AH_OUTPUT' => 1,
'AC_FUNC_VPRINTF' => 1,
'AC_TYPE_OFF_T' => 1,
'AC_CHECK_LIB' => 1,
'AC_FUNC_STRNLEN' => 1,
'AC_STRUCT_TM' => 1,
'AC_PROG_CPP' => 1,
'AC_FUNC_MBRTOWC' => 1,
'AC_PROG_MAKE_SET' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_HEADER_DIRENT' => 1,
'AC_FUNC_ERROR_AT_LINE' => 1,
'AC_HEADER_STDC' => 1,
'AC_FUNC_SELECT_ARGTYPES' => 1,
'AC_STRUCT_TIMEZONE' => 1,
'AC_HEADER_STAT' => 1,
'AC_TYPE_MODE_T' => 1,
'AC_FUNC_SETPGRP' => 1,
'AC_FUNC_MKTIME' => 1,
'AC_TYPE_UID_T' => 1,
'AC_FUNC_FORK' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_PROG_INSTALL' => 1,
'AC_CONFIG_FILES' => 1,
'AC_FUNC_STAT' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_FUNC_FSEEKO' => 1,
'AC_C_INLINE' => 1,
'AC_FUNC_SETVBUF_REVERSED' => 1,
'AC_PROG_YACC' => 1
}
], 'Request' )
);
autom4te.cache/traces.0
+3 -1
View File
@@ -642,7 +642,7 @@ m4trace:configure.in:640: -1- AH_OUTPUT([HAVE_RENAME], [/* Define to 1 if you ha
m4trace:configure.in:640: -1- AC_SUBST([LIB@&t@OBJS])
m4trace:configure.in:647: -1- AC_CHECK_FUNCS([bcopy bzero confstr sysconf pathconf setenv putenv unsetenv \
setlinebuf setvbuf setlocale strchr tcgetattr uname \
ulimit tzset siginterrupt memmove ttyname times \
ulimit tzset siginterrupt memmove ttyname times raise \
getaddrinfo gethostbyname getservbyname getservent inet_aton \
vsnprintf snprintf vasprintf asprintf fnmatch regcomp regexec])
m4trace:configure.in:647: -1- AH_OUTPUT([HAVE_BCOPY], [/* Define to 1 if you have the `bcopy\' function. */
@@ -685,6 +685,8 @@ m4trace:configure.in:647: -1- AH_OUTPUT([HAVE_TTYNAME], [/* Define to 1 if you h
#undef HAVE_TTYNAME])
m4trace:configure.in:647: -1- AH_OUTPUT([HAVE_TIMES], [/* Define to 1 if you have the `times\' function. */
#undef HAVE_TIMES])
m4trace:configure.in:647: -1- AH_OUTPUT([HAVE_RAISE], [/* Define to 1 if you have the `raise\' function. */
#undef HAVE_RAISE])
m4trace:configure.in:647: -1- AH_OUTPUT([HAVE_GETADDRINFO], [/* Define to 1 if you have the `getaddrinfo\' function. */
#undef HAVE_GETADDRINFO])
m4trace:configure.in:647: -1- AH_OUTPUT([HAVE_GETHOSTBYNAME], [/* Define to 1 if you have the `gethostbyname\' function. */
builtins/pushd.def
+3 -3
View File
@@ -653,7 +653,7 @@ get_directory_stack ()
}
#ifdef LOADABLE_BUILTIN
static char *dirs_doc[] = {
static char * const dirs_doc[] = {
N_("Display the list of currently remembered directories. Directories"),
N_("find their way onto the list with the `pushd' command; you can get"),
N_("back up through the list with the `popd' command."),
@@ -674,7 +674,7 @@ static char *dirs_doc[] = {
(char *)NULL
};
static char *pushd_doc[] = {
static char * const pushd_doc[] = {
N_("Adds a directory to the top of the directory stack, or rotates"),
N_("the stack, making the new top of the stack the current working"),
N_("directory. With no arguments, exchanges the top two directories."),
@@ -697,7 +697,7 @@ static char *pushd_doc[] = {
(char *)NULL
};
static char *popd_doc[] = {
static char * const popd_doc[] = {
N_("Removes entries from the directory stack. With no arguments,"),
N_("removes the top directory from the stack, and cd's to the new"),
N_("top directory."),
config.h.in
+3
View File
@@ -606,6 +606,9 @@
/* Define if you have the putenv function. */
#undef HAVE_PUTENV
/* Define if you have the raise function. */
#undef HAVE_RAISE
/* Define if you have the readlink function. */
#undef HAVE_READLINK
config.h.in~
+6 -1
View File
@@ -386,7 +386,6 @@
#undef HAVE_LIBC_FNM_EXTMATCH
#undef HAVE_DECL_CONFSTR
#undef HAVE_DECL_PRINTF
@@ -403,6 +402,9 @@
#undef HAVE_MBSTATE_T
/* Define if WCONTINUED is defined in system headers, but rejected by waitpid */
#undef WCONTINUED_BROKEN
/* These are checked with BASH_CHECK_DECL */
#undef HAVE_DECL_STRTOIMAX
@@ -664,6 +666,9 @@
/* Define if you have the strftime function. */
#undef HAVE_STRFTIME
/* Define if you have the strnlen function. */
#undef HAVE_STRNLEN
/* Define if you have the strpbrk function. */
#undef HAVE_STRPBRK
configure
Vendored
+3 -2
View File
@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in for Bash 3.0, version 3.170, from autoconf version AC_ACVERSION.
# From configure.in for Bash 3.0, version 3.171, from autoconf version AC_ACVERSION.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for bash 3.1-devel.
#
@@ -11349,11 +11349,12 @@ done
for ac_func in bcopy bzero confstr sysconf pathconf setenv putenv unsetenv \
setlinebuf setvbuf setlocale strchr tcgetattr uname \
ulimit tzset siginterrupt memmove ttyname times \
ulimit tzset siginterrupt memmove ttyname times raise \
getaddrinfo gethostbyname getservbyname getservent inet_aton \
vsnprintf snprintf vasprintf asprintf fnmatch regcomp regexec
do
configure.in
+2 -2
View File
@@ -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.0, version 3.170, from autoconf version] AC_ACVERSION)dnl
AC_REVISION([for Bash 3.0, version 3.171, from autoconf version] AC_ACVERSION)dnl
define(bashvers, 3.1)
define(relstatus, devel)
@@ -642,7 +642,7 @@ AC_REPLACE_FUNCS(rename)
dnl checks for c library functions
AC_CHECK_FUNCS(bcopy bzero confstr sysconf pathconf setenv putenv unsetenv \
setlinebuf setvbuf setlocale strchr tcgetattr uname \
ulimit tzset siginterrupt memmove ttyname times \
ulimit tzset siginterrupt memmove ttyname times raise \
getaddrinfo gethostbyname getservbyname getservent inet_aton \
vsnprintf snprintf vasprintf asprintf fnmatch regcomp regexec)
AC_CHECK_FUNCS(isascii isblank isgraph isprint isspace isxdigit)
configure.in~
+3 -1
View File
@@ -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.0, version 3.169, from autoconf version] AC_ACVERSION)dnl
AC_REVISION([for Bash 3.0, version 3.171, from autoconf version] AC_ACVERSION)dnl
define(bashvers, 3.1)
define(relstatus, devel)
@@ -860,6 +860,8 @@ AC_HEADER_TIOCGWINSZ
BASH_HAVE_TIOCSTAT
BASH_HAVE_FIONREAD
BASH_CHECK_WCONTINUED
dnl miscellaneous
BASH_CHECK_SPEED_T
BASH_CHECK_GETPW_FUNCS
doc/bash.1
+6 -2
View File
@@ -6,12 +6,12 @@
.\" Case Western Reserve University
.\" chet@po.CWRU.Edu
.\"
.\" Last Change: Sun Nov 7 14:53:18 EST 2004
.\" Last Change: Sat Nov 13 15:05:55 EST 2004
.\"
.\" bash_builtins, strip all but Built-Ins section
.if \n(zZ=1 .ig zZ
.if \n(zY=1 .ig zY
.TH BASH 1 "2004 Nov 7" "GNU Bash-3.1-devel"
.TH BASH 1 "2004 Nov 13" "GNU Bash-3.1-devel"
.\"
.\" There's some problem with having a `@'
.\" in a tagged paragraph with the BSD man macros.
@@ -2373,6 +2373,10 @@ parameters beginning at \fIoffset\fP.
If \fIparameter\fP is an array name indexed by @ or *,
the result is the \fIlength\fP
members of the array beginning with ${\fIparameter\fP[\fIoffset\fP]}.
A negative \fIoffset\fP is taken relative to one greater than the maximum
index of the specified array.
Note that a negative offset must be separated from the colon by at least
one space to avoid being confused with the :- expansion.
Substring indexing is zero-based unless the positional parameters
are used, in which case the indexing starts at 1.
.TP
doc/bash.1~
+18 -2
View File
@@ -6,12 +6,12 @@
.\" Case Western Reserve University
.\" chet@po.CWRU.Edu
.\"
.\" Last Change: Sat Oct 30 22:24:07 EDT 2004
.\" Last Change: Tue Nov 9 16:30:56 EST 2004
.\"
.\" bash_builtins, strip all but Built-Ins section
.if \n(zZ=1 .ig zZ
.if \n(zY=1 .ig zY
.TH BASH 1 "2004 Oct 30" "GNU Bash-3.1-devel"
.TH BASH 1 "2004 Nov 9" "GNU Bash-3.1-devel"
.\"
.\" There's some problem with having a `@'
.\" in a tagged paragraph with the BSD man macros.
@@ -1076,6 +1076,20 @@ Assignment statements may also appear as arguments to the
and
.B local
builtin commands.
.PP
In the context where an assignment statement is assigning a value
to a shell variable or array index, the += operator can be used to
append to or add to the variable's previous value.
When += is applied to a variable for which the integer attribute has been
set, \fIvalue\fP is evaluated as an arithmetic expression and added to the
variable's current value, which is also evaluated.
When += is applied to an array variable using compound assignment (see
.B Arrays
below), the
variable's value is not unset (as it is when using =), and new values are
appended to the array beginning at one greater than the array's maximum index.
When applied to a string-valued variable, \fIvalue\fP is expanded and
appended to the variable's value.
.SS Positional Parameters
.PP
A
@@ -2359,6 +2373,8 @@ parameters beginning at \fIoffset\fP.
If \fIparameter\fP is an array name indexed by @ or *,
the result is the \fIlength\fP
members of the array beginning with ${\fIparameter\fP[\fIoffset\fP]}.
A negative \fIoffset\fP is taken relative to one greater than the maximum
index of the specified array.
Substring indexing is zero-based unless the positional parameters
are used, in which case the indexing starts at 1.
.TP
doc/bashref.texi
+4
View File
@@ -1599,6 +1599,10 @@ parameters beginning at @var{offset}.
If @var{parameter} is an array name indexed by @samp{@@} or @samp{*},
the result is the @var{length}
members of the array beginning with @code{$@{@var{parameter}[@var{offset}]@}}.
A negative @var{offset} is taken relative to one greater than the maximum
index of the specified array.
Note that a negative offset must be separated from the colon by at least
one space to avoid being confused with the @samp{:-} expansion.
Substring indexing is zero-based unless the positional parameters
are used, in which case the indexing starts at 1.
doc/bashref.texi~
+17
View File
@@ -1208,6 +1208,21 @@ Assignment statements may also appear as arguments to the
@code{declare}, @code{typeset}, @code{export}, @code{readonly},
and @code{local} builtin commands.
In the context where an assignment statement is assigning a value
to a shell variable or array index (@pxref{Arrays}), the @samp{+=}
operator can be used to
append to or add to the variable's previous value.
When @samp{+=} is applied to a variable for which the integer attribute
has been set, @var{value} is evaluated as an arithmetic expression and
added to the variable's current value, which is also evaluated.
When @samp{+=} is applied to an array variable using compound assignment
(@pxref{Arrays}), the
variable's value is not unset (as it is when using @samp{=}), and new
values are appended to the array beginning at one greater than the array's
maximum index.
When applied to a string-valued variable, @var{value} is expanded and
appended to the variable's value.
@node Positional Parameters
@subsection Positional Parameters
@cindex parameters, positional
@@ -1584,6 +1599,8 @@ parameters beginning at @var{offset}.
If @var{parameter} is an array name indexed by @samp{@@} or @samp{*},
the result is the @var{length}
members of the array beginning with @code{$@{@var{parameter}[@var{offset}]@}}.
A negative @var{offset} is taken relative to one greater than the maximum
index of the specified array.
Substring indexing is zero-based unless the positional parameters
are used, in which case the indexing starts at 1.
doc/version.texi
+3 -2
View File
@@ -2,9 +2,10 @@
Copyright (C) 1988-2004 Free Software Foundation, Inc.
@end ignore
@set LASTCHANGE Sat Nov 13 15:06:31 EST 2004
@set EDITION 3.1-devel
@set VERSION 3.1-devel
@set UPDATED 7 November 2004
@set UPDATED 13 November 2004
@set UPDATED-MONTH November 2004
@set LASTCHANGE Sun Nov 7 15:09:53 EST 2004
doc/version.texi~
+2 -2
View File
@@ -4,7 +4,7 @@ Copyright (C) 1988-2004 Free Software Foundation, Inc.
@set EDITION 3.1-devel
@set VERSION 3.1-devel
@set UPDATED 7 November 2004
@set UPDATED 9 November 2004
@set UPDATED-MONTH November 2004
@set LASTCHANGE
@set LASTCHANGE Tue Nov 9 16:30:45 EST 2004
examples/loadables/Makefile.in
+14 -3
View File
@@ -46,6 +46,17 @@ LOCAL_CFLAGS = @LOCAL_CFLAGS@
DEFS = @DEFS@
LOCAL_DEFS = @LOCAL_DEFS@
CPPFLAGS = @CPPFLAGS@
BASHINCDIR = ${topdir}/include
LIBBUILD = ${BUILD_DIR}/lib
INTL_LIBSRC = ${topdir}/lib/intl
INTL_BUILDDIR = ${LIBBUILD}/intl
INTL_INC = @INTL_INC@
LIBINTL_H = @LIBINTL_H@
CCFLAGS = $(DEFS) $(LOCAL_DEFS) $(LOCAL_CFLAGS) $(CFLAGS)
#
@@ -63,8 +74,8 @@ SHOBJ_LIBS = @SHOBJ_LIBS@
SHOBJ_STATUS = @SHOBJ_STATUS@
INC = -I. -I.. -I$(topdir) -I$(topdir)/lib -I$(topdir)/builtins \
-I$(topdir)/include -I$(BUILD_DIR) -I$(BUILD_DIR)/lib \
-I$(BUILD_DIR)/builtins
-I$(BASHINCDIR) -I$(BUILD_DIR) -I$(LIBBUILD) \
-I$(BUILD_DIR)/builtins $(INTL_INC)
.c.o:
$(SHOBJ_CC) $(SHOBJ_CFLAGS) $(CCFLAGS) $(INC) -c -o $@ $<
@@ -184,7 +195,7 @@ pushd.c: ${topdir}/builtins/pushd.def
pushd.o: pushd.c
$(RM) $@
$(SHOBJ_CC) -DPUSHD_AND_POPD -DLOADABLE_BUILTIN $(SHOBJ_CFLAGS) $(CFLAGS) $(INC) -c -o $@ $<
$(SHOBJ_CC) -DHAVE_CONFIG_H -DPUSHD_AND_POPD -DLOADABLE_BUILTIN $(SHOBJ_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(INC) -c -o $@ $<
pushd: pushd.o
$(SHOBJ_LD) $(SHOBJ_LDFLAGS) $(SHOBJ_XLDFLAGS) -o $@ pushd.o $(SHOBJ_LIBS)
examples/loadables/sprintf.c
+1 -1
View File
@@ -159,7 +159,7 @@ sprintf_builtin (list)
r = sprintf_main (c, v);
free (v);
var = bind_variable (varname, outstr);
var = bind_variable (varname, outstr, 0);
if (readonly_p (var))
{
builtin_error ("%s: readonly variable", varname);
lib/intl/dcigettext.c
+4
View File
@@ -417,6 +417,10 @@ static int enable_secure;
}
#endif
#ifndef HAVE_RAISE
# define raise(x) kill (getpid (), (x))
#endif
/* Get the function to evaluate the plural expression. */
#include "eval-plural.h"
lib/intl/dcigettext.c~
+1238
View File
File diff suppressed because it is too large Load Diff
lib/malloc/trace.c
+2 -2
View File
@@ -29,10 +29,10 @@ extern int malloc_trace;
static int _mtrace_verbose = 0;
extern FILE *_imalloc_fopen __P((char *, char *, char *, char *, size_t));
#ifdef MALLOC_TRACE
extern FILE *_imalloc_fopen __P((char *, char *, char *, char *, size_t));
FILE *_mtrace_fp = NULL;
extern char _malloc_trace_buckets[];
lib/malloc/trace.c~
+122
View File
@@ -0,0 +1,122 @@
/* trace.c - tracing functions for malloc */
/* Copyright (C) 2001-2003 Free Software Foundation, Inc.
This file is part of GNU Bash, the Bourne Again SHell.
Bash is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Software Foundation; either version 2, or (at your option) any later
version.
Bash 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 General Public License
for more details.
You should have received a copy of the GNU General Public License along
with Bash; see the file COPYING. If not, write to the Free Software
Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdio.h>
#include "imalloc.h"
extern int malloc_trace;
static int _mtrace_verbose = 0;
extern FILE *_imalloc_fopen __P((char *, char *, char *, char *, size_t));
#ifdef MALLOC_TRACE
FILE *_mtrace_fp = NULL;
extern char _malloc_trace_buckets[];
void
mtrace_alloc (tag, mem, size, file, line)
const char *tag;
PTR_T mem;
size_t size;
const char *file;
int line;
{
if (_mtrace_fp == NULL)
_mtrace_fp = stderr;
if (_mtrace_verbose)
fprintf (_mtrace_fp, "alloc: %s: %p (%d bytes) from '%s:%d'\n",
tag, mem, size, file ? file : "unknown", line);
else
fprintf (_mtrace_fp, "alloc:%p:%d:%s:%d\n",
mem, size, file ? file : "unknown", line);
}
void
mtrace_free (mem, size, file, line)
PTR_T mem;
int size;
const char *file;
int line;
{
if (_mtrace_fp == NULL)
_mtrace_fp = stderr;
if (_mtrace_verbose)
fprintf (_mtrace_fp, "free: %p (%d bytes) from '%s:%d'\n",
mem, size, file ? file : "unknown", line);
else
fprintf (_mtrace_fp, "free:%p:%d:%s:%d\n",
mem, size, file ? file : "unknown", line);
}
#endif /* MALLOC_TRACE */
int
malloc_set_trace (n)
int n;
{
int old;
old = malloc_trace;
malloc_trace = n;
_mtrace_verbose = (n > 1);
return old;
}
void
malloc_set_tracefp (fp)
FILE *fp;
{
#ifdef MALLOC_TRACE
_mtrace_fp = fp ? fp : stderr;
#endif
}
void
malloc_trace_bin (n)
int n;
{
#ifdef MALLOC_TRACE
_malloc_trace_buckets[n] = 1;
#endif
}
#define TRACEROOT "/var/tmp/maltrace/trace."
void
malloc_set_tracefn (s, fn)
char *s;
char *fn;
{
#ifdef MALLOC_TRACE
FILE *fp;
char defname[sizeof (TRACEROOT) + 64];
fp = _imalloc_fopen (s, fn, TRACEROOT, defname, sizeof (defname));
if (fp)
malloc_set_tracefp (fp);
#endif
}
lib/readline/display.c
+2 -1
View File
@@ -340,7 +340,8 @@ rl_expand_prompt (prompt)
FREE (local_prompt_prefix);
local_prompt = local_prompt_prefix = (char *)0;
prompt_last_invisible = prompt_visible_length = 0;
prompt_last_invisible = prompt_invis_chars_first_line = 0;
prompt_visible_length = prompt_physical_chars = 0;
if (prompt == 0 || *prompt == 0)
return (0);
lib/readline/display.c~
+6 -5
View File
@@ -883,12 +883,10 @@ rl_redisplay ()
(wrap_offset > visible_wrap_offset) &&
(_rl_last_c_pos < visible_first_line_len))
{
#if defined (HANDLE_MULTIBYTE)
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
nleft = _rl_screenwidth - _rl_last_c_pos;
else
#endif
nleft = _rl_screenwidth + wrap_offset - _rl_last_c_pos;
nleft = _rl_screenwidth + wrap_offset - _rl_last_c_pos;
if (nleft)
_rl_clear_to_eol (nleft);
}
@@ -966,8 +964,11 @@ rl_redisplay ()
tx = _rl_col_width (&visible_line[pos], 0, nleft);
else
tx = nleft;
_rl_backspace (_rl_last_c_pos - tx); /* XXX */
_rl_last_c_pos = tx;
if (_rl_last_c_pos != tx)
{
_rl_backspace (_rl_last_c_pos - tx); /* XXX */
_rl_last_c_pos = tx;
}
}
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
lib/sh/getenv.c
+2 -2
View File
@@ -127,7 +127,7 @@ putenv (str)
value = name + offset + 1;
/* XXX - should we worry about readonly here? */
var = bind_variable (name, value);
var = bind_variable (name, value, 0);
if (var == 0)
{
errno = EINVAL;
@@ -175,7 +175,7 @@ setenv (name, value, rewrite)
var = find_variable (name);
if (var == 0)
var = bind_variable (name, v);
var = bind_variable (name, v, 0);
if (var == 0)
return -1;
tests/RUN-ONE-TEST
+1 -1
View File
@@ -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