===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-load-buffer.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -c -r1.28 -r1.29
*** src/usr.bin/tmux/cmd-load-buffer.c	2014/04/24 09:14:43	1.28
--- src/usr.bin/tmux/cmd-load-buffer.c	2014/05/13 07:34:35	1.29
***************
*** 1,4 ****
! /* $OpenBSD: cmd-load-buffer.c,v 1.28 2014/04/24 09:14:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
--- 1,4 ----
! /* $OpenBSD: cmd-load-buffer.c,v 1.29 2014/05/13 07:34:35 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
***************
*** 50,79 ****
  	struct client	*c = cmdq->client;
  	struct session  *s;
  	FILE		*f;
! 	const char	*path;
  	char		*pdata, *new_pdata, *cause;
  	size_t		 psize;
! 	u_int		 limit;
! 	int		 ch, error, buffer, *buffer_ptr, cwd, fd;
  
! 	if (!args_has(args, 'b'))
! 		buffer = -1;
! 	else {
! 		buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
! 		if (cause != NULL) {
! 			cmdq_error(cmdq, "buffer %s", cause);
! 			free(cause);
! 			return (CMD_RETURN_ERROR);
! 		}
! 	}
  
  	path = args->argv[0];
  	if (strcmp(path, "-") == 0) {
- 		buffer_ptr = xmalloc(sizeof *buffer_ptr);
- 		*buffer_ptr = buffer;
- 
  		error = server_set_stdin_callback(c, cmd_load_buffer_callback,
! 		    buffer_ptr, &cause);
  		if (error != 0) {
  			cmdq_error(cmdq, "%s: %s", path, cause);
  			free(cause);
--- 50,68 ----
  	struct client	*c = cmdq->client;
  	struct session  *s;
  	FILE		*f;
! 	const char	*path, *bufname;
  	char		*pdata, *new_pdata, *cause;
  	size_t		 psize;
! 	int		 ch, error, cwd, fd;
  
! 	bufname = NULL;
! 	if (args_has(args, 'b'))
! 		bufname = args_get(args, 'b');
  
  	path = args->argv[0];
  	if (strcmp(path, "-") == 0) {
  		error = server_set_stdin_callback(c, cmd_load_buffer_callback,
! 		    (void*)bufname, &cause);
  		if (error != 0) {
  			cmdq_error(cmdq, "%s: %s", path, cause);
  			free(cause);
***************
*** 117,130 ****
  
  	fclose(f);
  
! 	limit = options_get_number(&global_options, "buffer-limit");
! 	if (buffer == -1) {
! 		paste_add(pdata, psize, limit);
! 		return (CMD_RETURN_NORMAL);
! 	}
! 	if (paste_replace(buffer, pdata, psize) != 0) {
! 		cmdq_error(cmdq, "no buffer %d", buffer);
  		free(pdata);
  		return (CMD_RETURN_ERROR);
  	}
  
--- 106,115 ----
  
  	fclose(f);
  
! 	if (paste_set(pdata, psize, bufname, &cause) != 0) {
! 		cmdq_error(cmdq, "%s", cause);
  		free(pdata);
+ 		free(cause);
  		return (CMD_RETURN_ERROR);
  	}
  
***************
*** 140,149 ****
  void
  cmd_load_buffer_callback(struct client *c, int closed, void *data)
  {
! 	int	*buffer = data;
! 	char	*pdata;
! 	size_t	 psize;
! 	u_int	 limit;
  
  	if (!closed)
  		return;
--- 125,133 ----
  void
  cmd_load_buffer_callback(struct client *c, int closed, void *data)
  {
! 	const char	*bufname = data;
! 	char		*pdata, *cause;
! 	size_t		 psize;
  
  	if (!closed)
  		return;
***************
*** 154,178 ****
  		return;
  
  	psize = EVBUFFER_LENGTH(c->stdin_data);
! 	if (psize == 0 || (pdata = malloc(psize + 1)) == NULL) {
! 		free(data);
  		goto out;
! 	}
  	memcpy(pdata, EVBUFFER_DATA(c->stdin_data), psize);
  	pdata[psize] = '\0';
  	evbuffer_drain(c->stdin_data, psize);
  
! 	limit = options_get_number(&global_options, "buffer-limit");
! 	if (*buffer == -1)
! 		paste_add(pdata, psize, limit);
! 	else if (paste_replace(*buffer, pdata, psize) != 0) {
  		/* No context so can't use server_client_msg_error. */
! 		evbuffer_add_printf(c->stderr_data, "no buffer %d\n", *buffer);
  		server_push_stderr(c);
  		free(pdata);
  	}
- 
- 	free(data);
  
  out:
  	cmdq_continue(c->cmdq);
--- 138,157 ----
  		return;
  
  	psize = EVBUFFER_LENGTH(c->stdin_data);
! 	if (psize == 0 || (pdata = malloc(psize + 1)) == NULL)
  		goto out;
! 
  	memcpy(pdata, EVBUFFER_DATA(c->stdin_data), psize);
  	pdata[psize] = '\0';
  	evbuffer_drain(c->stdin_data, psize);
  
! 	if (paste_set(pdata, psize, bufname, &cause) != 0) {
  		/* No context so can't use server_client_msg_error. */
! 		evbuffer_add_printf(c->stderr_data, "%s", cause);
  		server_push_stderr(c);
  		free(pdata);
+ 		free(cause);
  	}
  
  out:
  	cmdq_continue(c->cmdq);