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' into master

Browse Source
This commit is contained in:
Thomas Adam
2021-08-20 22:01:46 +01:00
parent 944fde7c57 d589be6c65
commit b0da0cee4d
44 changed files with 431 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmd-source-file.c
View File

@@ -128,11 +128,11 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
struct cmd_source_file_data *cdata;
struct client *c = cmdq_get_client(item);
enum cmd_retval retval = CMD_RETURN_NORMAL;
char *pattern, *cwd, *expand = NULL;
char *pattern, *cwd, *expanded = NULL;
const char *path, *error;
glob_t g;
int i, result;
u_int j;
int result;
u_int i, j;
cdata = xcalloc(1, sizeof *cdata);
cdata->item = item;
@@ -146,13 +146,13 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
utf8_stravis(&cwd, server_client_get_cwd(c, NULL), VIS_GLOB);
for (i = 0; i < args->argc; i++) {
for (i = 0; i < args_count(args); i++) {
path = args_string(args, i);
if (args_has(args, 'F')) {
free(expand);
expand = format_single_from_target(item, args->argv[i]);
path = expand;
} else
path = args->argv[i];
free(expanded);
expanded = format_single_from_target(item, path);
path = expanded;
}
if (strcmp(path, "-") == 0) {
cmd_source_file_add(cdata, "-");
continue;
@@ -179,7 +179,7 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
free(pattern);
continue;
}
free(expand);
free(expanded);
free(pattern);
for (j = 0; j < g.gl_pathc; j++)