aboutsummaryrefslogtreecommitdiff
path: root/cfg.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2012-11-27 18:12:04 +0000
committerThomas Adam <thomas@xteddy.org>2012-11-27 18:12:04 +0000
commit39631edb98a542be53fce6f1eeef41880c9a76b4 (patch)
treec25708a37d4c79d1dbbc89a91d34296df689d934 /cfg.c
parent1bc910a963ab3c39a03ed3e6b4795c6b5d5b6d18 (diff)
parent9b8998aeec9c4dff695ae4108965677d90d9c9c7 (diff)
downloadrtmux-39631edb98a542be53fce6f1eeef41880c9a76b4.tar.gz
rtmux-39631edb98a542be53fce6f1eeef41880c9a76b4.tar.bz2
rtmux-39631edb98a542be53fce6f1eeef41880c9a76b4.zip
Merge branch 'obsd-master'
Sync from OpenBSD.
Diffstat (limited to 'cfg.c')
-rw-r--r--cfg.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/cfg.c b/cfg.c
index 17287d86..74570e36 100644
--- a/cfg.c
+++ b/cfg.c
@@ -34,9 +34,10 @@
void printflike2 cfg_print(struct cmd_ctx *, const char *, ...);
void printflike2 cfg_error(struct cmd_ctx *, const char *, ...);
-char *cfg_cause;
-int cfg_finished;
-struct causelist cfg_causes = ARRAY_INITIALIZER;
+char *cfg_cause;
+int cfg_finished;
+int cfg_references;
+struct causelist cfg_causes;
/* ARGSUSED */
void printflike2
@@ -89,6 +90,8 @@ load_cfg(const char *path, struct cmd_ctx *ctxin, struct causelist *causes)
}
n = 0;
+ cfg_references++;
+
line = NULL;
retval = CMD_RETURN_NORMAL;
while ((buf = fgetln(f, &len))) {
@@ -171,6 +174,8 @@ load_cfg(const char *path, struct cmd_ctx *ctxin, struct causelist *causes)
}
fclose(f);
+ cfg_references--;
+
return (retval);
}