diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2008-09-29 08:46:21 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2008-09-29 08:46:21 +0000 |
| commit | 59dd1491c64886492f2fd20e6929a890c844034a (patch) | |
| tree | 8d883ea2c4b1a8796b55f92c92c4f79a448c917f /Src/exec.c | |
| parent | dd3a749ce985891e9fb0b57f0e2c139aea12d3e6 (diff) | |
| download | zsh-59dd1491c64886492f2fd20e6929a890c844034a.tar.gz zsh-59dd1491c64886492f2fd20e6929a890c844034a.zip | |
users/13295, tweaked: dont reset line numbers when parsing strings, sometimes
Diffstat (limited to 'Src/exec.c')
| -rw-r--r-- | Src/exec.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Src/exec.c b/Src/exec.c index 36e381eaa..bf23a34da 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -188,15 +188,17 @@ static struct builtin commandbn = /**/ mod_export Eprog -parse_string(char *s) +parse_string(char *s, int reset_lineno) { Eprog p; - zlong oldlineno = lineno; + zlong oldlineno; lexsave(); inpush(s, INP_LINENO, NULL); strinbeg(0); - lineno = 1; + oldlineno = lineno; + if (reset_lineno) + lineno = 1; p = parse_list(); lineno = oldlineno; if (tok == LEXERR && !lastval) @@ -954,7 +956,7 @@ execstring(char *s, int dont_change_job, int exiting) Eprog prog; pushheap(); - if ((prog = parse_string(s))) + if ((prog = parse_string(s, 0))) execode(prog, dont_change_job, exiting); popheap(); } @@ -3445,7 +3447,7 @@ getoutput(char *cmd, int qt) pid_t pid; char *s; - if (!(prog = parse_string(cmd))) + if (!(prog = parse_string(cmd, 0))) return NULL; if ((s = simple_redir_name(prog, REDIR_READ))) { @@ -3566,7 +3568,7 @@ parsecmd(char *cmd) return NULL; } *str = '\0'; - if (str[1] || !(prog = parse_string(cmd + 2))) { + if (str[1] || !(prog = parse_string(cmd + 2, 0))) { zerr("parse error in process substitution"); return NULL; } @@ -4453,7 +4455,7 @@ getfpfunc(char *s, int *ksh, char **fname) d = metafy(d, rlen, META_REALLOC); scriptname = dupstring(s); - r = parse_string(d); + r = parse_string(d, 1); scriptname = oldscriptname; if (fname) |