diff options
| author | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-07-26 17:16:24 +0000 |
|---|---|---|
| committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-07-26 17:16:24 +0000 |
| commit | c913794f0cdf4baf33c195eb7700b7d75d24537f (patch) | |
| tree | 5821a81f4872e6272db6cf4ac0d872744588fd8e /rc.c | |
| parent | fix indent (diff) | |
| download | w3m-c913794f0cdf4baf33c195eb7700b7d75d24537f.tar.gz w3m-c913794f0cdf4baf33c195eb7700b7d75d24537f.zip | |
[w3m-dev 03945] Re: application/xhtml+xml support
* Makefile.in (ETC_DIR): added
(CONF_DIR): added
(DEFS): add CONF_DIR
(MAKE_ARGS): add CONF_DIR
* config.h.in (SYS_MAILCAP): use CONF_DIR
(SYS_URIMETHODMAP): use CONF_DIR
* func.c (sys_current_keymap_file): added
(interpret_keymap): added
(initKeymap): use interpret_keymap
(interpret_mouse_action): added
(initMouseAction): use interpret_mouse_action
* indep.c (w3m_conf_dir): added
* indep.h (w3m_conf_dir): added
* menu.c (interpret_menu): added
(initMenu): use interpret_menu
* proto.h (confFile): added
* rc.c (init_rc): read config file by interpret_rc
(confFile): added
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
Diffstat (limited to 'rc.c')
| -rw-r--r-- | rc.c | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -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) |