diff options
| author |   nicm <nicm@openbsd.org> | 2010-12-30 23:16:18 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2010-12-30 23:16:18 +0000 |
| commit | eca05f1fc0ec6fc9c207193ddcba9f00995f6fdc (patch) | |
| tree | cdf0e9851374e23108b26ce7898d7395f78cbbb4 /usr.bin/tmux/cmd-generic.c | |
| parent | be more cynical about boot-time entropy, and fold time and entropy data in. (diff) | |
| download | wireguard-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-generic.c')
| -rw-r--r-- | usr.bin/tmux/cmd-generic.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/usr.bin/tmux/cmd-generic.c b/usr.bin/tmux/cmd-generic.c index d287cac5926..a8eb643d8fe 100644 --- a/usr.bin/tmux/cmd-generic.c +++ b/usr.bin/tmux/cmd-generic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-generic.c,v 1.11 2009/12/03 22:50:10 nicm Exp $ */ +/* $OpenBSD: cmd-generic.c,v 1.12 2010/12/30 23:16:18 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -332,7 +332,6 @@ cmd_buffer_init(struct cmd *self, unused int key) self->data = data = xmalloc(sizeof *data); data->chflags = 0; - data->target = NULL; data->buffer = -1; data->arg = NULL; data->arg2 = NULL; @@ -349,7 +348,7 @@ cmd_buffer_parse(struct cmd *self, int argc, char **argv, char **cause) cmd_buffer_init(self, 0); data = self->data; - while ((opt = cmd_getopt(argc, argv, "b:t:", entry->chflags)) != -1) { + while ((opt = cmd_getopt(argc, argv, "b:", entry->chflags)) != -1) { if (cmd_parse_flags(opt, entry->chflags, &data->chflags) == 0) continue; switch (opt) { @@ -363,10 +362,6 @@ cmd_buffer_parse(struct cmd *self, int argc, char **argv, char **cause) data->buffer = n; } break; - case 't': - if (data->target == NULL) - data->target = xstrdup(optarg); - break; default: goto usage; } @@ -392,8 +387,6 @@ cmd_buffer_free(struct cmd *self) { struct cmd_buffer_data *data = self->data; - if (data->target != NULL) - xfree(data->target); if (data->arg != NULL) xfree(data->arg); if (data->arg2 != NULL) @@ -413,8 +406,6 @@ cmd_buffer_print(struct cmd *self, char *buf, size_t len) off += cmd_print_flags(buf, len, off, data->chflags); if (off < len && data->buffer != -1) off += xsnprintf(buf + off, len - off, " -b %d", data->buffer); - if (off < len && data->target != NULL) - off += cmd_prarg(buf + off, len - off, " -t ", data->target); if (off < len && data->arg != NULL) off += cmd_prarg(buf + off, len - off, " ", data->arg); if (off < len && data->arg2 != NULL) |