=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/cmd-string.c,v retrieving revision 1.28 retrieving revision 1.29 diff -c -r1.28 -r1.29 *** src/usr.bin/tmux/Attic/cmd-string.c 2017/01/24 19:53:37 1.28 --- src/usr.bin/tmux/Attic/cmd-string.c 2017/06/14 07:42:41 1.29 *************** *** 1,4 **** ! /* $OpenBSD: cmd-string.c,v 1.28 2017/01/24 19:53:37 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott --- 1,4 ---- ! /* $OpenBSD: cmd-string.c,v 1.29 2017/06/14 07:42:41 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott *************** *** 159,179 **** char **argv; *cause = NULL; ! if (cmd_string_split(s, &argc, &argv) != 0) ! goto error; if (argc != 0) { cmdlist = cmd_list_parse(argc, argv, file, line, cause); if (cmdlist == NULL) { cmd_free_argv(argc, argv); ! goto error; } } cmd_free_argv(argc, argv); return (cmdlist); - - error: - xasprintf(cause, "invalid or unknown command: %s", s); - return (NULL); } static void --- 159,177 ---- char **argv; *cause = NULL; ! if (cmd_string_split(s, &argc, &argv) != 0) { ! xasprintf(cause, "invalid or unknown command: %s", s); ! return (NULL); ! } if (argc != 0) { cmdlist = cmd_list_parse(argc, argv, file, line, cause); if (cmdlist == NULL) { cmd_free_argv(argc, argv); ! return (NULL); } } cmd_free_argv(argc, argv); return (cmdlist); } static void