diff options
Diffstat (limited to 'shells/bash2/files/patch-bashline.c')
| -rw-r--r-- | shells/bash2/files/patch-bashline.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/shells/bash2/files/patch-bashline.c b/shells/bash2/files/patch-bashline.c index 62f2199612dc..ba47a7d17073 100644 --- a/shells/bash2/files/patch-bashline.c +++ b/shells/bash2/files/patch-bashline.c @@ -1,6 +1,6 @@ ---- bashline.c.orig Mon Nov 5 09:58:59 2001 -+++ bashline.c Sun Mar 24 19:15:04 2002 -@@ -1724,10 +1724,6 @@ +--- bashline.c.orig Wed May 8 04:52:42 2002 ++++ bashline.c Wed Jul 24 05:54:07 2002 +@@ -1873,10 +1873,6 @@ } } @@ -11,7 +11,7 @@ /* If FIGNORE is set, then don't match files with the given suffixes when completing filenames. If only one of the possibilities has an acceptable suffix, delete the others, else just return and let the completer -@@ -1752,10 +1748,15 @@ +@@ -1901,10 +1897,15 @@ { char **newnames; int idx, nidx; @@ -29,7 +29,7 @@ /* If there is only one completion, see if it is acceptable. If it is not, free it up. In any case, short-circuit and return. This is a -@@ -1763,13 +1764,12 @@ +@@ -1912,13 +1913,12 @@ if there is only one completion; it is the completion itself. */ if (names[1] == (char *)0) { @@ -49,23 +49,23 @@ return; } -@@ -1778,10 +1778,11 @@ +@@ -1927,10 +1927,11 @@ for (nidx = 1; names[nidx]; nidx++) ; - newnames = alloc_array (nidx + 1); + newnames = strvec_create (nidx + 1); -#ifdef NO_FORCE_FIGNORE -- oldnames = alloc_array (nidx - 1); +- oldnames = strvec_create (nidx - 1); - oidx = 0; -#endif + if (no_force_fignore) + { -+ oldnames = alloc_array (nidx - 1); ++ oldnames = strvec_create (nidx - 1); + oidx = 0; + } newnames[0] = names[0]; for (idx = nidx = 1; names[idx]; idx++) -@@ -1789,11 +1790,10 @@ +@@ -1938,11 +1939,10 @@ if ((*name_func) (names[idx])) newnames[nidx++] = names[idx]; else @@ -81,7 +81,7 @@ } newnames[nidx] = (char *)NULL; -@@ -1801,21 +1801,23 @@ +@@ -1950,21 +1950,23 @@ /* If none are acceptable then let the completer handle it. */ if (nidx == 1) { |