diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2002-09-09 22:25:50 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2002-09-09 22:25:50 +0000 |
| commit | f71e7b3c607a21e5277c56b06083f51f148c3889 (patch) | |
| tree | 0722b56a89ad46fc9aece7c95e7753c6de66d0da /shells/bash | |
| parent | Fix MASTER_SITES and WWW [1]. While I'm here, fix the description. (diff) | |
Use the offical vendor patch for the directory space vs. slash command name
completion problem.
Submitted by: Chet Ramey <chet@po.CWRU.Edu>
Bash PR: http://mail.gnu.org/pipermail/bug-bash/2002-July/004789.html
Notes
Notes:
svn path=/head/; revision=65965
Diffstat (limited to 'shells/bash')
| -rw-r--r-- | shells/bash/Makefile | 3 | ||||
| -rw-r--r-- | shells/bash/distinfo | 1 | ||||
| -rw-r--r-- | shells/bash/files/patch-bashline.c | 26 |
3 files changed, 4 insertions, 26 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 55ea04eab274..643a522d66bd 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -17,6 +17,9 @@ MASTER_SITE_SUBDIR= bash DISTFILES= bash-${PORTVERSION}.tar.gz bash-doc-${PORTVERSION}.tar.gz .endif +PATCH_SITES= ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/ +PATCHFILES= bash205b-003 + MAINTAINER= obrien@FreeBSD.org .include <bsd.port.pre.mk> diff --git a/shells/bash/distinfo b/shells/bash/distinfo index e6509682b315..6d4f0fbcdc85 100644 --- a/shells/bash/distinfo +++ b/shells/bash/distinfo @@ -1,2 +1,3 @@ MD5 (bash-2.05b.tar.gz) = 5238251b4926d778dfe162f6ce729733 MD5 (bash-doc-2.05b.tar.gz) = 511b2d07f0f401f686e8edc551a8e47f +MD5 (bash205b-003) = 2828e78563927b806246e2b4806ee0f5 diff --git a/shells/bash/files/patch-bashline.c b/shells/bash/files/patch-bashline.c index dc6828a8e803..24b74307d966 100644 --- a/shells/bash/files/patch-bashline.c +++ b/shells/bash/files/patch-bashline.c @@ -1,31 +1,5 @@ --- 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 @@ } } |