3
if [ $# -eq 3 -a "$2" = '-d' ]; then
5
elif [ $# -ne 1 ]; then
6
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
10
-patch) patch $pdir -f --no-backup-if-mismatch -p0 < $0;;
11
-unpatch) patch $pdir -f --no-backup-if-mismatch -R -p0 < $0;;
13
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
18
# DP: bash-4.0 upstream fix 013
26
Bug-Reported-by: jidanni@jidanni.org
28
Bug-Reference-URL: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=519165
32
Though references to $@ when there are no positional parameters will now
33
cause the shell to exit if the `errexit' option has been enabled, constructs
34
such as ${@:-foo} should not cause an exit.
38
*** ../bash-4.0-patched/subst.c 2009-03-08 21:24:39.000000000 -0400
39
--- subst.c 2009-03-14 19:04:10.000000000 -0400
43
/* Flags for the `pflags' argument to param_expand() */
44
#define PF_NOCOMSUB 0x01 /* Do not perform command substitution */
45
+ #define PF_IGNUNBOUND 0x02 /* ignore unbound vars even if -u set */
47
/* These defs make it easier to use the editor. */
50
static int chk_arithsub __P((const char *, int));
52
! static WORD_DESC *parameter_brace_expand_word __P((char *, int, int));
53
static WORD_DESC *parameter_brace_expand_indir __P((char *, int, int, int *, int *));
54
static WORD_DESC *parameter_brace_expand_rhs __P((char *, char *, int, int, int *, int *));
56
static int chk_arithsub __P((const char *, int));
58
! static WORD_DESC *parameter_brace_expand_word __P((char *, int, int, int));
59
static WORD_DESC *parameter_brace_expand_indir __P((char *, int, int, int *, int *));
60
static WORD_DESC *parameter_brace_expand_rhs __P((char *, char *, int, int, int *, int *));
63
NAME was found inside of a double-quoted expression. */
65
! parameter_brace_expand_word (name, var_is_special, quoted)
67
! int var_is_special, quoted;
71
NAME was found inside of a double-quoted expression. */
73
! parameter_brace_expand_word (name, var_is_special, quoted, pflags)
75
! int var_is_special, quoted, pflags;
81
ret = param_expand (tt, &sindex, quoted, (int *)NULL, (int *)NULL,
82
! (int *)NULL, (int *)NULL, 0);
87
ret = param_expand (tt, &sindex, quoted, (int *)NULL, (int *)NULL,
88
! (int *)NULL, (int *)NULL, pflags);
95
! w = parameter_brace_expand_word (name, var_is_special, quoted);
97
/* Have to dequote here if necessary */
101
! w = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND);
103
/* Have to dequote here if necessary */
106
return (WORD_DESC *)NULL;
108
! w = parameter_brace_expand_word (t, SPECIAL_VAR(t, 0), quoted);
112
return (WORD_DESC *)NULL;
114
! w = parameter_brace_expand_word (t, SPECIAL_VAR(t, 0), quoted, 0);
119
tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at);
121
! tdesc = parameter_brace_expand_word (name, var_is_special, quoted);
125
tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at);
127
! tdesc = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND);
132
list = list_rest_of_args ();
134
! if (list == 0 && unbound_vars_is_error)
138
list = list_rest_of_args ();
140
! if (list == 0 && unbound_vars_is_error && (pflags & PF_IGNUNBOUND) == 0)
145
list = list_rest_of_args ();
147
! if (list == 0 && unbound_vars_is_error)
151
list = list_rest_of_args ();
153
! if (list == 0 && unbound_vars_is_error && (pflags & PF_IGNUNBOUND) == 0)
158
*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
159
--- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
162
looks for to find the patch level (for the sccs version string). */
164
! #define PATCHLEVEL 12
166
#endif /* _PATCHLEVEL_H_ */
168
looks for to find the patch level (for the sccs version string). */
170
! #define PATCHLEVEL 13
172
#endif /* _PATCHLEVEL_H_ */