mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 22:00:31 -04:00
ce9d222b68
relative to the current directory when performing command name completion. This affects partial completion of intermediate directory names." Fix this. Bash PR: http://mail.gnu.org/pipermail/bug-bash/2002-July/004789.html Obtained from: http://www.geocrawler.com/mail/msg.php3?msg_id=9514404&list=342
144 lines
4.2 KiB
C
144 lines
4.2 KiB
C
--- bashline.c.deo Tue May 7 12:52:42 2002
|
|
+++ bashline.c Sun Sep 8 18:17:30 2002
|
|
@@ -1044,6 +1044,7 @@
|
|
}
|
|
else
|
|
{
|
|
+#define CMD_IS_DIR(x) (absolute_pathname(x) == 0 && *(x) != '~' && test_for_directory (x))
|
|
matches = rl_completion_matches (text, command_word_completion_function);
|
|
/* If we are attempting command completion and nothing matches, we
|
|
do not want readline to perform filename completion for us. We
|
|
@@ -1052,7 +1053,7 @@
|
|
filenames and leave directories in the match list. */
|
|
if (matches == (char **)NULL)
|
|
rl_ignore_some_completions_function = bash_ignore_filenames;
|
|
- else if (matches[1] == 0 && *matches[0] != '/')
|
|
+ else if (matches[1] == 0 && CMD_IS_DIR(matches[0]))
|
|
/* Turn off rl_filename_completion_desired so readline doesn't
|
|
append a slash if there is a directory with the same name
|
|
in the current directory, or other filename-specific things.
|
|
@@ -1061,7 +1062,7 @@
|
|
looking in the current directory anyway, so there's no
|
|
conflict. */
|
|
rl_filename_completion_desired = 0;
|
|
- else if (matches[0] && matches[1] && STREQ (matches[0], matches[1]) && *matches[0] != '/')
|
|
+ else if (matches[0] && matches[1] && STREQ (matches[0], matches[1]) && CMD_IS_DIR (matches[0]))
|
|
/* There are multiple instances of the same match (duplicate
|
|
completions haven't yet been removed). In this case, all of
|
|
the matches will be the same, and the duplicate removal code
|
|
@@ -1873,10 +1874,6 @@
|
|
}
|
|
}
|
|
|
|
-/* Define NO_FORCE_FIGNORE if you want to match filenames that would
|
|
- otherwise be ignored if they are the only possible matches. */
|
|
-/* #define NO_FORCE_FIGNORE */
|
|
-
|
|
/* 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
|
|
@@ -1901,10 +1898,15 @@
|
|
{
|
|
char **newnames;
|
|
int idx, nidx;
|
|
-#ifdef NO_FORCE_FIGNORE
|
|
char **oldnames;
|
|
int oidx;
|
|
-#endif
|
|
+ char *no_force_fignore;
|
|
+
|
|
+
|
|
+/* Set NO_FORCE_FIGNORE if you want to match filenames that would
|
|
+ otherwise be ignored if they are the only possible matches. */
|
|
+ no_force_fignore = get_string_value ("NO_FORCE_FIGNORE");
|
|
+//fprintf(stderr, ">NO_FORCE_FIGNORE< is [%s]\n", no_force_fignore);
|
|
|
|
/* 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
|
|
@@ -1912,13 +1914,12 @@
|
|
if there is only one completion; it is the completion itself. */
|
|
if (names[1] == (char *)0)
|
|
{
|
|
-#ifndef NO_FORCE_FIGNORE
|
|
- if ((*name_func) (names[0]) == 0)
|
|
- {
|
|
- free (names[0]);
|
|
- names[0] = (char *)NULL;
|
|
- }
|
|
-#endif
|
|
+ if (!no_force_fignore)
|
|
+ if ((*name_func) (names[0]) == 0)
|
|
+ {
|
|
+ free (names[0]);
|
|
+ names[0] = (char *)NULL;
|
|
+ }
|
|
return;
|
|
}
|
|
|
|
@@ -1927,10 +1928,11 @@
|
|
for (nidx = 1; names[nidx]; nidx++)
|
|
;
|
|
newnames = strvec_create (nidx + 1);
|
|
-#ifdef NO_FORCE_FIGNORE
|
|
- oldnames = strvec_create (nidx - 1);
|
|
- oidx = 0;
|
|
-#endif
|
|
+ if (no_force_fignore)
|
|
+ {
|
|
+ oldnames = strvec_create (nidx - 1);
|
|
+ oidx = 0;
|
|
+ }
|
|
|
|
newnames[0] = names[0];
|
|
for (idx = nidx = 1; names[idx]; idx++)
|
|
@@ -1938,11 +1940,10 @@
|
|
if ((*name_func) (names[idx]))
|
|
newnames[nidx++] = names[idx];
|
|
else
|
|
-#ifndef NO_FORCE_FIGNORE
|
|
- free (names[idx]);
|
|
-#else
|
|
- oldnames[oidx++] = names[idx];
|
|
-#endif
|
|
+ if (no_force_fignore)
|
|
+ oldnames[oidx++] = names[idx];
|
|
+ else
|
|
+ free (names[idx]);
|
|
}
|
|
|
|
newnames[nidx] = (char *)NULL;
|
|
@@ -1950,21 +1951,23 @@
|
|
/* If none are acceptable then let the completer handle it. */
|
|
if (nidx == 1)
|
|
{
|
|
-#ifndef NO_FORCE_FIGNORE
|
|
- free (names[0]);
|
|
- names[0] = (char *)NULL;
|
|
-#else
|
|
- free (oldnames);
|
|
-#endif
|
|
+ if (no_force_fignore)
|
|
+ free (oldnames);
|
|
+ else
|
|
+ {
|
|
+ free (names[0]);
|
|
+ names[0] = (char *)NULL;
|
|
+ }
|
|
free (newnames);
|
|
return;
|
|
}
|
|
|
|
-#ifdef NO_FORCE_FIGNORE
|
|
- while (oidx)
|
|
- free (oldnames[--oidx]);
|
|
- free (oldnames);
|
|
-#endif
|
|
+ if (no_force_fignore)
|
|
+ {
|
|
+ while (oidx)
|
|
+ free (oldnames[--oidx]);
|
|
+ free (oldnames);
|
|
+ }
|
|
|
|
/* If only one is acceptable, copy it to names[0] and return. */
|
|
if (nidx == 2)
|