From 930245d7ffde91464865122a82437209680458c8 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 25 May 2019 06:58:10 +0000
Subject: Make cmd_log_argv take a printf-like format for the prefix.

---
 cmd.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'cmd.c')

diff --git a/cmd.c b/cmd.c
index 8736a6c7..ee443614 100644
--- a/cmd.c
+++ b/cmd.c
@@ -205,13 +205,20 @@ const struct cmd_entry *cmd_table[] = {
 	NULL
 };
 
-void
-cmd_log_argv(int argc, char **argv, const char *prefix)
+void printflike(3, 4)
+cmd_log_argv(int argc, char **argv, const char *fmt, ...)
 {
-	int	i;
+	char	*prefix;
+	va_list	 ap;
+	int	 i;
+
+	va_start(ap, fmt);
+	xvasprintf(&prefix, fmt, ap);
+	va_end(ap);
 
 	for (i = 0; i < argc; i++)
 		log_debug("%s: argv[%d]=%s", prefix, i, argv[i]);
+	free(prefix);
 }
 
 void
@@ -245,7 +252,7 @@ cmd_pack_argv(int argc, char **argv, char *buf, size_t len)
 
 	if (argc == 0)
 		return (0);
-	cmd_log_argv(argc, argv, __func__);
+	cmd_log_argv(argc, argv, "%s", __func__);
 
 	*buf = '\0';
 	for (i = 0; i < argc; i++) {
@@ -282,7 +289,7 @@ cmd_unpack_argv(char *buf, size_t len, int argc, char ***argv)
 		buf += arglen;
 		len -= arglen;
 	}
-	cmd_log_argv(argc, *argv, __func__);
+	cmd_log_argv(argc, *argv, "%s", __func__);
 
 	return (0);
 }
@@ -437,7 +444,7 @@ cmd_parse(int argc, char **argv, const char *file, u_int line, char **cause)
 	entry = cmd_find(name, cause);
 	if (entry == NULL)
 		return (NULL);
-	cmd_log_argv(argc, argv, entry->name);
+	cmd_log_argv(argc, argv, "%s: %s", __func__, entry->name);
 
 	args = args_parse(entry->args.template, argc, argv);
 	if (args == NULL)
-- 
cgit 


From d7586d3d65bb1361928205751ea7a69f69a4aa87 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 25 May 2019 10:44:09 +0000
Subject: Use client name when logging command queue.

---
 cmd.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 82 insertions(+), 3 deletions(-)

(limited to 'cmd.c')

diff --git a/cmd.c b/cmd.c
index ee443614..a071dec5 100644
--- a/cmd.c
+++ b/cmd.c
@@ -205,6 +205,8 @@ const struct cmd_entry *cmd_table[] = {
 	NULL
 };
 
+static u_int cmd_list_next_group = 1;
+
 void printflike(3, 4)
 cmd_log_argv(int argc, char **argv, const char *fmt, ...)
 {
@@ -381,9 +383,9 @@ cmd_get_alias(const char *name)
 static const struct cmd_entry *
 cmd_find(const char *name, char **cause)
 {
-	const struct cmd_entry **loop, *entry, *found = NULL;
-	int			 ambiguous;
-	char			 s[BUFSIZ];
+	const struct cmd_entry	**loop, *entry, *found = NULL;
+	int			  ambiguous;
+	char			  s[BUFSIZ];
 
 	ambiguous = 0;
 	for (loop = cmd_table; *loop != NULL; loop++) {
@@ -502,6 +504,83 @@ cmd_print(struct cmd *cmd)
 	return (out);
 }
 
+struct cmd_list *
+cmd_list_new(void)
+{
+	struct cmd_list	*cmdlist;
+
+	cmdlist = xcalloc(1, sizeof *cmdlist);
+	cmdlist->references = 1;
+	cmdlist->group = cmd_list_next_group++;
+	TAILQ_INIT(&cmdlist->list);
+	return (cmdlist);
+}
+
+void
+cmd_list_append(struct cmd_list *cmdlist, struct cmd *cmd)
+{
+	cmd->group = cmdlist->group;
+	TAILQ_INSERT_TAIL(&cmdlist->list, cmd, qentry);
+}
+
+void
+cmd_list_move(struct cmd_list *cmdlist, struct cmd_list *from)
+{
+	struct cmd	*cmd, *cmd1;
+
+	TAILQ_FOREACH_SAFE(cmd, &from->list, qentry, cmd1) {
+		TAILQ_REMOVE(&from->list, cmd, qentry);
+		TAILQ_INSERT_TAIL(&cmdlist->list, cmd, qentry);
+	}
+	cmdlist->group = cmd_list_next_group++;
+}
+
+void
+cmd_list_free(struct cmd_list *cmdlist)
+{
+	struct cmd	*cmd, *cmd1;
+
+	if (--cmdlist->references != 0)
+		return;
+
+	TAILQ_FOREACH_SAFE(cmd, &cmdlist->list, qentry, cmd1) {
+		TAILQ_REMOVE(&cmdlist->list, cmd, qentry);
+		cmd_free(cmd);
+	}
+
+	free(cmdlist);
+}
+
+char *
+cmd_list_print(struct cmd_list *cmdlist, int escaped)
+{
+	struct cmd	*cmd;
+	char		*buf, *this;
+	size_t		 len;
+
+	len = 1;
+	buf = xcalloc(1, len);
+
+	TAILQ_FOREACH(cmd, &cmdlist->list, qentry) {
+		this = cmd_print(cmd);
+
+		len += strlen(this) + 4;
+		buf = xrealloc(buf, len);
+
+		strlcat(buf, this, len);
+		if (TAILQ_NEXT(cmd, qentry) != NULL) {
+			if (escaped)
+				strlcat(buf, " \\; ", len);
+			else
+				strlcat(buf, " ; ", len);
+		}
+
+		free(this);
+	}
+
+	return (buf);
+}
+
 /* Adjust current mouse position for a pane. */
 int
 cmd_mouse_at(struct window_pane *wp, struct mouse_event *m, u_int *xp,
-- 
cgit