diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-02-19 17:14:24 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-02-19 17:14:24 +0000 |
| commit | f9d0b92bd3c413b26bbd19ea548d44fb146a92c5 (patch) | |
| tree | 4cbbe721893dd029d3262c3fe75d6a8488320a0b | |
| parent | 38dd9cda0ae564bb34f57c2a3963465041bbf372 (diff) | |
have_arg matches buf so it is no longer necessary, spotted by Tim van der
Molen.
| -rw-r--r-- | usr.bin/tmux/cmd-string.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/usr.bin/tmux/cmd-string.c b/usr.bin/tmux/cmd-string.c index 8327029fd28..a0c6a0f050f 100644 --- a/usr.bin/tmux/cmd-string.c +++ b/usr.bin/tmux/cmd-string.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-string.c,v 1.13 2010/01/31 18:47:03 nicm Exp $ */ +/* $OpenBSD: cmd-string.c,v 1.14 2010/02/19 17:14:23 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -61,7 +61,7 @@ int cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause) { size_t p; - int ch, i, argc, rval, have_arg; + int ch, i, argc, rval; char **argv, *buf, *t; const char *whitespace, *equals; size_t len; @@ -72,8 +72,6 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause) buf = NULL; len = 0; - have_arg = 0; - *cause = NULL; *cmdlist = NULL; @@ -90,8 +88,6 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause) strlcpy(buf + len, t, strlen(t) + 1); len += strlen(t); xfree(t); - - have_arg = 1; break; case '"': if ((t = cmd_string_string(s, &p, '"', 1)) == NULL) @@ -100,8 +96,6 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause) strlcpy(buf + len, t, strlen(t) + 1); len += strlen(t); xfree(t); - - have_arg = 1; break; case '$': if ((t = cmd_string_variable(s, &p)) == NULL) @@ -110,8 +104,6 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause) strlcpy(buf + len, t, strlen(t) + 1); len += strlen(t); xfree(t); - - have_arg = 1; break; case '#': /* Comment: discard rest of line. */ @@ -121,7 +113,7 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause) case EOF: case ' ': case '\t': - if (have_arg) { + if (buf != NULL) { buf = xrealloc(buf, 1, len + 1); buf[len] = '\0'; @@ -130,8 +122,6 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause) buf = NULL; len = 0; - - have_arg = 0; } if (ch != EOF) @@ -156,7 +146,7 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause) rval = 0; goto out; case '~': - if (have_arg == 0) { + if (buf == NULL) { if ((t = cmd_string_expand_tilde(s, &p)) == NULL) goto error; buf = xrealloc(buf, 1, len + strlen(t) + 1); @@ -172,8 +162,6 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause) buf = xrealloc(buf, 1, len + 1); buf[len++] = ch; - - have_arg = 1; break; } } |