You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
129 lines
3.8 KiB
129 lines
3.8 KiB
This patch documents two implemented and classical command |
|
line options "-v" and "-x". It is derived from Debian GNU/Linux. |
|
|
|
Index: doc/bash.1 |
|
--- doc/bash.1.orig 2004-07-12 17:27:08 +0200 |
|
+++ doc/bash.1 2004-07-27 19:47:10 +0200 |
|
@@ -113,6 +113,12 @@ |
|
This option allows the positional parameters to be set |
|
when invoking an interactive shell. |
|
.TP |
|
+.B \-v |
|
+Print shell input lines as they are read. |
|
+.TP |
|
+.B \-x |
|
+Print commands and their arguments as they are executed. |
|
+.TP |
|
.B \-D |
|
A list of all double-quoted strings preceded by \fB$\fP |
|
is printed on the standard ouput. |
|
|
|
----------------------------------------------------------------------------- |
|
|
|
This patch makes sure a signal state variable is declared "volatile" so |
|
it is consistent throughout signal handling. This patch is derived from |
|
SuSE Linux. |
|
|
|
Index: quit.h |
|
--- quit.h.orig 2001-09-10 16:08:33 +0200 |
|
+++ quit.h 2004-07-27 19:47:10 +0200 |
|
@@ -22,7 +22,7 @@ |
|
#define _QUIT_H_ |
|
|
|
/* Non-zero means SIGINT has already ocurred. */ |
|
-extern int interrupt_state; |
|
+extern volatile int interrupt_state; |
|
|
|
/* Macro to call a great deal. SIGINT just sets above variable. When |
|
it is safe, put QUIT in the code, and the "interrupt" will take place. */ |
|
Index: sig.c |
|
--- sig.c.orig 2003-12-19 22:11:35 +0100 |
|
+++ sig.c 2004-07-27 19:47:10 +0200 |
|
@@ -59,7 +59,7 @@ |
|
extern int parse_and_execute_level, shell_initialized; |
|
|
|
/* Non-zero after SIGINT. */ |
|
-int interrupt_state; |
|
+volatile int interrupt_state = 0; |
|
|
|
/* The environment at the top-level R-E loop. We use this in |
|
the case of error return. */ |
|
@@ -71,7 +71,7 @@ |
|
#endif /* JOB_CONTROL */ |
|
|
|
/* When non-zero, we throw_to_top_level (). */ |
|
-int interrupt_immediately = 0; |
|
+volatile int interrupt_immediately = 0; |
|
|
|
static void initialize_shell_signals __P((void)); |
|
|
|
----------------------------------------------------------------------------- |
|
|
|
Port to HP-UX 11i and similar less smart platforms. |
|
|
|
Index: configure |
|
--- configure.orig 2004-07-21 22:18:56 +0200 |
|
+++ configure 2004-07-27 19:47:10 +0200 |
|
@@ -1479,6 +1479,7 @@ |
|
*-beos*) opt_bash_malloc=no ;; # they say it's suitable |
|
*-cygwin*) opt_bash_malloc=no ;; # Cygnus's CYGWIN environment |
|
*-opennt*|*-interix*) opt_bash_malloc=no ;; # Interix, now owned by Microsoft |
|
+*-hpux*) opt_bash_malloc=no ;; # HP HP-UX |
|
esac |
|
|
|
# memory scrambling on free() |
|
@@ -1624,7 +1625,7 @@ |
|
|
|
else |
|
MALLOC_LIB= |
|
- MALLOC_LIBRARY= |
|
+ MALLOC_LIBRARY=dummy |
|
MALLOC_LDFLAGS= |
|
MALLOC_DEP= |
|
fi |
|
Index: syntax.h |
|
--- syntax.h.orig 2004-04-15 05:19:36 +0200 |
|
+++ syntax.h 2004-07-27 19:47:10 +0200 |
|
@@ -21,6 +21,8 @@ |
|
#ifndef _SYNTAX_H_ |
|
#define _SYNTAX_H_ |
|
|
|
+#include "config.h" |
|
+ |
|
/* Defines for use by mksyntax.c */ |
|
|
|
#define slashify_in_quotes "\\`$\"\n" |
|
|
|
----------------------------------------------------------------------------- |
|
|
|
This adds the OpenPKG packaging brand. |
|
|
|
Index: version.c |
|
--- version.c.orig 2003-12-19 22:34:02 +0100 |
|
+++ version.c 2004-07-27 19:47:10 +0200 |
|
@@ -77,7 +77,7 @@ |
|
show_shell_version (extended) |
|
int extended; |
|
{ |
|
- printf ("GNU bash, version %s (%s)\n", shell_version_string (), MACHTYPE); |
|
+ printf ("GNU bash, version %s (%s) [@l_openpkg_release@]\n", shell_version_string (), MACHTYPE); |
|
if (extended) |
|
printf (_("Copyright (C) 2004 Free Software Foundation, Inc.\n")); |
|
} |
|
|
|
----------------------------------------------------------------------------- |
|
|
|
Remove dependency to Bison/Yacc by applying a vendor patch to a generated file. |
|
|
|
Index: y.tab.c |
|
--- y.tab.c.orig 2005-11-14 15:53:30 +0100 |
|
+++ y.tab.c 2006-03-06 22:46:56 +0100 |
|
@@ -4237,7 +4237,7 @@ |
|
if (open == ch) /* undo previous increment */ |
|
count--; |
|
if (ch == '(') /* ) */ |
|
- nestret = parse_matched_pair (0, '(', ')', &nestlen, rflags); |
|
+ nestret = parse_matched_pair (0, '(', ')', &nestlen, rflags & ~P_DQUOTE); |
|
else if (ch == '{') /* } */ |
|
nestret = parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|rflags); |
|
else if (ch == '[') /* ] */
|
|
|