summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmd-load-buffer.c30
-rw-r--r--cmd-save-buffer.c32
-rw-r--r--cmd-source-file.c28
-rw-r--r--server-client.c29
-rw-r--r--tmux.h2
5 files changed, 68 insertions, 53 deletions
diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c
index 5370390d..677f3656 100644
--- a/cmd-load-buffer.c
+++ b/cmd-load-buffer.c
@@ -57,11 +57,9 @@ cmd_load_buffer_exec(struct cmd *self, struct cmdq_item *item)
struct args *args = self->args;
struct cmd_load_buffer_data *cdata;
struct client *c = item->client;
- struct session *s;
FILE *f;
- const char *path, *bufname, *cwd;
+ const char *path, *bufname;
char *pdata, *new_pdata, *cause, *file;
- char resolved[PATH_MAX];
size_t psize;
int ch, error;
@@ -87,26 +85,11 @@ cmd_load_buffer_exec(struct cmd *self, struct cmdq_item *item)
return (CMD_RETURN_WAIT);
}
- if (c != NULL && c->session == NULL && c->cwd != NULL)
- cwd = c->cwd;
- else if (c != NULL && (s = c->session) != NULL && s->cwd != NULL)
- cwd = s->cwd;
- else
- cwd = ".";
-
- if (*path == '/')
- file = xstrdup(path);
- else
- xasprintf(&file, "%s/%s", cwd, path);
- if (realpath(file, resolved) == NULL &&
- strlcpy(resolved, file, sizeof resolved) >= sizeof resolved) {
- cmdq_error(item, "%s: %s", file, strerror(ENAMETOOLONG));
- return (CMD_RETURN_ERROR);
- }
- f = fopen(resolved, "rb");
- free(file);
+ file = server_client_get_path(c, path);
+ f = fopen(file, "rb");
if (f == NULL) {
- cmdq_error(item, "%s: %s", resolved, strerror(errno));
+ cmdq_error(item, "%s: %s", file, strerror(errno));
+ free(file);
return (CMD_RETURN_ERROR);
}
@@ -122,13 +105,14 @@ cmd_load_buffer_exec(struct cmd *self, struct cmdq_item *item)
pdata[psize++] = ch;
}
if (ferror(f)) {
- cmdq_error(item, "%s: read error", resolved);
+ cmdq_error(item, "%s: read error", file);
goto error;
}
if (pdata != NULL)
pdata[psize] = '\0';
fclose(f);
+ free(file);
if (paste_set(pdata, psize, bufname, &cause) != 0) {
cmdq_error(item, "%s", cause);
diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c
index 59ba0b89..ee59ad59 100644
--- a/cmd-save-buffer.c
+++ b/cmd-save-buffer.c
@@ -60,11 +60,10 @@ cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item)
{
struct args *args = self->args;
struct client *c = item->client;
- struct session *s;
struct paste_buffer *pb;
- const char *path, *bufname, *bufdata, *start, *end, *cwd;
+ const char *path, *bufname, *bufdata, *start, *end;
const char *flags;
- char *msg, *file, resolved[PATH_MAX];
+ char *msg, *file;
size_t size, used, msglen, bufsize;
FILE *f;
@@ -97,39 +96,26 @@ cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item)
goto do_print;
}
- if (c != NULL && c->session == NULL && c->cwd != NULL)
- cwd = c->cwd;
- else if (c != NULL && (s = c->session) != NULL && s->cwd != NULL)
- cwd = s->cwd;
- else
- cwd = ".";
-
flags = "wb";
if (args_has(self->args, 'a'))
flags = "ab";
- if (*path == '/')
- file = xstrdup(path);
- else
- xasprintf(&file, "%s/%s", cwd, path);
- if (realpath(file, resolved) == NULL &&
- strlcpy(resolved, file, sizeof resolved) >= sizeof resolved) {
- cmdq_error(item, "%s: %s", file, strerror(ENAMETOOLONG));
- return (CMD_RETURN_ERROR);
- }
- f = fopen(resolved, flags);
- free(file);
+ file = server_client_get_path(c, path);
+ f = fopen(file, flags);
if (f == NULL) {
- cmdq_error(item, "%s: %s", resolved, strerror(errno));
+ cmdq_error(item, "%s: %s", file, strerror(errno));
+ free(file);
return (CMD_RETURN_ERROR);
}
if (fwrite(bufdata, 1, bufsize, f) != bufsize) {
- cmdq_error(item, "%s: write error", resolved);
+ cmdq_error(item, "%s: write error", file);
fclose(f);
return (CMD_RETURN_ERROR);
}
+
fclose(f);
+ free(file);
return (CMD_RETURN_NORMAL);
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 <glob.h>
#include <stdlib.h>
#include <string.h>
+#include <vis.h>
#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;
diff --git a/server-client.c b/server-client.c
index 048a138b..1f64ac4a 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1667,3 +1667,32 @@ server_client_add_message(struct client *c, const char *fmt, ...)
free(msg);
}
}
+
+/* Get client working directory. */
+const char *
+server_client_get_cwd(struct client *c)
+{
+ struct session *s;
+
+ if (c != NULL && c->session == NULL && c->cwd != NULL)
+ return (c->cwd);
+ if (c != NULL && (s = c->session) != NULL && s->cwd != NULL)
+ return (s->cwd);
+ return (".");
+}
+
+/* Resolve an absolute path or relative to client working directory. */
+char *
+server_client_get_path(struct client *c, const char *file)
+{
+ char *path, resolved[PATH_MAX];
+
+ if (*file == '/')
+ path = xstrdup(file);
+ else
+ xasprintf(&path, "%s/%s", server_client_get_cwd(c), file);
+ if (realpath(path, resolved) == NULL)
+ return (path);
+ free(path);
+ return (xstrdup(resolved));
+}
diff --git a/tmux.h b/tmux.h
index e8bd0e3e..b9713267 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1836,6 +1836,8 @@ void server_client_push_stdout(struct client *);
void server_client_push_stderr(struct client *);
void printflike(2, 3) server_client_add_message(struct client *, const char *,
...);
+char *server_client_get_path(struct client *, const char *);
+const char *server_client_get_cwd(struct client *);
/* server-fn.c */
void server_fill_environ(struct session *, struct environ *);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 08:25:45 +0000