summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortim <tim@openbsd.org>2019-12-21 17:30:48 +0000
committertim <tim@openbsd.org>2019-12-21 17:30:48 +0000
commit20066256ba9577de0a389c4bd13a84f1edd45db5 (patch)
tree563532026e96535387f71d46bf12b19c578c8ee9
parentyet another mostly cosmetic diff (diff)
downloadwireguard-openbsd-20066256ba9577de0a389c4bd13a84f1edd45db5.tar.xz
wireguard-openbsd-20066256ba9577de0a389c4bd13a84f1edd45db5.zip
Restore source-file -q behaviour, broken in r1.42; OK nicm@
-rw-r--r--usr.bin/tmux/cmd-source-file.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/tmux/cmd-source-file.c b/usr.bin/tmux/cmd-source-file.c
index 43003913d75..005abd03c89 100644
--- a/usr.bin/tmux/cmd-source-file.c
+++ b/usr.bin/tmux/cmd-source-file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-source-file.c,v 1.44 2019/12/19 09:22:33 nicm Exp $ */
+/* $OpenBSD: cmd-source-file.c,v 1.45 2019/12/21 17:30:48 tim Exp $ */
/*
* Copyright (c) 2008 Tiago Cunha <me@tiagocunha.org>
@@ -125,7 +125,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;
@@ -161,7 +160,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)