summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/cmd-set-buffer.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2010-12-30 23:16:18 +0000
committernicm <nicm@openbsd.org>2010-12-30 23:16:18 +0000
commiteca05f1fc0ec6fc9c207193ddcba9f00995f6fdc (patch)
treecdf0e9851374e23108b26ce7898d7395f78cbbb4 /usr.bin/tmux/cmd-set-buffer.c
parentbe more cynical about boot-time entropy, and fold time and entropy data in. (diff)
downloadwireguard-openbsd-eca05f1fc0ec6fc9c207193ddcba9f00995f6fdc.tar.xz
wireguard-openbsd-eca05f1fc0ec6fc9c207193ddcba9f00995f6fdc.zip
Change from a per-session stack of buffers to one global stack which is
much more convenient and also simplifies lot of code. This renders copy-buffer useless and makes buffer-limit now a server option. By Tiago Cunha.
Diffstat (limited to 'usr.bin/tmux/cmd-set-buffer.c')
-rw-r--r--usr.bin/tmux/cmd-set-buffer.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/usr.bin/tmux/cmd-set-buffer.c b/usr.bin/tmux/cmd-set-buffer.c
index 7fd0ec7c8a3..24ab324132d 100644
--- a/usr.bin/tmux/cmd-set-buffer.c
+++ b/usr.bin/tmux/cmd-set-buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-set-buffer.c,v 1.6 2009/11/26 22:28:24 nicm Exp $ */
+/* $OpenBSD: cmd-set-buffer.c,v 1.7 2010/12/30 23:16:18 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -30,7 +30,7 @@ int cmd_set_buffer_exec(struct cmd *, struct cmd_ctx *);
const struct cmd_entry cmd_set_buffer_entry = {
"set-buffer", "setb",
- CMD_BUFFER_SESSION_USAGE " data",
+ CMD_BUFFER_USAGE " data",
CMD_ARG1, "",
cmd_buffer_init,
cmd_buffer_parse,
@@ -43,23 +43,20 @@ int
cmd_set_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
{
struct cmd_buffer_data *data = self->data;
- struct session *s;
u_int limit;
char *pdata;
size_t psize;
- if ((s = cmd_find_session(ctx, data->target)) == NULL)
- return (-1);
- limit = options_get_number(&s->options, "buffer-limit");
+ limit = options_get_number(&global_options, "buffer-limit");
pdata = xstrdup(data->arg);
psize = strlen(pdata);
if (data->buffer == -1) {
- paste_add(&s->buffers, pdata, psize, limit);
+ paste_add(&global_buffers, pdata, psize, limit);
return (0);
}
- if (paste_replace(&s->buffers, data->buffer, pdata, psize) != 0) {
+ if (paste_replace(&global_buffers, data->buffer, pdata, psize) != 0) {
ctx->error(ctx, "no buffer %d", data->buffer);
xfree(pdata);
return (-1);