aboutsummaryrefslogtreecommitdiffstats
path: root/rc.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--rc.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/rc.c b/rc.c
index d9eed46..67ec95b 100644
--- a/rc.c
+++ b/rc.c
@@ -1,4 +1,4 @@
-/* $Id: rc.c,v 1.84 2003/04/08 16:01:40 ukai Exp $ */
+/* $Id: rc.c,v 1.85 2003/07/26 17:16:24 ukai Exp $ */
/*
* Initialization file etc.
*/
@@ -1397,6 +1397,10 @@ init_rc(void)
interpret_rc(f);
fclose(f);
}
+ if ((f = fopen(confFile(CONFIG_FILE), "rt")) != NULL) {
+ interpret_rc(f);
+ fclose(f);
+ }
if ((f = fopen(config_file, "rt")) != NULL) {
interpret_rc(f);
fclose(f);
@@ -1584,6 +1588,12 @@ etcFile(char *base)
return expandPath(Strnew_m_charp(w3m_etc_dir(), "/", base, NULL)->ptr);
}
+char *
+confFile(char *base)
+{
+ return expandPath(Strnew_m_charp(w3m_conf_dir(), "/", base, NULL)->ptr);
+}
+
#ifndef USE_HELP_CGI
char *
helpFile(char *base)