diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-05-13 21:58:48 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-05-13 21:58:48 +0100 |
| commit | bae95844d75b257c61cd0ef57b1d826bdca09032 (patch) | |
| tree | e2547df0ea03a6f686ac0cf7500bed3d00994ad2 /cmd-save-buffer.c | |
| parent | ea5a223a2e8901fa9afa991d147751d8a6789443 (diff) | |
| parent | b3e8d440ed0477e88232c3ba1779c67eafce3a48 (diff) | |
| download | rtmux-bae95844d75b257c61cd0ef57b1d826bdca09032.tar.gz rtmux-bae95844d75b257c61cd0ef57b1d826bdca09032.tar.bz2 rtmux-bae95844d75b257c61cd0ef57b1d826bdca09032.zip | |
Merge branch 'obsd-master'
Conflicts:
format.c
window.c
Diffstat (limited to 'cmd-save-buffer.c')
| -rw-r--r-- | cmd-save-buffer.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c index b5ca62ee..8dd52c96 100644 --- a/cmd-save-buffer.c +++ b/cmd-save-buffer.c @@ -58,10 +58,10 @@ cmd_save_buffer_exec(struct cmd *self, struct cmd_q *cmdq) struct client *c = cmdq->client; struct session *s; struct paste_buffer *pb; - const char *path; - char *cause, *start, *end, *msg; + const char *path, *bufname; + char *start, *end, *msg; size_t size, used, msglen; - int cwd, fd, buffer; + int cwd, fd; FILE *f; if (!args_has(args, 'b')) { @@ -70,16 +70,10 @@ cmd_save_buffer_exec(struct cmd *self, struct cmd_q *cmdq) return (CMD_RETURN_ERROR); } } else { - buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause); - if (cause != NULL) { - cmdq_error(cmdq, "buffer %s", cause); - free(cause); - return (CMD_RETURN_ERROR); - } - - pb = paste_get_index(buffer); + bufname = args_get(args, 'b'); + pb = paste_get_name(bufname); if (pb == NULL) { - cmdq_error(cmdq, "no buffer %d", buffer); + cmdq_error(cmdq, "no buffer %s", bufname); return (CMD_RETURN_ERROR); } } |