From e340df2034c04591e3bbdcbcc22af1301cf74b09 Mon Sep 17 00:00:00 2001 From: nicm Date: Tue, 14 Feb 2017 18:13:05 +0000 Subject: Make source-file look for files relative to the client working directory (like load-buffer and save-buffer), from Chris Pickel. Also break the where-is-this-file code out into its own function for loadb and saveb. --- cmd-source-file.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'cmd-source-file.c') diff --git a/cmd-source-file.c b/cmd-source-file.c index dce72c40..a367c7c2 100644 --- a/cmd-source-file.c +++ b/cmd-source-file.c @@ -22,6 +22,7 @@ #include #include #include +#include #include "tmux.h" @@ -48,22 +49,35 @@ static enum cmd_retval cmd_source_file_exec(struct cmd *self, struct cmdq_item *item) { struct args *args = self->args; + int quiet = args_has(args, 'q'); struct client *c = item->client; - int quiet; struct cmdq_item *new_item; enum cmd_retval retval; + char *pattern, *tmp; + const char *path = args->argv[0]; glob_t g; u_int i; - quiet = args_has(args, 'q'); - if (glob(args->argv[0], 0, NULL, &g) != 0) { - if (quiet && errno == ENOENT) - return (CMD_RETURN_NORMAL); - cmdq_error(item, "%s: %s", args->argv[0], strerror(errno)); - return (CMD_RETURN_ERROR); + if (*path == '/') + pattern = xstrdup(path); + else { + utf8_stravis(&tmp, server_client_get_cwd(c), VIS_GLOB); + xasprintf(&pattern, "%s/%s", tmp, path); + free(tmp); } + log_debug("%s: %s", __func__, pattern); retval = CMD_RETURN_NORMAL; + if (glob(pattern, 0, NULL, &g) != 0) { + if (!quiet || errno != ENOENT) { + cmdq_error(item, "%s: %s", path, strerror(errno)); + retval = CMD_RETURN_ERROR; + } + free(pattern); + return (retval); + } + free(pattern); + for (i = 0; i < (u_int)g.gl_pathc; i++) { if (load_cfg(g.gl_pathv[i], c, item, quiet) != 0) retval = CMD_RETURN_ERROR; -- cgit v1.2.3