diff options
author | Peter Stephenson <pws@users.sourceforge.net> | 2002-08-01 15:49:54 +0000 |
---|---|---|
committer | Peter Stephenson <pws@users.sourceforge.net> | 2002-08-01 15:49:54 +0000 |
commit | 99755244bd127189d18d1aba8a6a34bfc560caf3 (patch) | |
tree | 936c939ffe12683e1e34ea7232ccae2069426c61 | |
parent | 330ecf3b0c37173ad39d97c0ee4ce54e531ba1e6 (diff) | |
download | zsh-99755244bd127189d18d1aba8a6a34bfc560caf3.tar.gz zsh-99755244bd127189d18d1aba8a6a34bfc560caf3.tar.xz zsh-99755244bd127189d18d1aba8a6a34bfc560caf3.zip |
17497: getopts skipped over zero-length arguments.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | Src/builtin.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 9bcd5b23f..88405aa39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-08-01 Peter Stephenson <pws@csr.com> + + * 17497: Src/builtin.c: getopts skipped over zero-length arguments. + 2002-07-25 Peter Stephenson <pws@csr.com> * 17481: Etc/MACHINES: from Karl Tomlinson diff --git a/Src/builtin.c b/Src/builtin.c index c2e087706..c43751711 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -3141,6 +3141,8 @@ bin_getopts(char *name, char **argv, char *ops, int func) /* find place in relevant argument */ str = unmetafy(dupstring(args[zoptind - 1]), &lenstr); + if (!lenstr) /* Definitely not an option. */ + return 1; if(optcind >= lenstr) { optcind = 0; if(!args[zoptind++]) |