diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-09-07 23:48:54 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-09-07 23:48:54 +0000 |
| commit | c272de7cbafa343f0e2fc25beb66ed0b924f336f (patch) | |
| tree | e44e3f1cc979078b853a0dd84a994b82128556f5 /cmd-set-buffer.c | |
| parent | 5edc4658028b47d975f8685be63f5876a12a3a4f (diff) | |
| download | rtmux-c272de7cbafa343f0e2fc25beb66ed0b924f336f.tar.gz rtmux-c272de7cbafa343f0e2fc25beb66ed0b924f336f.tar.bz2 rtmux-c272de7cbafa343f0e2fc25beb66ed0b924f336f.zip | |
Sync OpenBSD patchset 318:
Give each paste buffer a size member instead of requiring them to be
zero-terminated.
Diffstat (limited to 'cmd-set-buffer.c')
| -rw-r--r-- | cmd-set-buffer.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/cmd-set-buffer.c b/cmd-set-buffer.c index 00277f0c..175b56a5 100644 --- a/cmd-set-buffer.c +++ b/cmd-set-buffer.c @@ -1,4 +1,4 @@ -/* $Id: cmd-set-buffer.c,v 1.9 2009-07-28 22:12:16 tcunha Exp $ */ +/* $Id: cmd-set-buffer.c,v 1.10 2009-09-07 23:48:54 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -18,7 +18,7 @@ #include <sys/types.h> -#include <stdlib.h> +#include <string.h> #include "tmux.h" @@ -45,17 +45,23 @@ cmd_set_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) 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, xstrdup(data->arg), limit); + paste_add(&s->buffers, pdata, psize, limit); return (0); } - if (paste_replace(&s->buffers, data->buffer, xstrdup(data->arg)) != 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); |