diff options
author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2010-12-06 21:48:56 +0000 |
---|---|---|
committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2010-12-06 21:48:56 +0000 |
commit | 39e277be3c05dd13e92766cb8fc8ffc58cefdd53 (patch) | |
tree | 6e4871d04704b20c1167c4d00c696f56a4402f98 /cmd-list.c | |
parent | 1650155589968f50b1443ff5af8dfae92b9a77c3 (diff) |
|---------------------
|PatchSet 781
|Date: 2010/10/29 21:11:57
|Author: nicm
|Branch: HEAD
|Tag: (none)
|Log:
|We now send argv to the server after parsing it in the client to get the
|command, so the client should not modify it. Instead, take a copy. Fixes
|parsing command lists, reported by mcbride@.
|
|Members:
| cmd-list.c:1.5->1.6
| cmd.c:1.45->1.46
| tmux.h:1.244->1.245
Diffstat (limited to 'cmd-list.c')
-rw-r--r-- | cmd-list.c | 22 |
1 files changed, 13 insertions, 9 deletions
@@ -1,4 +1,4 @@ -/* $Id: cmd-list.c,v 1.9 2010-07-02 02:43:01 tcunha Exp $ */ +/* $Id: cmd-list.c,v 1.10 2010-12-06 21:48:56 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -29,7 +29,9 @@ cmd_list_parse(int argc, char **argv, char **cause) struct cmd *cmd; int i, lastsplit; size_t arglen, new_argc; - char **new_argv; + char **copy_argv, **new_argv; + + copy_argv = cmd_copy_argv(argc, argv); cmdlist = xmalloc(sizeof *cmdlist); cmdlist->references = 1; @@ -37,18 +39,18 @@ cmd_list_parse(int argc, char **argv, char **cause) lastsplit = 0; for (i = 0; i < argc; i++) { - arglen = strlen(argv[i]); - if (arglen == 0 || argv[i][arglen - 1] != ';') + arglen = strlen(copy_argv[i]); + if (arglen == 0 || copy_argv[i][arglen - 1] != ';') continue; - argv[i][arglen - 1] = '\0'; + copy_argv[i][arglen - 1] = '\0'; - if (arglen > 1 && argv[i][arglen - 2] == '\\') { - argv[i][arglen - 2] = ';'; + if (arglen > 1 && copy_argv[i][arglen - 2] == '\\') { + copy_argv[i][arglen - 2] = ';'; continue; } new_argc = i - lastsplit; - new_argv = argv + lastsplit; + new_argv = copy_argv + lastsplit; if (arglen != 1) new_argc++; @@ -61,16 +63,18 @@ cmd_list_parse(int argc, char **argv, char **cause) } if (lastsplit != argc) { - cmd = cmd_parse(argc - lastsplit, argv + lastsplit, cause); + cmd = cmd_parse(argc - lastsplit, copy_argv + lastsplit, cause); if (cmd == NULL) goto bad; TAILQ_INSERT_TAIL(&cmdlist->list, cmd, qentry); } + cmd_free_argv(argc, copy_argv); return (cmdlist); bad: cmd_list_free(cmdlist); + cmd_free_argv(argc, copy_argv); return (NULL); } |