diff options
Diffstat (limited to 'cmd-set-buffer.c')
| -rw-r--r-- | cmd-set-buffer.c | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/cmd-set-buffer.c b/cmd-set-buffer.c index ad7ac473..c0979745 100644 --- a/cmd-set-buffer.c +++ b/cmd-set-buffer.c @@ -1,4 +1,4 @@ -/* $Id: cmd-set-buffer.c,v 1.13 2010-12-30 22:39:49 tcunha Exp $ */ +/* $Id: cmd-set-buffer.c,v 1.14 2011-01-07 14:45:34 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -30,36 +30,45 @@ int cmd_set_buffer_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_set_buffer_entry = { "set-buffer", "setb", + "b:", 1, 1, CMD_BUFFER_USAGE " data", - CMD_ARG1, "", - cmd_buffer_init, - cmd_buffer_parse, - cmd_set_buffer_exec, - cmd_buffer_free, - cmd_buffer_print + 0, + NULL, + NULL, + cmd_set_buffer_exec }; int cmd_set_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) { - struct cmd_buffer_data *data = self->data; - u_int limit; - char *pdata; - size_t psize; + struct args *args = self->args; + u_int limit; + char *pdata, *cause; + size_t psize; + int buffer; limit = options_get_number(&global_options, "buffer-limit"); - pdata = xstrdup(data->arg); + pdata = xstrdup(args->argv[0]); psize = strlen(pdata); - if (data->buffer == -1) { + if (!args_has(args, 'b')) { paste_add(&global_buffers, pdata, psize, limit); return (0); } - if (paste_replace(&global_buffers, data->buffer, pdata, psize) != 0) { - ctx->error(ctx, "no buffer %d", data->buffer); + + buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause); + if (cause != NULL) { + ctx->error(ctx, "buffer %s", cause); + xfree(cause); + return (-1); + } + + if (paste_replace(&global_buffers, buffer, pdata, psize) != 0) { + ctx->error(ctx, "no buffer %d", buffer); xfree(pdata); return (-1); } + return (0); } |