===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-set-buffer.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/tmux/cmd-set-buffer.c	2013/10/10 12:00:23	1.14
--- src/usr.bin/tmux/cmd-set-buffer.c	2014/03/31 21:39:31	1.15
***************
*** 1,4 ****
! /* $OpenBSD: cmd-set-buffer.c,v 1.14 2013/10/10 12:00:23 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-set-buffer.c,v 1.15 2014/03/31 21:39:31 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 24,38 ****
  #include "tmux.h"
  
  /*
!  * Add or set 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",
  	0,
  	NULL,
  	cmd_set_buffer_exec
--- 24,38 ----
  #include "tmux.h"
  
  /*
!  * 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",
! 	"ab:", 1, 1,
! 	"[-a] " CMD_BUFFER_USAGE " data",
  	0,
  	NULL,
  	cmd_set_buffer_exec
***************
*** 41,75 ****
  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;
  
  	limit = options_get_number(&global_options, "buffer-limit");
  
! 	pdata = xstrdup(args->argv[0]);
! 	psize = strlen(pdata);
  
! 	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);
! 		return (CMD_RETURN_ERROR);
  	}
  
! 	if (paste_replace(&global_buffers, buffer, pdata, psize) != 0) {
! 		cmdq_error(cmdq, "no buffer %d", buffer);
! 		free(pdata);
! 		return (CMD_RETURN_ERROR);
  	}
  
  	return (CMD_RETURN_NORMAL);
  }
--- 41,95 ----
  enum cmd_retval
  cmd_set_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
  {
! 	struct args		*args = self->args;
! 	struct paste_buffer	*pb;
! 	u_int			 limit;
! 	char			*pdata, *cause;
! 	size_t			 psize, newsize;
! 	int			 buffer;
  
  	limit = options_get_number(&global_options, "buffer-limit");
  
! 	psize = 0;
! 	pdata = NULL;
  
! 	pb = NULL;
! 	buffer = -1;
  
! 	if (args_has(args, 'b')) {
! 		buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
! 		if (cause != NULL) {
! 			cmdq_error(cmdq, "buffer %s", cause);
! 			free(cause);
! 			return (CMD_RETURN_ERROR);
! 		}
! 		pb = paste_get_index(&global_buffers, buffer);
! 		if (pb == NULL) {
! 			cmdq_error(cmdq, "no buffer %d", buffer);
! 			return (CMD_RETURN_ERROR);
! 		}
! 	} else if (args_has(args, 'a')) {
! 		pb = paste_get_top(&global_buffers);
! 		if (pb != NULL)
! 			buffer = 0;
  	}
  
! 	if (args_has(args, 'a') && pb != NULL) {
! 		psize = pb->size;
! 		pdata = xmalloc(psize);
! 		memcpy(pdata, pb->data, psize);
  	}
+ 
+ 	newsize = strlen(args->argv[0]);
+ 
+ 	pdata = xrealloc(pdata, 1, psize + newsize);
+ 	memcpy(pdata + psize, args->argv[0], newsize);
+ 	psize += newsize;
+ 
+ 	if (buffer == -1)
+ 		paste_add(&global_buffers, pdata, psize, limit);
+ 	else
+ 		paste_replace(&global_buffers, buffer, pdata, psize);
  
  	return (CMD_RETURN_NORMAL);
  }