From da0481ced96f0c587da25dc7252e028095e90420 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 30 Nov 2010 20:30:41 -0800 Subject: Remove Vyatta mods to allow empty command completion Newer versions of bash supports completing on empty command line. No Vyatta changes are necessary. --- pcomplete.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pcomplete.c b/pcomplete.c index 541bdad..e4f2059 100644 --- a/pcomplete.c +++ b/pcomplete.c @@ -1503,20 +1503,15 @@ programmable_completions (cmd, word, start, end, foundp) { retry = 0; - if (in_vyatta_restricted_mode(OUTPUT) && strcmp(cmd, word) == 0) { - /* command completion */ - ret = gen_progcomp_completions ("", cmd, word, start, end, &found, &retry, &lastcs); - } else { - /* We look at the basename of CMD if the full command does not have - an associated COMPSPEC. */ - ret = gen_progcomp_completions (cmd, cmd, word, start, end, &found, &retry, &lastcs); - if (found == 0) - { - t = strrchr (cmd, '/'); - if (t && *(++t)) - ret = gen_progcomp_completions (t, cmd, word, start, end, &found, &retry, &lastcs); - } - } + /* We look at the basename of CMD if the full command does not have + an associated COMPSPEC. */ + ret = gen_progcomp_completions (cmd, cmd, word, start, end, &found, &retry, &lastcs); + if (found == 0) + { + t = strrchr (cmd, '/'); + if (t && *(++t)) + ret = gen_progcomp_completions (t, cmd, word, start, end, &found, &retry, &lastcs); + } if (found == 0) ret = gen_progcomp_completions (DEFAULTCMD, cmd, word, start, end, &found, &retry, &lastcs); -- cgit v1.2.3