===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-save-buffer.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/tmux/cmd-save-buffer.c	2010/12/30 23:16:18	1.9
--- src/usr.bin/tmux/cmd-save-buffer.c	2011/01/04 00:42:47	1.10
***************
*** 1,4 ****
! /* $OpenBSD: cmd-save-buffer.c,v 1.9 2010/12/30 23:16:18 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
--- 1,4 ----
! /* $OpenBSD: cmd-save-buffer.c,v 1.10 2011/01/04 00:42:47 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
***************
*** 32,87 ****
  
  const struct cmd_entry cmd_save_buffer_entry = {
  	"save-buffer", "saveb",
! 	"[-a] " CMD_BUFFER_USAGE " path",
! 	CMD_ARG1, "a",
! 	cmd_buffer_init,
! 	cmd_buffer_parse,
! 	cmd_save_buffer_exec,
! 	cmd_buffer_free,
! 	cmd_buffer_print
  };
  
  int
  cmd_save_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
! 	struct cmd_buffer_data	*data = self->data;
  	struct paste_buffer	*pb;
  	mode_t			 mask;
  	FILE			*f;
  
! 	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);
  		}
  	}
  
! 	if (strcmp(data->arg, "-") == 0) {
! 		if (ctx->cmdclient == NULL) {
! 			ctx->error(ctx, "%s: can't write to stdout", data->arg);
  			return (-1);
  		}
! 		bufferevent_write(
! 		    ctx->cmdclient->stdout_event, pb->data, pb->size);
  	} else {
  		mask = umask(S_IRWXG | S_IRWXO);
! 		if (cmd_check_flag(data->chflags, 'a'))
! 			f = fopen(data->arg, "ab");
  		else
! 			f = fopen(data->arg, "wb");
  		umask(mask);
  		if (f == NULL) {
! 			ctx->error(ctx, "%s: %s", data->arg, strerror(errno));
  			return (-1);
  		}
  		if (fwrite(pb->data, 1, pb->size, f) != pb->size) {
! 			ctx->error(ctx, "%s: fwrite error", data->arg);
  			fclose(f);
  			return (-1);
  		}
--- 32,97 ----
  
  const struct cmd_entry cmd_save_buffer_entry = {
  	"save-buffer", "saveb",
! 	"ab:", 1, 1,
! 	"[-a] " CMD_BUFFER_USAGE,
! 	0,
! 	NULL,
! 	NULL,
! 	cmd_save_buffer_exec
  };
  
  int
  cmd_save_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
! 	struct args		*args = self->args;
! 	struct client		*c = ctx->cmdclient;
  	struct paste_buffer	*pb;
+ 	const char		*path;
+ 	char			*cause;
+ 	int			 buffer;
  	mode_t			 mask;
  	FILE			*f;
  
! 	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);
  		}
  	}
  
! 	path = args->argv[0];
! 	if (strcmp(path, "-") == 0) {
! 		if (c == NULL) {
! 			ctx->error(ctx, "%s: can't write to stdout", path);
  			return (-1);
  		}
! 		bufferevent_write(c->stdout_event, pb->data, pb->size);
  	} else {
  		mask = umask(S_IRWXG | S_IRWXO);
! 		if (args_has(self->args, 'a'))
! 			f = fopen(path, "ab");
  		else
! 			f = fopen(path, "wb");
  		umask(mask);
  		if (f == NULL) {
! 			ctx->error(ctx, "%s: %s", path, strerror(errno));
  			return (-1);
  		}
  		if (fwrite(pb->data, 1, pb->size, f) != pb->size) {
! 			ctx->error(ctx, "%s: fwrite error", path);
  			fclose(f);
  			return (-1);
  		}