From cfc81692e64fee9b64ae72dbd978096bed435ab1 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 11 Jul 2018 08:29:21 +0000
Subject: Expand formats in load-buffer and save-buffer.

---
 cmd-save-buffer.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'cmd-save-buffer.c')

diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c
index be98117c..6d5ddafd 100644
--- a/cmd-save-buffer.c
+++ b/cmd-save-buffer.c
@@ -60,11 +60,13 @@ static enum cmd_retval
 cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item)
 {
 	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;
-	const char		*path, *bufname, *bufdata, *start, *end;
-	const char		*flags;
-	char			*msg, *file;
+	const char		*bufname, *bufdata, *start, *end, *flags;
+	char			*msg, *path, *file;
 	size_t			 size, used, msglen, bufsize;
 	FILE			*f;
 
@@ -84,10 +86,12 @@ cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item)
 	bufdata = paste_buffer_data(pb, &bufsize);
 
 	if (self->entry == &cmd_show_buffer_entry)
-		path = "-";
+		path = xstrdup("-");
 	else
-		path = args->argv[0];
+		path = format_single(item, args->argv[0], c, s, wl, wp);
 	if (strcmp(path, "-") == 0) {
+		free(path);
+		c = item->client;
 		if (c == NULL) {
 			cmdq_error(item, "can't write to stdout");
 			return (CMD_RETURN_ERROR);
@@ -118,6 +122,7 @@ cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item)
 
 	fclose(f);
 	free(file);
+	free(path);
 
 	return (CMD_RETURN_NORMAL);
 
-- 
cgit