===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/cmd-show-buffer.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/tmux/Attic/cmd-show-buffer.c	2010/12/30 23:16:18	1.9
--- src/usr.bin/tmux/Attic/cmd-show-buffer.c	2011/01/04 00:42:47	1.10
***************
*** 1,4 ****
! /* $OpenBSD: cmd-show-buffer.c,v 1.9 2010/12/30 23:16:18 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-show-buffer.c,v 1.10 2011/01/04 00:42:47 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 30,66 ****
  
  const struct cmd_entry cmd_show_buffer_entry = {
  	"show-buffer", "showb",
  	CMD_BUFFER_USAGE,
! 	0, "",
! 	cmd_buffer_init,
! 	cmd_buffer_parse,
! 	cmd_show_buffer_exec,
! 	cmd_buffer_free,
! 	cmd_buffer_print
  };
  
  int
  cmd_show_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
! 	struct cmd_buffer_data	*data = self->data;
  	struct session		*s;
  	struct paste_buffer	*pb;
! 	char			*in, *buf, *ptr;
  	size_t			 size, len;
  	u_int			 width;
  
  	if ((s = cmd_find_session(ctx, NULL)) == NULL)
  		return (-1);
  
! 	if (data->buffer == -1) {
  		if ((pb = paste_get_top(&global_buffers)) == NULL) {
  			ctx->error(ctx, "no buffers");
  			return (-1);
  		}
  	} else {
! 		pb = paste_get_index(&global_buffers, data->buffer);
  		if (pb == NULL) {
! 			ctx->error(ctx, "no buffer %d", data->buffer);
  			return (-1);
  		}
  	}
--- 30,73 ----
  
  const struct cmd_entry cmd_show_buffer_entry = {
  	"show-buffer", "showb",
+ 	"b:", 0, 0,
  	CMD_BUFFER_USAGE,
! 	0,
! 	NULL,
! 	NULL,
! 	cmd_show_buffer_exec
  };
  
  int
  cmd_show_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
! 	struct args		*args = self->args;
  	struct session		*s;
  	struct paste_buffer	*pb;
! 	int			 buffer;
! 	char			*in, *buf, *ptr, *cause;
  	size_t			 size, len;
  	u_int			 width;
  
  	if ((s = cmd_find_session(ctx, NULL)) == NULL)
  		return (-1);
  
! 	if (!args_has(args, 'b')) {
  		if ((pb = paste_get_top(&global_buffers)) == NULL) {
  			ctx->error(ctx, "no buffers");
  			return (-1);
  		}
  	} else {
! 		buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
! 		if (cause != NULL) {
! 			ctx->error(ctx, "buffer %s", cause);
! 			xfree(cause);
! 			return (-1);
! 		}
! 
! 		pb = paste_get_index(&global_buffers, buffer);
  		if (pb == NULL) {
! 			ctx->error(ctx, "no buffer %d", buffer);
  			return (-1);
  		}
  	}