circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2018-07-11 11:02:26 +01:00
parent 35985c0add cfc81692e6
commit 711b8164bb
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd-load-buffer.c
View File

@@ -56,11 +56,14 @@ cmd_load_buffer_exec(struct cmd *self, struct cmdq_item *item)
{ {
struct args *args = self->args; struct args *args = self->args;
struct cmd_load_buffer_data *cdata; struct cmd_load_buffer_data *cdata;
struct client *c = item->client; struct client *c = cmd_find_client(item, NULL, 1);
struct session *s = item->target.s;
struct winlink *wl = item->target.wl;
struct window_pane *wp = item->target.wp;
FILE *f; FILE *f;
const char *path, *bufname; const char *bufname;
char *pdata = NULL, *new_pdata, *cause; char *pdata = NULL, *new_pdata, *cause;
char *file; char *path, *file;
size_t psize; size_t psize;
int ch, error; int ch, error;
@@ -68,8 +71,11 @@ cmd_load_buffer_exec(struct cmd *self, struct cmdq_item *item)
if (args_has(args, 'b')) if (args_has(args, 'b'))
bufname = args_get(args, 'b'); bufname = args_get(args, 'b');
path = args->argv[0]; path = format_single(item, args->argv[0], c, s, wl, wp);
if (strcmp(path, "-") == 0) { if (strcmp(path, "-") == 0) {
free(path);
c = item->client;
cdata = xcalloc(1, sizeof *cdata); cdata = xcalloc(1, sizeof *cdata);
cdata->item = item; cdata->item = item;

17
cmd-save-buffer.c
View File

@@ -59,11 +59,13 @@ static enum cmd_retval
cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item) cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item)
{ {
struct args *args = self->args; struct args *args = self->args;
struct client *c = item->client; struct client *c = cmd_find_client(item, NULL, 1);
struct session *s = item->target.s;
struct winlink *wl = item->target.wl;
struct window_pane *wp = item->target.wp;
struct paste_buffer *pb; struct paste_buffer *pb;
const char *path, *bufname, *bufdata, *start, *end; const char *bufname, *bufdata, *start, *end, *flags;
const char *flags; char *msg, *path, *file;
char *msg, *file;
size_t size, used, msglen, bufsize; size_t size, used, msglen, bufsize;
FILE *f; FILE *f;
@@ -83,10 +85,12 @@ cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item)
bufdata = paste_buffer_data(pb, &bufsize); bufdata = paste_buffer_data(pb, &bufsize);
if (self->entry == &cmd_show_buffer_entry) if (self->entry == &cmd_show_buffer_entry)
path = "-"; path = xstrdup("-");
else else
path = args->argv[0]; path = format_single(item, args->argv[0], c, s, wl, wp);
if (strcmp(path, "-") == 0) { if (strcmp(path, "-") == 0) {
free(path);
c = item->client;
if (c == NULL) { if (c == NULL) {
cmdq_error(item, "can't write to stdout"); cmdq_error(item, "can't write to stdout");
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
@@ -117,6 +121,7 @@ cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item)
fclose(f); fclose(f);
free(file); free(file);
free(path);
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);