diff options
author | Thomas Adam <thomas@xteddy.org> | 2019-05-25 18:41:51 +0100 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2019-05-25 18:41:51 +0100 |
commit | 463bd8abb9248c31214c951221c3cf96dbffb56e (patch) | |
tree | ea7bd85988b7dedd4bb24c72743e3b473f3c8fa7 /cmd-list.c | |
parent | a69211aff5968f2bf71f0471cc67124dbd4597dd (diff) | |
parent | a65a6d62d19136e20ce6e6ec72d676a334dcc914 (diff) | |
download | rtmux-463bd8abb9248c31214c951221c3cf96dbffb56e.tar.gz rtmux-463bd8abb9248c31214c951221c3cf96dbffb56e.tar.bz2 rtmux-463bd8abb9248c31214c951221c3cf96dbffb56e.zip |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-list.c')
-rw-r--r-- | cmd-list.c | 56 |
1 files changed, 0 insertions, 56 deletions
@@ -56,62 +56,6 @@ cmd_list_move(struct cmd_list *cmdlist, struct cmd_list *from) cmdlist->group = cmd_list_next_group++; } -struct cmd_list * -cmd_list_parse(int argc, char **argv, const char *file, u_int line, - char **cause) -{ - struct cmd_list *cmdlist; - struct cmd *cmd; - int i, lastsplit; - size_t arglen, new_argc; - char **copy_argv, **new_argv; - - copy_argv = cmd_copy_argv(argc, argv); - - cmdlist = cmd_list_new(); - - lastsplit = 0; - for (i = 0; i < argc; i++) { - arglen = strlen(copy_argv[i]); - if (arglen == 0 || copy_argv[i][arglen - 1] != ';') - continue; - copy_argv[i][arglen - 1] = '\0'; - - if (arglen > 1 && copy_argv[i][arglen - 2] == '\\') { - copy_argv[i][arglen - 2] = ';'; - continue; - } - - new_argc = i - lastsplit; - new_argv = copy_argv + lastsplit; - if (arglen != 1) - new_argc++; - - cmd = cmd_parse(new_argc, new_argv, file, line, cause); - if (cmd == NULL) - goto bad; - TAILQ_INSERT_TAIL(&cmdlist->list, cmd, qentry); - - lastsplit = i + 1; - } - - if (lastsplit != argc) { - cmd = cmd_parse(argc - lastsplit, copy_argv + lastsplit, - file, line, 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); -} - void cmd_list_free(struct cmd_list *cmdlist) { |