diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Zle/zle_tricky.c | 19 |
2 files changed, 20 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 7815d3e1c..73c3c98e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-03-28 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * 23246: Src/Zle/zle_tricky.c: fix completion of redirections that + occur before the command word. + 2007-03-28 Clint Adams <clint@zsh.org> * 23241: Daniel Qarras: Completion/Unix/Command/_module: diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c index 68e104370..6aaf53e80 100644 --- a/Src/Zle/zle_tricky.c +++ b/Src/Zle/zle_tricky.c @@ -1072,6 +1072,12 @@ get_comp_string(void) * still use zlemetacs. */ int qsub, zlemetacs_qsub = 0; + /* + * redirpos is used to record string arguments for redirection + * when they occur at the start of the line. In this case + * the command word is not at index zero in the array. + */ + int redirpos; char *s = NULL, *tmp, *p, *tt = NULL, rdop[20]; char *linptr, *u; @@ -1130,7 +1136,7 @@ get_comp_string(void) lexsave(); inpush(dupstrspace(linptr), 0, NULL); strinbeg(0); - i = tt0 = cp = rd = ins = oins = linarr = parct = ia = 0; + i = tt0 = cp = rd = ins = oins = linarr = parct = ia = redirpos = 0; /* This loop is possibly the wrong way to do this. It goes through * * the previously massaged command line using the lexer. It stores * @@ -1186,6 +1192,9 @@ get_comp_string(void) else strcpy(rdop, tokstrings[tok]); strcpy(rdstr, rdop); + /* Record if we haven't had the command word yet */ + if (i == redirpos) + redirpos++; } if (tok == DINPAR) tokstr = NULL; @@ -1204,7 +1213,7 @@ get_comp_string(void) if (tt) break; /* Otherwise reset the variables we are collecting data in. */ - i = tt0 = cp = rd = ins = 0; + i = tt0 = cp = rd = ins = redirpos = 0; } if (lincmd && (tok == STRING || tok == FOR || tok == FOREACH || tok == SELECT || tok == REPEAT || tok == CASE)) { @@ -1213,7 +1222,9 @@ get_comp_string(void) ins = (tok == REPEAT ? 2 : (tok != STRING)); zsfree(cmdstr); cmdstr = ztrdup(tokstr); - i = 0; + /* If everything before is a redirection, don't reset the index */ + if (i != redirpos) + i = redirpos = 0; } if (!zleparse && !tt0) { /* This is done when the lexer reached the word the cursor is on. */ @@ -1399,9 +1410,9 @@ get_comp_string(void) * foo[_ wrong (note no $). If we are in a subscript, treat it * * as being in math. */ if (inwhat != IN_MATH) { - int i = 0; char *nnb, *nb = NULL, *ne = NULL; + i = 0; MB_METACHARINIT(); if (itype_end(s, IIDENT, 1) == s) nnb = s + MB_METACHARLEN(s); |