=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-set-buffer.c,v retrieving revision 1.3 retrieving revision 1.4 diff -c -r1.3 -r1.4 *** src/usr.bin/tmux/cmd-set-buffer.c 2009/07/26 12:58:44 1.3 --- src/usr.bin/tmux/cmd-set-buffer.c 2009/09/07 18:50:45 1.4 *************** *** 1,4 **** ! /* $OpenBSD: cmd-set-buffer.c,v 1.3 2009/07/26 12:58:44 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott --- 1,4 ---- ! /* $OpenBSD: cmd-set-buffer.c,v 1.4 2009/09/07 18:50:45 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott *************** *** 18,24 **** #include ! #include #include "tmux.h" --- 18,24 ---- #include ! #include #include "tmux.h" *************** *** 45,61 **** struct cmd_buffer_data *data = self->data; struct session *s; u_int limit; if ((s = cmd_find_session(ctx, data->target)) == NULL) return (-1); - limit = options_get_number(&s->options, "buffer-limit"); if (data->buffer == -1) { ! paste_add(&s->buffers, xstrdup(data->arg), limit); return (0); } ! if (paste_replace(&s->buffers, data->buffer, xstrdup(data->arg)) != 0) { ctx->error(ctx, "no buffer %d", data->buffer); return (-1); } return (0); --- 45,67 ---- struct cmd_buffer_data *data = self->data; struct session *s; u_int limit; + u_char *pdata; + size_t psize; if ((s = cmd_find_session(ctx, data->target)) == NULL) return (-1); limit = options_get_number(&s->options, "buffer-limit"); + + pdata = xstrdup(data->arg); + psize = strlen(pdata); + if (data->buffer == -1) { ! paste_add(&s->buffers, pdata, psize, limit); return (0); } ! if (paste_replace(&s->buffers, data->buffer, pdata, psize) != 0) { ctx->error(ctx, "no buffer %d", data->buffer); + xfree(pdata); return (-1); } return (0);