diff options
author | Chet Ramey <chet.ramey@case.edu> | 2015-08-13 15:38:31 -0400 |
---|---|---|
committer | Tom Powell <zifnab@zifnab06.net> | 2015-10-08 20:53:30 -0700 |
commit | 857afac0f64e6be71026c49215f16ba7ca5fef71 (patch) | |
tree | ebc80903f998da74eeacdf0738c571f43cdc01f3 | |
parent | 4d010329a43b9b008495459831a8702bbed566a6 (diff) | |
download | android_external_bash-857afac0f64e6be71026c49215f16ba7ca5fef71.tar.gz android_external_bash-857afac0f64e6be71026c49215f16ba7ca5fef71.tar.bz2 android_external_bash-857afac0f64e6be71026c49215f16ba7ca5fef71.zip |
Bash-4.3 patch 41
Change-Id: Idb9857dac265c724460d61857c0643815d96eb9d
-rw-r--r-- | bashline.c | 13 | ||||
-rw-r--r-- | lib/readline/complete.c | 2 | ||||
-rw-r--r-- | patchlevel.h | 2 |
3 files changed, 16 insertions, 1 deletions
@@ -1468,10 +1468,23 @@ attempt_shell_completion (text, start, end) os = start; n = 0; + was_assignment = 0; s = find_cmd_start (os); e = find_cmd_end (end); do { + /* Don't read past the end of rl_line_buffer */ + if (s > rl_end) + { + s1 = s = e1; + break; + } + /* Or past point if point is within an assignment statement */ + else if (was_assignment && s > rl_point) + { + s1 = s = e1; + break; + } /* Skip over assignment statements preceding a command name. If we don't find a command name at all, we can perform command name completion. If we find a partial command name, we should perform diff --git a/lib/readline/complete.c b/lib/readline/complete.c index 544fc46..3956205 100644 --- a/lib/readline/complete.c +++ b/lib/readline/complete.c @@ -689,6 +689,8 @@ printable_part (pathname) if (temp == 0 || *temp == '\0') return (pathname); + else if (temp[1] == 0 && temp == pathname) + return (pathname); /* If the basename is NULL, we might have a pathname like '/usr/src/'. Look for a previous slash and, if one is found, return the portion following that slash. If there's no previous slash, just return the diff --git a/patchlevel.h b/patchlevel.h index 6b73b14..44f59c7 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -25,6 +25,6 @@ regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh looks for to find the patch level (for the sccs version string). */ -#define PATCHLEVEL 40 +#define PATCHLEVEL 41 #endif /* _PATCHLEVEL_H_ */ |