diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 1999-06-08 09:25:39 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 1999-06-08 09:25:39 +0000 |
| commit | 805381040dd69dd02b78423d2d71913b33f3cc33 (patch) | |
| tree | 1fa89ee643e8e577a2f79e76e3d6cafc93256ca2 /Src/init.c | |
| parent | f42e3fa8e6152e145251e8f16f4c61c23dec1f59 (diff) | |
| download | zsh-805381040dd69dd02b78423d2d71913b33f3cc33.tar.gz zsh-805381040dd69dd02b78423d2d71913b33f3cc33.tar.xz zsh-805381040dd69dd02b78423d2d71913b33f3cc33.zip | |
zsh-3.1.5-pws-21 zsh-3.1.5-pws-21
Diffstat (limited to 'Src/init.c')
| -rw-r--r-- | Src/init.c | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/Src/init.c b/Src/init.c index 7f1b2153a..f9e6574dd 100644 --- a/Src/init.c +++ b/Src/init.c @@ -550,7 +550,11 @@ setupvals(void) cdpath = mkarray(NULL); manpath = mkarray(NULL); fignore = mkarray(NULL); +#ifdef FUNCTION_DIR + fpath = mkarray(ztrdup(FUNCTION_DIR)); +#else fpath = mkarray(NULL); +#endif mailpath = mkarray(NULL); watch = mkarray(NULL); psvar = mkarray(NULL); @@ -758,33 +762,31 @@ run_init_scripts(void) #ifdef GLOBAL_ZSHENV source(GLOBAL_ZSHENV); #endif - if (isset(RCS)) { - if (unset(PRIVILEGED)) - sourcehome(".zshenv"); - if (islogin) { + if (isset(RCS) && unset(PRIVILEGED)) + sourcehome(".zshenv"); + if (islogin) { #ifdef GLOBAL_ZPROFILE - if (isset(GLOBALRCS)) + if (isset(RCS) && isset(GLOBALRCS)) source(GLOBAL_ZPROFILE); #endif - if (unset(PRIVILEGED)) - sourcehome(".zprofile"); - } - if (interact) { + if (isset(RCS) && unset(PRIVILEGED)) + sourcehome(".zprofile"); + } + if (interact) { #ifdef GLOBAL_ZSHRC - if (isset(GLOBALRCS)) - source(GLOBAL_ZSHRC); + if (isset(RCS) && isset(GLOBALRCS)) + source(GLOBAL_ZSHRC); #endif - if (unset(PRIVILEGED)) - sourcehome(".zshrc"); - } - if (islogin) { + if (isset(RCS) && unset(PRIVILEGED)) + sourcehome(".zshrc"); + } + if (islogin) { #ifdef GLOBAL_ZLOGIN - if (isset(GLOBALRCS)) - source(GLOBAL_ZLOGIN); + if (isset(RCS) && isset(GLOBALRCS)) + source(GLOBAL_ZLOGIN); #endif - if (unset(PRIVILEGED)) - sourcehome(".zlogin"); - } + if (isset(RCS) && unset(PRIVILEGED)) + sourcehome(".zlogin"); } } noerrexit = 0; |