mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-29 17:31:02 +01:00
Code Releases Activity

33212: try to put /usr/local/share/zsh/site-functions in default fpath

Browse source
This commit is contained in:
Peter Stephenson 2014-09-20 20:14:09 +01:00
parent f4aae44162
commit 0c7a3d6864
4 changed files with 44 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Src/init.c
View file

@ -770,7 +770,8 @@ setupvals(void)
struct timezone dummy_tz;
char *ptr;
int i, j;
#if defined(SITEFPATH_DIR) || defined(FPATH_DIR) || defined (ADDITIONAL_FPATH)
#if defined(SITEFPATH_DIR) || defined(FPATH_DIR) || defined (ADDITIONAL_FPATH) || defined(FIXED_FPATH_DIR)
#define FPATH_NEEDS_INIT 1
char **fpathptr;
# if defined(FPATH_DIR) && defined(FPATH_SUBDIRS)
char *fpath_subdirs[] = FPATH_SUBDIRS;
@ -779,11 +780,17 @@ setupvals(void)
char *more_fndirs[] = ADDITIONAL_FPATH;
int more_fndirs_len;
# endif
# ifdef SITEFPATH_DIR
int fpathlen = 1;
# ifdef FIXED_FPATH_DIR
# define FIXED_FPATH_LEN 1
# else
int fpathlen = 0;
# define FIXED_FPATH_LEN 0
# endif
# ifdef SITEFPATH_DIR
# define SITE_FPATH_LEN 1
# else
# define SITE_FPATH_LEN 0
# endif
int fpathlen = FIXED_FPATH_LEN + SITE_FPATH_LEN;
#endif
int close_fds[10], tmppipe[2];
@ -862,23 +869,27 @@ setupvals(void)
manpath = mkarray(NULL);
fignore = mkarray(NULL);
#if defined(SITEFPATH_DIR) || defined(FPATH_DIR) || defined(ADDITIONAL_FPATH)
#ifdef FPATH_NEEDS_INIT
# ifdef FPATH_DIR
# ifdef FPATH_SUBDIRS
fpathlen += sizeof(fpath_subdirs)/sizeof(char *);
# else
# else /* FPATH_SUBDIRS */
fpathlen++;
# endif
# endif
# endif /* FPATH_SUBDIRS */
# endif /* FPATH_DIR */
# if defined(ADDITIONAL_FPATH)
more_fndirs_len = sizeof(more_fndirs)/sizeof(char *);
fpathlen += more_fndirs_len;
# endif
# endif /* ADDITONAL_FPATH */
fpath = fpathptr = (char **)zalloc((fpathlen+1)*sizeof(char *));
# ifdef FIXED_FPATH_DIR
*fpathptr++ = ztrdup(FIXED_FPATH_DIR);
fpathlen--;
# endif
# ifdef SITEFPATH_DIR
*fpathptr++ = ztrdup(SITEFPATH_DIR);
fpathlen--;
# endif
# endif /* SITEFPATH_DIR */
# if defined(ADDITIONAL_FPATH)
for (j = 0; j < more_fndirs_len; j++)
*fpathptr++ = ztrdup(more_fndirs[j]);
@ -897,9 +908,9 @@ setupvals(void)
# endif
# endif
*fpathptr = NULL;
#else
#else /* FPATH_NEEDS_INIT */
fpath = mkarray(NULL);
#endif
#endif /* FPATH_NEEDS_INIT */
mailpath = mkarray(NULL);
watch = mkarray(NULL);