1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
|
Only in : .gdbinit
diff -rc bash-2.03.old/builtins/shopt.def builtins/shopt.def
*** bash-2.03.old/builtins/shopt.def Tue Nov 10 18:56:03 1998
--- builtins/shopt.def Mon Aug 2 17:16:36 1999
***************
*** 56,62 ****
#define OPTFMT "%-15s\t%s\n"
! extern int allow_null_glob_expansion, glob_dot_filenames;
extern int cdable_vars, mail_warning, source_uses_path;
extern int no_exit_on_failed_exec, print_shift_error;
extern int check_hashed_filenames, promptvars, interactive_comments;
--- 56,62 ----
#define OPTFMT "%-15s\t%s\n"
! extern int allow_null_glob_expansion, fail_glob_expansion, glob_dot_filenames;
extern int cdable_vars, mail_warning, source_uses_path;
extern int no_exit_on_failed_exec, print_shift_error;
extern int check_hashed_filenames, promptvars, interactive_comments;
***************
*** 128,133 ****
--- 128,134 ----
{ "mailwarn", &mail_warning, (Function *)NULL },
{ "nocaseglob", &glob_ignore_case, (Function *)NULL },
{ "nullglob", &allow_null_glob_expansion, (Function *)NULL },
+ { "failglob", &fail_glob_expansion, (Function *)NULL },
{ "promptvars", &promptvars, (Function *)NULL },
#if defined (RESTRICTED_SHELL)
{ "restricted_shell", &restricted_shell, set_restricted_shell },
diff -rc bash-2.03.old/doc/bash.1 doc/bash.1
*** bash-2.03.old/doc/bash.1 Wed Jan 20 22:48:04 1999
--- doc/bash.1 Mon Aug 2 17:37:38 1999
***************
*** 2305,2310 ****
--- 2305,2314 ----
.B nullglob
option is set, and no matches are found,
the word is removed.
+ If the
+ .B failglob
+ option is set, and no matches are found, an error message is printed
+ and the command is not executed.
If the shell option
.B nocaseglob
is enabled, the match is performed without regard to the case
diff -rc bash-2.03.old/doc/bashref.texi doc/bashref.texi
*** bash-2.03.old/doc/bashref.texi Wed Jan 20 22:47:01 1999
--- doc/bashref.texi Mon Aug 2 17:35:41 1999
***************
*** 1585,1591 ****
and replaced with an alphabetically sorted list of
file names matching the pattern. If no matching file names are found,
and the shell option @code{nullglob} is disabled, the word is left
! unchanged.
If the @code{nullglob} option is set, and no matches are found, the word
is removed.
If the shell option @code{nocaseglob} is enabled, the match is performed
--- 1585,1592 ----
and replaced with an alphabetically sorted list of
file names matching the pattern. If no matching file names are found,
and the shell option @code{nullglob} is disabled, the word is left
! unchanged. If the @code{failglob} option is set, an error message is
! printed and the commandline is not executed.
If the @code{nullglob} option is set, and no matches are found, the word
is removed.
If the shell option @code{nocaseglob} is enabled, the match is performed
***************
*** 1598,1605 ****
matched explicitly.
In other cases, the @samp{.} character is not treated specially.
! See the description of @code{shopt} in @ref{Bash Builtins},
! for a description of the @code{nocaseglob}, @code{nullglob},
and @code{dotglob} options.
The @code{GLOBIGNORE}
--- 1599,1606 ----
matched explicitly.
In other cases, the @samp{.} character is not treated specially.
! See the description of @code{shopt} in @ref{Bash Builtins}, for a
! description of the @code{nocaseglob}, @code{nullglob}, @code{failglob}
and @code{dotglob} options.
The @code{GLOBIGNORE}
***************
*** 3814,3819 ****
--- 3815,3824 ----
@item extglob
If set, the extended pattern matching features described above
(@pxref{Pattern Matching}) are enabled.
+
+ @item failglob
+ If set, filenames that have globbing characters in them, but don't match
+ anything, will cause an error.
@item histappend
If set, the history list is appended to the file named by the value
Only in bash-2.03.old/lib/readline/doc: Makefile
diff -rc bash-2.03.old/subst.c subst.c
*** bash-2.03.old/subst.c Wed Jan 20 18:13:52 1999
--- subst.c Mon Aug 2 17:17:17 1999
***************
*** 96,101 ****
--- 96,104 ----
a null file. */
int allow_null_glob_expansion;
+ /* Non-zero means to signal an error when globbing fails to match. */
+ int fail_glob_expansion;
+
/* Variables to keep track of which words in an expanded word list (the
output of expand_word_list_internal) are the result of globbing
expansions. GLOB_ARGV_FLAGS is used by execute_cmd.c. */
***************
*** 5667,5672 ****
--- 5670,5680 ----
{
output_list = (WORD_LIST *)list_append (glob_list, output_list);
PREPEND_LIST (tlist, disposables);
+ }
+ else if (fail_glob_expansion != 0)
+ {
+ report_error ("no match: %s", tlist->word->word);
+ jump_to_top_level (DISCARD);
}
else if (allow_null_glob_expansion == 0)
{
diff -rc bash-2.03.old/tests/shopt.right tests/shopt.right
*** bash-2.03.old/tests/shopt.right Thu Sep 3 21:16:28 1998
--- tests/shopt.right Mon Aug 2 17:31:19 1999
***************
*** 20,25 ****
--- 20,26 ----
shopt -u mailwarn
shopt -u nocaseglob
shopt -u nullglob
+ shopt -u failglob
shopt -s promptvars
shopt -u restricted_shell
shopt -u shift_verbose
***************
*** 51,56 ****
--- 52,58 ----
shopt -u mailwarn
shopt -u nocaseglob
shopt -u nullglob
+ shopt -u failglob
shopt -u restricted_shell
shopt -u shift_verbose
--
***************
*** 68,73 ****
--- 70,76 ----
mailwarn off
nocaseglob off
nullglob off
+ failglob off
restricted_shell off
shift_verbose off
--
***************
*** 190,192 ****
--- 193,197 ----
--
./shopt.tests: shopt: xyz1: unknown shell option name
./shopt.tests: shopt: xyz1: unknown option name
+ tmp/l1 tmp/l2 tmp/*4 tmp/l3
+ ./shopt.tests: no match: tmp/*4
diff -rc bash-2.03.old/tests/shopt.tests tests/shopt.tests
*** bash-2.03.old/tests/shopt.tests Thu Nov 20 17:59:32 1997
--- tests/shopt.tests Mon Aug 2 17:26:43 1999
***************
*** 21,26 ****
--- 21,27 ----
shopt -u mailwarn
shopt -u nocaseglob
shopt -u nullglob
+ shopt -u failglob
shopt -s promptvars
shopt -u shift_verbose
shopt -s sourcepath
***************
*** 91,93 ****
--- 92,102 ----
builtin printf -- "--\n"
shopt -p xyz1
shopt -o -p xyz1
+
+ mkdir tmp
+ touch tmp/l1 tmp/l2 tmp/l3
+ builtin echo tmp/l[12] tmp/*4 tmp/*3
+ shopt -s failglob
+ builtin echo tmp/l[12] tmp/*4 tmp/*3
+ rm -r tmp
+ shopt -u failglob
|
