Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2019-12-21 18:01:24 +00:00
commit a6b1cbba02

View File

@ -124,7 +124,6 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
{
struct args *args = self->args;
struct cmd_source_file_data *cdata;
int flags = 0;
struct client *c = item->client;
enum cmd_retval retval = CMD_RETURN_NORMAL;
char *pattern, *cwd;
@ -160,7 +159,7 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
if ((result = glob(pattern, 0, NULL, &g)) != 0) {
if (result != GLOB_NOMATCH ||
(~flags & CMD_PARSE_QUIET)) {
(~cdata->flags & CMD_PARSE_QUIET)) {
if (result == GLOB_NOMATCH)
error = strerror(ENOENT);
else if (result == GLOB_NOSPACE)