Support command sequences separated by " ; ". Also clean up command printing.

cmd-list.c

@@ -0,0 +1,137 @@
+/* $Id: cmd-list.c,v 1.1 2009-01-18 14:40:48 nicm Exp $ */
+
+/*
+ * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+
+#include <string.h>
+
+#include "tmux.h"
+
+struct cmd_list *
+cmd_list_parse(int argc, char **argv, char **cause)
+{
+	struct cmd_list	*cmdlist;
+	struct cmd	*cmd;
+	int		 i, lastsplit;
+
+	cmdlist = xmalloc(sizeof *cmdlist);
+	TAILQ_INIT(cmdlist);
+
+	lastsplit = 0;
+	for (i = 0; i < argc; i++) {
+		if (strcmp(argv[i], "\\;") == 0) {
+			argv[i][0] = ';';
+			argv[i][1] = '\0';
+		} else if (strcmp(argv[i], ";") == 0) {
+			cmd = cmd_parse(i - lastsplit, argv + lastsplit, cause);
+			if (cmd == NULL)
+				goto bad;
+			TAILQ_INSERT_TAIL(cmdlist, cmd, qentry);
+			lastsplit = i + 1;
+		}
+	}
+
+	cmd = cmd_parse(argc - lastsplit, argv + lastsplit, cause);
+	if (cmd == NULL) {
+		cmd_list_free(cmdlist);
+		return (NULL);
+	}
+	TAILQ_INSERT_TAIL(cmdlist, cmd, qentry);
+       
+	return (cmdlist);
+
+bad:
+	cmd_list_free(cmdlist);
+	return (NULL);
+}
+
+void
+cmd_list_exec(struct cmd_list *cmdlist, struct cmd_ctx *ctx)
+{
+	struct cmd	*cmd;
+
+	TAILQ_FOREACH(cmd, cmdlist, qentry)
+		cmd_exec(cmd, ctx);
+}
+
+void
+cmd_list_send(struct cmd_list *cmdlist, struct buffer *b)
+{
+	struct cmd	*cmd;
+	u_int		 n;
+
+	n = 0;
+	TAILQ_FOREACH(cmd, cmdlist, qentry)
+	    	n++;
+
+	buffer_write(b, &n, sizeof n);
+	TAILQ_FOREACH(cmd, cmdlist, qentry)
+	    	cmd_send(cmd, b);
+}
+
+struct cmd_list *
+cmd_list_recv(struct buffer *b)
+{
+	struct cmd_list	*cmdlist;
+	struct cmd	*cmd;
+	u_int		 n;
+
+	buffer_read(b, &n, sizeof n);
+
+	cmdlist = xmalloc(sizeof *cmdlist);
+	TAILQ_INIT(cmdlist);
+
+	while (n-- > 0) {
+		cmd = cmd_recv(b);
+		TAILQ_INSERT_TAIL(cmdlist, cmd, qentry);
+	}
+
+	return (cmdlist);
+}
+
+void
+cmd_list_free(struct cmd_list *cmdlist)
+{
+	struct cmd	*cmd;
+	
+	while (!TAILQ_EMPTY(cmdlist)) {
+		cmd = TAILQ_FIRST(cmdlist);
+		TAILQ_REMOVE(cmdlist, cmd, qentry);
+		cmd_free(cmd);
+	}
+	xfree(cmdlist);
+}
+
+size_t
+cmd_list_print(struct cmd_list *cmdlist, char *buf, size_t len)
+{
+	struct cmd	*cmd;
+	size_t		 off;
+
+	off = 0;
+	TAILQ_FOREACH(cmd, cmdlist, qentry) {
+		if (off >= len)
+			break;
+		off += cmd_print(cmd, buf + off, len - off);
+		if (off >= len)
+			break;
+		if (TAILQ_NEXT(cmd, qentry) != NULL)
+			off += xsnprintf(buf + off, len - off, " ; ");
+	}
+	return (off);
+}