diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2009-09-07 18:50:45 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2009-09-07 18:50:45 +0000 |
| commit | ccba613e5b277e70e8261c04ecc37ff3ef14a217 (patch) | |
| tree | 26ed2fcf88ae87e4e76e922df255e4fd62589e31 /cmd-paste-buffer.c | |
| parent | e97006b102dd274dd8cc70c2aee13f6b09f69a41 (diff) | |
| download | rtmux-ccba613e5b277e70e8261c04ecc37ff3ef14a217.tar.gz rtmux-ccba613e5b277e70e8261c04ecc37ff3ef14a217.tar.bz2 rtmux-ccba613e5b277e70e8261c04ecc37ff3ef14a217.zip | |
Give each paste buffer a size member instead of requiring them to be
zero-terminated.
Diffstat (limited to 'cmd-paste-buffer.c')
| -rw-r--r-- | cmd-paste-buffer.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/cmd-paste-buffer.c b/cmd-paste-buffer.c index 90deeb00..1d92557f 100644 --- a/cmd-paste-buffer.c +++ b/cmd-paste-buffer.c @@ -45,13 +45,13 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) { struct cmd_buffer_data *data = self->data; struct winlink *wl; - struct window *w; + struct window_pane *wp; struct session *s; struct paste_buffer *pb; if ((wl = cmd_find_window(ctx, data->target, &s)) == NULL) return (-1); - w = wl->window; + wp = wl->window->active; if (data->buffer == -1) pb = paste_get_top(&s->buffers); @@ -64,13 +64,10 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) if (pb != NULL && *pb->data != '\0') { /* -r means raw data without LF->CR conversion. */ - if (data->chflags & CMD_CHFLAG('r')) { - buffer_write( - w->active->out, pb->data, strlen(pb->data)); - } else { - cmd_paste_buffer_lf2cr( - w->active->out, pb->data, strlen(pb->data)); - } + if (data->chflags & CMD_CHFLAG('r')) + buffer_write(wp->out, pb->data, pb->size); + else + cmd_paste_buffer_lf2cr(wp->out, pb->data, pb->size); } /* Delete the buffer if -d. */ |