===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-load-buffer.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/tmux/cmd-load-buffer.c	2009/07/30 17:46:12	1.5
--- src/usr.bin/tmux/cmd-load-buffer.c	2009/09/07 18:50:45	1.6
***************
*** 1,4 ****
! /* $OpenBSD: cmd-load-buffer.c,v 1.5 2009/07/30 17:46:12 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
--- 1,4 ----
! /* $OpenBSD: cmd-load-buffer.c,v 1.6 2009/09/07 18:50:45 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
***************
*** 48,62 ****
  {
  	struct cmd_buffer_data	*data = self->data;
  	struct session		*s;
! 	struct stat		statbuf;
  	FILE			*f;
! 	char			*buf;
! 	u_int			limit;
  
  	if ((s = cmd_find_session(ctx, data->target)) == NULL)
  		return (-1);
  
! 	if (stat(data->arg, &statbuf) < 0) {
  		ctx->error(ctx, "%s: %s", data->arg, strerror(errno));
  		return (-1);
  	}
--- 48,62 ----
  {
  	struct cmd_buffer_data	*data = self->data;
  	struct session		*s;
! 	struct stat		 sb;
  	FILE			*f;
! 	u_char		      	*buf;
! 	u_int			 limit;
  
  	if ((s = cmd_find_session(ctx, data->target)) == NULL)
  		return (-1);
  
! 	if (stat(data->arg, &sb) < 0) {
  		ctx->error(ctx, "%s: %s", data->arg, strerror(errno));
  		return (-1);
  	}
***************
*** 70,97 ****
  	 * We don't want to die due to memory exhaustion, hence xmalloc can't
  	 * be used here.
  	 */
! 	if ((buf = malloc(statbuf.st_size + 1)) == NULL) {
  		ctx->error(ctx, "malloc error: %s", strerror(errno));
  		fclose(f);
  		return (-1);
  	}
  
! 	if (fread(buf, 1, statbuf.st_size, f) != (size_t) statbuf.st_size) {
  		ctx->error(ctx, "%s: fread error", data->arg);
  		xfree(buf);
  		fclose(f);
  		return (-1);
  	}
  
- 	buf[statbuf.st_size] = '\0';
  	fclose(f);
  
  	limit = options_get_number(&s->options, "buffer-limit");
  	if (data->buffer == -1) {
! 		paste_add(&s->buffers, buf, limit);
  		return (0);
  	}
! 	if (paste_replace(&s->buffers, data->buffer, buf) != 0) {
  		ctx->error(ctx, "no buffer %d", data->buffer);
  		xfree(buf);
  		return (-1);
--- 70,96 ----
  	 * We don't want to die due to memory exhaustion, hence xmalloc can't
  	 * be used here.
  	 */
! 	if ((buf = malloc(sb.st_size + 1)) == NULL) {
  		ctx->error(ctx, "malloc error: %s", strerror(errno));
  		fclose(f);
  		return (-1);
  	}
  
! 	if (fread(buf, 1, sb.st_size, f) != (size_t) sb.st_size) {
  		ctx->error(ctx, "%s: fread error", data->arg);
  		xfree(buf);
  		fclose(f);
  		return (-1);
  	}
  
  	fclose(f);
  
  	limit = options_get_number(&s->options, "buffer-limit");
  	if (data->buffer == -1) {
! 		paste_add(&s->buffers, buf, sb.st_size, limit);
  		return (0);
  	}
! 	if (paste_replace(&s->buffers, data->buffer, buf, sb.st_size) != 0) {
  		ctx->error(ctx, "no buffer %d", data->buffer);
  		xfree(buf);
  		return (-1);