diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Src/exec.c | 2 | ||||
| -rw-r--r-- | zshconfig.ac | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 856f8c634..cea1cba31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-09-15 Oliver Kiddle <opk@zsh.org> + + * Vin Shelton: 19073: Src/exec.c (execcmd): Replace C++-style comment. + + * Vin Shelton: 19038: zshconfig.ac: Make sed grok icc's cpp output. + 2003-09-14 Peter Stephenson <pws@pwstephenson.fsnet.co.uk> * 19053 modified c.f. 19056: Functions/MIME, Doc/Zsh/contrib.yo: diff --git a/Src/exec.c b/Src/exec.c index ba3026e37..daf4ce36d 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -1824,7 +1824,7 @@ execcmd(Estate state, int input, int output, int how, int last1) cflags |= hn->flags; checked = 0; if (cflags & BINF_COMMAND && nextnode(firstnode(args))) { - // check for options to command builtin + /* check for options to command builtin */ char *next = (char *) getdata(nextnode(firstnode(args))); char *cmdopt; if (next && *next == '-' && strlen(next) == 2 && diff --git a/zshconfig.ac b/zshconfig.ac index 48bb3c069..dbc19b87c 100644 --- a/zshconfig.ac +++ b/zshconfig.ac @@ -1081,7 +1081,8 @@ dnl The backslash substitution is to persuade cygwin to cough up dnl slashes rather than doubled backslashes in the path. echo "#include <signal.h>" > nametmp.c sigfile_list="`$CPP nametmp.c | -sed -n 's/^#[ ].*\"\(.*\)\"/\1/p' | +sed -n -e 's/^#line[ ].*\"\(.*\)\"/\1/p' \ + -e 's/^#[ ].*\"\(.*\)\"/\1/p' | sed 's/\\\\\\\\/\//g' | $AWK '{ if (\$1 ~ \"sig\") files[[\$1]] = \$1 } END { for (var in files) print var }'`" @@ -1128,7 +1129,8 @@ dnl The backslash substitution is to persuade cygwin to cough up dnl slashes rather than doubled backslashes in the path. echo "#include <errno.h>" > nametmp.c errfile_list="`$CPP nametmp.c | -sed -n 's/^#[ ].*\"\(.*\)\"/\1/p' | +sed -n -e 's/^#line[ ].*\"\(.*\)\"/\1/p' \ + -e 's/^#[ ].*\"\(.*\)\"/\1/p' | sed 's/\\\\\\\\/\//g' | $AWK '{ if (\$1 ~ \"err\") files[[\$1]] = \$1 } END { for (var in files) print var }'`" |