circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 06:17:04 +00:00
Code Issues Projects Releases Wiki Activity

Run the source-file pattern through glob(3).

Browse Source
This commit is contained in:
nicm
2017-01-09 19:27:00 +00:00
parent c05002b0f2
commit 5330a2a85d
4 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cmd-source-file.c
View File

@ -18,7 +18,10 @@
#include <sys/types.h>
#include <errno.h>
#include <glob.h>
#include <stdlib.h>
#include <string.h>
#include "tmux.h"
@ -48,23 +51,28 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
struct client *c = item->client;
int quiet;
struct cmdq_item *new_item;
enum cmd_retval retval;
glob_t g;
int i;
quiet = args_has(args, 'q');
switch (load_cfg(args->argv[0], c, item, quiet)) {
case -1:
if (cfg_finished)
cfg_print_causes(item);
if (glob(args->argv[0], 0, NULL, &g) != 0) {
cmdq_error(item, "%s: %s", args->argv[0], strerror(errno));
return (CMD_RETURN_ERROR);
case 0:
if (cfg_finished)
cfg_print_causes(item);
return (CMD_RETURN_NORMAL);
}
quiet = args_has(args, 'q');
retval = CMD_RETURN_NORMAL;
for (i = 0; i < g.gl_pathc; i++) {
if (load_cfg(g.gl_pathv[i], c, item, quiet) != 0)
retval = CMD_RETURN_ERROR;
}
if (cfg_finished) {
new_item = cmdq_get_callback(cmd_source_file_done, NULL);
cmdq_insert_after(item, new_item);
}
return (CMD_RETURN_NORMAL);
globfree(&g);
return (retval);
}
static enum cmd_retval