load_cfg returns < 0 on error, not != 0. Problem reported by Kaushal Modi.
authornicm <nicm@openbsd.org>
Wed, 19 Apr 2017 16:59:54 +0000 (16:59 +0000)
committernicm <nicm@openbsd.org>
Wed, 19 Apr 2017 16:59:54 +0000 (16:59 +0000)
usr.bin/tmux/cmd-source-file.c

index b497f86..609866e 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-source-file.c,v 1.34 2017/02/14 18:13:05 nicm Exp $ */
+/* $OpenBSD: cmd-source-file.c,v 1.35 2017/04/19 16:59:54 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Tiago Cunha <me@tiagocunha.org>
@@ -79,7 +79,7 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
        free(pattern);
 
        for (i = 0; i < (u_int)g.gl_pathc; i++) {
-               if (load_cfg(g.gl_pathv[i], c, item, quiet) != 0)
+               if (load_cfg(g.gl_pathv[i], c, item, quiet) < 0)
                        retval = CMD_RETURN_ERROR;
        }
        if (cfg_finished) {