From f4ffaf5a7fad4c02ad2d08c7b2c80fdec21b64a9 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 9 May 2014 09:11:24 +0000
Subject: Just use char ** for argv like normal people, not char *const *.

---
 cmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmd.c')

diff --git a/cmd.c b/cmd.c
index 726799a8..5660dc72 100644
--- a/cmd.c
+++ b/cmd.c
@@ -180,7 +180,7 @@ cmd_unpack_argv(char *buf, size_t len, int argc, char ***argv)
 }
 
 char **
-cmd_copy_argv(int argc, char *const *argv)
+cmd_copy_argv(int argc, char **argv)
 {
 	char	**new_argv;
 	int	  i;
-- 
cgit 


From b3e8d440ed0477e88232c3ba1779c67eafce3a48 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 13 May 2014 08:08:32 +0000
Subject: If multiple arguments are given to new-session, new-window,
 split-window, respawn-window or respawn-pane, pass them directly to execvp()
 to help avoid quoting problems. One argument still goes to "sh -c" like
 before. Requested by many over the years. Patch from J Raynor.

---
 cmd.c | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'cmd.c')

diff --git a/cmd.c b/cmd.c
index 5660dc72..d8e010cb 100644
--- a/cmd.c
+++ b/cmd.c
@@ -187,7 +187,7 @@ cmd_copy_argv(int argc, char **argv)
 
 	if (argc == 0)
 		return (NULL);
-	new_argv = xcalloc(argc, sizeof *new_argv);
+	new_argv = xcalloc(argc + 1, sizeof *new_argv);
 	for (i = 0; i < argc; i++) {
 		if (argv[i] != NULL)
 			new_argv[i] = xstrdup(argv[i]);
@@ -207,6 +207,32 @@ cmd_free_argv(int argc, char **argv)
 	free(argv);
 }
 
+char *
+cmd_stringify_argv(int argc, char **argv)
+{
+	char	*buf;
+	int	 i;
+	size_t	 len;
+
+	if (argc == 0)
+		return (xstrdup(""));
+
+	len = 0;
+	buf = NULL;
+
+	for (i = 0; i < argc; i++) {
+		len += strlen(argv[i]) + 1;
+		buf = xrealloc(buf, 1, len);
+
+		if (i == 0)
+			*buf = '\0';
+		else
+			strlcat(buf, " ", len);
+		strlcat(buf, argv[i], len);
+	}
+	return (buf);
+}
+
 struct cmd *
 cmd_parse(int argc, char **argv, const char *file, u_int line, char **cause)
 {
-- 
cgit