1 files changed, 65 insertions, 22 deletions

diff --git a/cmd-set-buffer.c b/cmd-set-buffer.c
index fade4fe3..0ec362b3 100644
--- a/cmd-set-buffer.c
+++ b/cmd-set-buffer.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -24,50 +24,93 @@
 #include "tmux.h"
 
 /*
- * Add or set a paste buffer.
+ * Add, set, or append to a paste buffer.
  */
 
 enum cmd_retval	 cmd_set_buffer_exec(struct cmd *, struct cmd_q *);
 
 const struct cmd_entry cmd_set_buffer_entry = {
 	"set-buffer", "setb",
-	"b:", 1, 1,
-	CMD_BUFFER_USAGE " data",
+	"ab:n:", 0, 1,
+	"[-a] " CMD_BUFFER_USAGE " [-n new-buffer-name] data",
 	0,
-	NULL,
 	cmd_set_buffer_exec
 };
 
 enum cmd_retval
 cmd_set_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 {
-	struct args	*args = self->args;
-	u_int		 limit;
-	char		*pdata, *cause;
-	size_t		 psize;
-	int		 buffer;
+	struct args		*args = self->args;
+	struct paste_buffer	*pb;
+	char			*pdata, *cause;
+	const char		*bufname;
+	size_t			 psize, newsize;
 
-	limit = options_get_number(&global_options, "buffer-limit");
+	bufname = NULL;
 
-	pdata = xstrdup(args->argv[0]);
-	psize = strlen(pdata);
+	if (args_has(args, 'n')) {
+		if (args->argc > 0) {
+			cmdq_error(cmdq, "don't provide data with n flag");
+			return (CMD_RETURN_ERROR);
+		}
+
+		if (args_has(args, 'b'))
+			bufname = args_get(args, 'b');
+
+		if (bufname == NULL) {
+			pb = paste_get_top();
+			if (pb == NULL) {
+				cmdq_error(cmdq, "no buffer");
+				return (CMD_RETURN_ERROR);
+			}
+			bufname = pb->name;
+		}
+
+		if (paste_rename(bufname, args_get(args, 'n'), &cause) != 0) {
+			cmdq_error(cmdq, "%s", cause);
+			free(cause);
+			return (CMD_RETURN_ERROR);
+		}
 
-	if (!args_has(args, 'b')) {
-		paste_add(&global_buffers, pdata, psize, limit);
 		return (CMD_RETURN_NORMAL);
 	}
 
-	buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
-	if (cause != NULL) {
-		cmdq_error(cmdq, "buffer %s", cause);
-		free(cause);
-		free(pdata);
+	if (args->argc != 1) {
+		cmdq_error(cmdq, "no data specified");
 		return (CMD_RETURN_ERROR);
 	}
 
-	if (paste_replace(&global_buffers, buffer, pdata, psize) != 0) {
-		cmdq_error(cmdq, "no buffer %d", buffer);
+	psize = 0;
+	pdata = NULL;
+
+	pb = NULL;
+
+	if ((newsize = strlen(args->argv[0])) == 0)
+		return (CMD_RETURN_NORMAL);
+
+	if (args_has(args, 'b')) {
+		bufname = args_get(args, 'b');
+		pb = paste_get_name(bufname);
+	} else if (args_has(args, 'a')) {
+		pb = paste_get_top();
+		if (pb != NULL)
+			bufname = pb->name;
+	}
+
+	if (args_has(args, 'a') && pb != NULL) {
+		psize = pb->size;
+		pdata = xmalloc(psize);
+		memcpy(pdata, pb->data, psize);
+	}
+
+	pdata = xrealloc(pdata, psize + newsize);
+	memcpy(pdata + psize, args->argv[0], newsize);
+	psize += newsize;
+
+	if (paste_set(pdata, psize, bufname, &cause) != 0) {
+		cmdq_error(cmdq, "%s", cause);
 		free(pdata);
+		free(cause);
 		return (CMD_RETURN_ERROR);
 	}