aboutsummaryrefslogtreecommitdiff
path: root/cmd-string.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2008-06-19 21:20:27 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2008-06-19 21:20:27 +0000
commit85135221f08d2e2d54269c8b8fc4325833c2fe9d (patch)
tree60fc49fda53deff487ce4f2a3db6f4a6ad0d9ef0 /cmd-string.c
parent0695db3889928969d4281859bbe676d7c8605f49 (diff)
downloadrtmux-85135221f08d2e2d54269c8b8fc4325833c2fe9d.tar.gz
rtmux-85135221f08d2e2d54269c8b8fc4325833c2fe9d.tar.bz2
rtmux-85135221f08d2e2d54269c8b8fc4325833c2fe9d.zip
Handle commented lines.
Diffstat (limited to 'cmd-string.c')
-rw-r--r--cmd-string.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/cmd-string.c b/cmd-string.c
index 33496222..e28cef2d 100644
--- a/cmd-string.c
+++ b/cmd-string.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-string.c,v 1.2 2008-06-19 21:13:56 nicm Exp $ */
+/* $Id: cmd-string.c,v 1.3 2008-06-19 21:20:27 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -39,6 +39,10 @@ cmd_string_getc(const char *s, size_t *p)
return (s[(*p)++]);
}
+/*
+ * Parse command string. Return command or NULL on error. If returning NULL,
+ * cause is error string, or NULL for empty command.
+ */
struct cmd *
cmd_string_parse(const char *s, char **cause)
{
@@ -56,6 +60,8 @@ cmd_string_parse(const char *s, char **cause)
cmd = NULL;
+ *cause = NULL;
+
p = 0;
for (;;) {
ch = cmd_string_getc(s, &p);
@@ -94,7 +100,7 @@ cmd_string_parse(const char *s, char **cause)
if (ch != EOF)
break;
if (argc == 0)
- goto error;
+ goto out;
cmd = cmd_parse(argc, argv, cause);
goto out;