===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-set-buffer.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/tmux/cmd-set-buffer.c	2014/04/24 09:14:43	1.17
--- src/usr.bin/tmux/cmd-set-buffer.c	2014/05/13 07:34:35	1.18
***************
*** 1,4 ****
! /* $OpenBSD: cmd-set-buffer.c,v 1.17 2014/04/24 09:14:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-set-buffer.c,v 1.18 2014/05/13 07:34:35 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 31,38 ****
  
  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
--- 31,38 ----
  
  const struct cmd_entry cmd_set_buffer_entry = {
  	"set-buffer", "setb",
! 	"ab:n:", 0, 1,
! 	"[-a] " CMD_BUFFER_USAGE " [-n new-buffer-name] data",
  	0,
  	NULL,
  	cmd_set_buffer_exec
***************
*** 43,80 ****
  {
  	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 ((newsize = strlen(args->argv[0])) == 0)
  		return (CMD_RETURN_NORMAL);
  
  	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(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();
  		if (pb != NULL)
! 			buffer = 0;
  	}
  
  	if (args_has(args, 'a') && pb != NULL) {
--- 43,101 ----
  {
  	struct args		*args = self->args;
  	struct paste_buffer	*pb;
  	char			*pdata, *cause;
+ 	const char		*bufname;
  	size_t			 psize, newsize;
  
! 	bufname = NULL;
  
+ 	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);
+ 		}
+ 
+ 		return (CMD_RETURN_NORMAL);
+ 	}
+ 
+ 	if (args->argc != 1) {
+ 		cmdq_error(cmdq, "no data specified");
+ 		return (CMD_RETURN_ERROR);
+ 	}
+ 
  	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) {
***************
*** 87,96 ****
  	memcpy(pdata + psize, args->argv[0], newsize);
  	psize += newsize;
  
! 	if (buffer == -1)
! 		paste_add(pdata, psize, limit);
! 	else
! 		paste_replace(buffer, pdata, psize);
  
  	return (CMD_RETURN_NORMAL);
  }
--- 108,119 ----
  	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);
! 	}
  
  	return (CMD_RETURN_NORMAL);
  }