Try to resolve relative paths for loadb and saveb (first using client

working directory if any then default-path or session wd).
This commit is contained in:
Nicholas Marriott
2011-10-23 08:34:01 +00:00
parent 179d0686d7
commit 7ff4cf9405
4 changed files with 48 additions and 2 deletions

View File

@ -45,8 +45,9 @@ cmd_save_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
{
struct args *args = self->args;
struct client *c = ctx->cmdclient;
struct session *s;
struct paste_buffer *pb;
const char *path;
const char *path, *newpath, *wd;
char *cause;
int buffer;
mode_t mask;
@ -80,6 +81,20 @@ cmd_save_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
}
bufferevent_write(c->stdout_event, pb->data, pb->size);
} else {
if (c != NULL)
wd = c->cwd;
else if ((s = cmd_current_session(ctx, 0)) != NULL) {
wd = options_get_string(&s->options, "default-path");
if (*wd == '\0')
wd = s->cwd;
} else
wd = NULL;
if (wd != NULL && *wd != '\0') {
newpath = get_full_path(wd, path);
if (newpath != NULL)
path = newpath;
}
mask = umask(S_IRWXG | S_IRWXO);
if (args_has(self->args, 'a'))
f = fopen(path, "ab");