===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/paste.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -c -r1.39 -r1.40
*** src/usr.bin/tmux/paste.c	2017/01/24 13:28:33	1.39
--- src/usr.bin/tmux/paste.c	2019/04/02 09:03:39	1.40
***************
*** 1,4 ****
! /* $OpenBSD: paste.c,v 1.39 2017/01/24 13:28:33 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: paste.c,v 1.40 2019/04/02 09:03:39 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 158,168 ****
   * that the caller is responsible for allocating data.
   */
  void
! paste_add(char *data, size_t size)
  {
  	struct paste_buffer	*pb, *pb1;
  	u_int			 limit;
  
  	if (size == 0) {
  		free(data);
  		return;
--- 158,171 ----
   * that the caller is responsible for allocating data.
   */
  void
! paste_add(const char *prefix, char *data, size_t size)
  {
  	struct paste_buffer	*pb, *pb1;
  	u_int			 limit;
  
+ 	if (prefix == NULL)
+ 		prefix = "buffer";
+ 
  	if (size == 0) {
  		free(data);
  		return;
***************
*** 181,187 ****
  	pb->name = NULL;
  	do {
  		free(pb->name);
! 		xasprintf(&pb->name, "buffer%04u", paste_next_index);
  		paste_next_index++;
  	} while (paste_get_name(pb->name) != NULL);
  
--- 184,190 ----
  	pb->name = NULL;
  	do {
  		free(pb->name);
! 		xasprintf(&pb->name, "%s%u", prefix, paste_next_index);
  		paste_next_index++;
  	} while (paste_get_name(pb->name) != NULL);
  
***************
*** 263,269 ****
  		return (0);
  	}
  	if (name == NULL) {
! 		paste_add(data, size);
  		return (0);
  	}
  
--- 266,272 ----
  		return (0);
  	}
  	if (name == NULL) {
! 		paste_add(NULL, data, size);
  		return (0);
  	}