Attachment #85815 for bug #122116

Lines 21-28 Link Here

(-)zsh/Makefile (-3 / +3 lines)
21	# NOTE: does NOT have to be inside ${PREFIX} tree	21	# NOTE: does NOT have to be inside ${PREFIX} tree
22		22
23	PORTNAME= zsh	23	PORTNAME= zsh
24	PORTVERSION= 4.3.4	24	PORTVERSION= 4.3.5
25	PORTREVISION= 3	25	PORTREVISION= 1
26	CATEGORIES= shells	26	CATEGORIES= shells
27	MASTER_SITES= SF	27	MASTER_SITES= SF
28	.if !defined(NOPORTDOCS)	28	.if !defined(NOPORTDOCS)
Lines 43-49 Link Here
43	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	43	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
44	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \	44	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
45	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"	45	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
46	CONFIGURE_ARGS= --with-curses-terminfo --with-tcsetpgrp \	46	CONFIGURE_ARGS= --with-term-lib="ncursesw ncurses" --with-tcsetpgrp \
47	--enable-etcdir=${ZSH_ETCDIR} \	47	--enable-etcdir=${ZSH_ETCDIR} \
48	--enable-fndir=${ZSH_FNDIR} --enable-function-subdirs \	48	--enable-fndir=${ZSH_FNDIR} --enable-function-subdirs \
49	--enable-site-fndir=${ZSH_SITEFNDIR}	49	--enable-site-fndir=${ZSH_SITEFNDIR}

Lines 1-6 Link Here

(-)zsh/distinfo (-6 / +3 lines)
1	MD5 (zsh-4.3.4.tar.bz2) = 8410a30e4f5c6160790bc3afc096424f	1	MD5 (zsh-4.3.5.tar.bz2) = db0d4b71da8e5877fa1e29d4cea38b8c
2	SHA256 (zsh-4.3.4.tar.bz2) = 6fa0e22cb0da3a02c115425097002f2b4bb56e412db6c821ca111e088cbfdec6	2	SHA256 (zsh-4.3.5.tar.bz2) = ebe74df173d5b713e4e839e691da279dc9b4d4d0d98b9886cc725217e9902105
3	SIZE (zsh-4.3.4.tar.bz2) = 2374851	3	SIZE (zsh-4.3.5.tar.bz2) = 2513384
4	MD5 (zsh-4.3.4-doc.tar.bz2) = 1a4ab09a9d75c5ae8585ad645406f27d
5	SHA256 (zsh-4.3.4-doc.tar.bz2) = e74289f99479328b8bcee9c47ae07038e54437e860fb5487da57cfc8d1836777
6	SIZE (zsh-4.3.4-doc.tar.bz2) = 2358063

Lines 1-13 Link Here

(-)zsh/files/patch-Completion-Unix-Command-_mount (-13 lines)
1	--- Completion/Unix/Command/_mount.orig 2006-05-28 13:46:56.000000000 -0500
2	+++ Completion/Unix/Command/_mount 2007-08-20 21:22:22.000000000 -0500
3	@@ -859,8 +859,8 @@
4	;;
5	*)
6	/sbin/mount \| while read mline; do
7	- mp_tmp+=( $mline[(w)1] )
8	- dev_tmp+=( $mline[(w)3] )
9	+ dev_tmp+=( $mline[(w)1] )
10	+ mp_tmp+=( $mline[(w)3] )
11	done
12	;;
13	esac

Lines 1-20 Link Here

(-)zsh/files/patch-Completion-Unix-Command-_subversion (-20 lines)
1	--- Completion/Unix/Command/_subversion 2007/04/19 20:37:04 1.24
2	+++ Completion/Unix/Command/_subversion 2008/01/31 16:16:36 1.25
3	@@ -30,7 +30,7 @@
4
5	usage=${${(M)${(f)"$(LC_ALL=C _call_program options svn help $cmd)"}:#usage:}#usage:$cmd] }
6	args=(
7	- ${=${${${(M)${(f)"$(LC_ALL=C _call_program options svn help $cmd)"##Valid options:}:# :}%% #:}/ arg/:arg:}/(#b)-([[:alpha:]]) \[--([a-z-]##)\](:arg:)#/(--$match[2])-$match[1]$match[3] (-$match[1])--$match[2]$match[3]}
8	+ ${=${${${(M)${(f)"$(LC_ALL=C _call_program options svn help $cmd)"#(Valid options:\|(#e))}:# :}%% #:}/ (arg\|ARG)/:arg:}/(#b)-([[:alpha:]]) \[--([a-z-]##)\](:arg:)#/(--$match[2])-$match[1]$match[3] (-$match[1])--$match[2]$match[3]}
9	)
10
11	case $cmd in;
12	@@ -148,7 +148,7 @@
13
14	usage=${${(M)${(f)"$(LC_ALL=C _call_program options svnadmin help $cmd)"}:#$cmd: usage:*}#$cmd: usage: svnadmin $cmd }
15	args=(
16	- ${=${${${(M)${(f)"$(LC_ALL=C _call_program options svnadmin help $cmd)"##Valid options:}:#:}%% #:}/ arg/:arg:}/(#b)-([[:alpha:]]) \[--([a-z-]##)\](:arg:)#/(--$match[2])-$match[1]$match[3] (-$match[1])--$match[2]$match[3]}
17	+ ${=${${${(M)${(f)"$(LC_ALL=C _call_program options svnadmin help $cmd)"#(Valid options:\|(#e))}:# :}%% #:}/ (arg\|ARG)/:arg:}/(#b)-([[:alpha:]]) \[--([a-z-]##)\](:arg:)#/(--$match[2])-$match[1]$match[3] (-$match[1])--$match[2]$match[3]}
18	)
19	if [[ $_svnadmin_subcmd_usage == REPOS_PATH ]]; then
20	args+=( ":path:_files -/" )




--- Completion/Unix/Type/_canonical_paths.orig	2006-05-28 13:36:06.000000000 -0500
+++ Completion/Unix/Type/_canonical_paths	2007-08-20 21:23:04.000000000 -0500
@@ -38,7 +38,7 @@
   files=($@)
 else
   for __index in $@; do
-    files+=$(readlink -qf $__index)
+    files+=$(/usr/bin/stat -qr $__index | cut -d' ' -f16)
   done
 fi
 
@@ -48,7 +48,7 @@
   expref=${~origpref}
   [[ $origpref == (|*/). ]] && rltrim=.
   curpref=${${expref%$rltrim}:-./}
-  canpref=$(readlink -qf $curpref)
+  canpref=$(/usr/bin/stat -qr $curpref | cut -d' ' -f16)
   if [[ $? -eq 0 ]]; then
     [[ $curpref == */ && $canpref == *[^/] ]] && canpref+=/
     canpref+=$rltrim




--- ./Completion/Unix/Type/_canonical_paths.orig	2006-05-28 20:36:06.000000000 +0200
+++ ./Completion/Unix/Type/_canonical_paths	2008-03-26 19:11:15.000000000 +0100
@@ -27,18 +27,37 @@
 
 shift 2
 
-if (( ! $+commands[readlink] )); then
+if ! zmodload -F zsh/stat b:zstat 2>/dev/null; then
   _wanted "$tag" expl "$desc" compadd $__gopts $@ && ret=0
   return ret
 fi
 
+typeset REPLY
 typeset -a matches files
 
+_canonical_paths_get_canonical_path() {
+  typeset newfile
+  typeset -A seen
+
+  REPLY=$1
+  # Guard against loops.
+  while [[ -z ${seen[$REPLY]} ]]; do
+    seen[$REPLY]=1
+    newfile=$(zstat +link $REPLY 2>/dev/null)
+    if [[ -n $newfile ]]; then
+      REPLY=$newfile
+    else
+      break
+    fi
+  done
+}
+
 if (( $__opts[(I)-N] )); then
   files=($@)
 else
   for __index in $@; do
-    files+=$(readlink -qf $__index)
+    _canonical_paths_get_canonical_path $__index
+    files+=($REPLY)
   done
 fi
 
@@ -48,13 +67,16 @@
   expref=${~origpref}
   [[ $origpref == (|*/). ]] && rltrim=.
   curpref=${${expref%$rltrim}:-./}
-  canpref=$(readlink -qf $curpref)
-  if [[ $? -eq 0 ]]; then
-    [[ $curpref == */ && $canpref == *[^/] ]] && canpref+=/
-    canpref+=$rltrim
-    [[ $expref == *[^/] && $canpref == */ ]] && origpref+=/
-    matches+=(${${(M)files:#$canpref*}/$canpref/$origpref})
+  if zstat $curpref >&/dev/null; then
+    _canonical_paths_get_canonical_path $curpref
+    canpref=$REPLY
+  else
+    canpref=$curpref
   fi
+  [[ $curpref == */ && $canpref == *[^/] ]] && canpref+=/
+  canpref+=$rltrim
+  [[ $expref == *[^/] && $canpref == */ ]] && origpref+=/
+  matches+=(${${(M)files:#$canpref*}/$canpref/$origpref})
   for subdir in $expref?*(@); do
     _canonical_paths_add_paths ${subdir/$expref/$origpref} add
   done




--- Config/installfns.sh.orig	Mon Mar 20 08:06:24 2006
+++ Config/installfns.sh	Thu Jul 26 11:10:23 2007
@@ -45,10 +45,9 @@
       esac
     fi
     test -d $instdir || /bin/sh $sdir_top/mkinstalldirs $instdir || exit 1
+    $INSTALL_DATA $sdir_top/$file $instdir || exit 1
     if test -x $sdir_top/$file; then
-	$INSTALL_PROGRAM $sdir_top/$file $instdir || exit 1
-    else
-	$INSTALL_DATA $sdir_top/$file $instdir || exit 1
+       chmod +x $instdir/`echo $file | sed -e 's%^.*/%%'`
     fi
   fi
 done




--- Src/utils.c.orig	Tue Apr 17 10:57:15 2007
+++ Src/utils.c	Wed Jul 25 15:13:58 2007
@@ -1092,6 +1092,7 @@
 time_t lastmailcheck;
 
 /* the last time we checked the people in the WATCH variable */
+extern char *_mktemp(char *);
 
 /**/
 time_t lastwatch;
@@ -4569,11 +4570,11 @@
     int count;
 #else
     unsigned int wval;
+    size_t count;
 # if defined(HAVE_NL_LANGINFO) && defined(CODESET) && defined(HAVE_ICONV)
     iconv_t cd;
     char inbuf[4];
     size_t inbytes, outbytes;
-    size_t count;
 # endif
 #endif
 




diff -u Src/exec.c Src/exec.c
--- Src/exec.c	2007-02-14 10:11:19.000000000 -0600
+++ Src/exec.c	2007-07-31 08:49:13.000000000 -0500
@@ -501,7 +501,16 @@
      * that as argv[0] for this external command       */
     if (unset(RESTRICTED) && (z = zgetenv("ARGV0"))) {
 	setdata(firstnode(args), (void *) ztrdup(z));
+	/*
+	 * Note we don't do anything with the parameter structure
+	 * for ARGV0: that's OK since we're about to exec or exit
+	 * on failure.
+	 */
+#ifdef USE_SET_UNSET_ENV
+	unsetenv("ARGV0");
+#else
 	delenvvalue(z - 6);
+#endif
     } else if (dash) {
     /* Else if the pre-command `-' was given, we add `-' *
      * to the front of argv[0] for this command.         */
diff -u Src/params.c Src/params.c
--- Src/params.c	2007-04-13 06:40:27.000000000 -0500
+++ Src/params.c	2007-07-31 08:49:13.000000000 -0500
@@ -606,7 +606,7 @@
 createparamtable(void)
 {
     Param ip, pm;
-#ifndef HAVE_PUTENV
+#if !defined(HAVE_PUTENV) && !defined(USE_SET_UNSET_ENV)
     char **new_environ;
     int  envsize;
 #endif
@@ -661,7 +661,7 @@
 
     setsparam("LOGNAME", ztrdup((str = getlogin()) && *str ? str : cached_username));
 
-#ifndef HAVE_PUTENV
+#if !defined(HAVE_PUTENV) && !defined(USE_SET_UNSET_ENV)
     /* Copy the environment variables we are inheriting to dynamic *
      * memory, so we can do mallocs and frees on it.               */
     envsize = sizeof(char *)*(1 + arrlen(environ));
@@ -3727,6 +3727,30 @@
 int
 zputenv(char *str)
 {
+#ifdef USE_SET_UNSET_ENV
+    /*
+     * If we are using unsetenv() to remove values from the
+     * environment, which is the safe thing to do, we
+     * need to use setenv() to put them there in the first place.
+     * Unfortunately this is a slightly different interface
+     * from what zputenv() assumes.
+     */
+    char *ptr;
+    int ret;
+
+    for (ptr = str; *ptr && *ptr != '='; ptr++)
+	;
+    if (*ptr) {
+	*ptr = '\0';
+	ret = setenv(str, ptr+1, 1);
+	*ptr = '=';
+    } else {
+	/* safety first */
+	DPUTS(1, "bad environment string");
+	ret = setenv(str, ptr, 1);
+    }
+    return ret;
+#else
 #ifdef HAVE_PUTENV
     return putenv(str);
 #else
@@ -3750,9 +3774,12 @@
     }
     return 0;
 #endif
+#endif
 }
 
 /**/
+#ifndef USE_SET_UNSET_ENV
+/**/
 static int
 findenv(char *name, int *pos)
 {
@@ -3771,6 +3798,8 @@
     
     return 0;
 }
+/**/
+#endif
 
 /* Given *name = "foo", it searches the environment for string *
  * "foo=bar", and returns a pointer to the beginning of "bar"  */
@@ -3811,14 +3840,18 @@
 void
 addenv(Param pm, char *value)
 {
-    char *oldenv = 0, *newenv = 0, *env = 0;
+    char *newenv = 0;
+#ifndef USE_SET_UNSET_ENV
+    char *oldenv = 0, *env = 0;
     int pos;
 
-    /* First check if there is already an environment *
-     * variable matching string `name'. If not, and   *
-     * we are not requested to add new, return        */
+    /*
+     * First check if there is already an environment
+     * variable matching string `name'.
+     */
     if (findenv(pm->node.nam, &pos))
 	oldenv = environ[pos];
+#endif
 
      newenv = mkenvstr(pm->node.nam, value, pm->node.flags);
      if (zputenv(newenv)) {
@@ -3826,6 +3859,19 @@
 	pm->env = NULL;
 	return;
     }
+#ifdef USE_SET_UNSET_ENV
+     /*
+      * If we are using setenv/unsetenv to manage the environment,
+      * we simply store the string we created in pm->env since
+      * memory management of the environment is handled entirely
+      * by the system.
+      *
+      * TODO: is this good enough to fix problem cases from
+      * the other branch?  If so, we don't actually need to
+      * store pm->env at all, just a flag that the value was set.
+      */
+     pm->env = newenv;
+#else
     /*
      * Under Cygwin we must use putenv() to maintain consistency.
      * Unfortunately, current version (1.1.2) copies argument and may
@@ -3845,6 +3891,7 @@
 
     DPUTS(1, "addenv should never reach the end");
     pm->env = NULL;
+#endif
 }
 
 
@@ -3875,6 +3922,7 @@
  * string.                                         */
 
 
+#ifndef USE_SET_UNSET_ENV
 /**/
 void
 delenvvalue(char *x)
@@ -3890,6 +3938,8 @@
     }
     zsfree(x);
 }
+#endif
+
 
 /* Delete a pointer from the list of pointers to environment *
  * variables by shifting all the other pointers up one slot. */
@@ -3898,7 +3948,12 @@
 void
 delenv(Param pm)
 {
+#ifdef USE_SET_UNSET_ENV
+    unsetenv(pm->node.nam);
+    zsfree(pm->env);
+#else
     delenvvalue(pm->env);
+#endif
     pm->env = NULL;
     /*
      * Note we don't remove PM_EXPORT from the flags.  This
diff -u Src/system.h Src/system.h
--- Src/system.h	2007-04-13 05:11:31.000000000 -0500
+++ Src/system.h	2007-07-31 08:49:13.000000000 -0500
@@ -693,6 +693,15 @@
 
 extern char **environ;
 
+/*
+ * We always need setenv and unsetenv in pairs, because
+ * we don't know how to do memory management on the values set.
+ */
+#if defined(HAVE_SETENV) && defined(HAVE_UNSETENV)
+# define USE_SET_UNSET_ENV
+#endif
+
+
 /* These variables are sometimes defined in, *
  * and needed by, the termcap library.       */
 #if MUST_DEFINE_OSPEED
diff -u Test/B02typeset.ztst Test/B02typeset.ztst
--- Test/B02typeset.ztst	2006-06-26 13:17:32.000000000 -0500
+++ Test/B02typeset.ztst	2007-07-31 08:49:13.000000000 -0500
@@ -379,3 +379,31 @@
 >integer local i
 >local tagged scalar
 >preserved
+
+ export ENVFOO=bar
+ print ENVFOO in environment
+ env | grep '^ENVFOO'
+ print Changing ENVFOO
+ ENVFOO="not bar any more"
+ env | grep '^ENVFOO'
+ unset ENVFOO
+ print ENVFOO no longer in environment
+ env | grep '^ENVFOO'
+1:Adding and removing values to and from the environment
+>ENVFOO in environment
+>ENVFOO=bar
+>Changing ENVFOO
+>ENVFOO=not bar any more
+>ENVFOO no longer in environment
+
+ (export FOOENV=BAR
+ env | grep '^FOOENV'
+ print Exec
+ exec $ZTST_testdir/../Src/zsh -c '
+ print Unset
+ unset FOOENV
+ env | grep "^FOOENV"')
+1:Can unset environment variables after exec
+>FOOENV=BAR
+>Exec
+>Unset
diff -u configure configure
--- configure	2007-01-18 10:33:17.000000000 -0600
+++ configure	2007-07-31 08:49:06.000000000 -0500
@@ -10263,7 +10263,7 @@
 	       setlocale \
 	       uname \
 	       signgam \
-	       putenv getenv \
+	       putenv getenv setenv unsetenv xw \
 	       brk sbrk \
 	       pathconf sysconf \
 	       tgetent tigetflag tigetnum tigetstr setupterm \
diff -u configure.ac configure.ac
--- configure.ac	2007-01-05 07:58:04.000000000 -0600
+++ configure.ac	2007-07-31 08:49:06.000000000 -0500
@@ -1126,7 +1126,7 @@
 	       setlocale \
 	       uname \
 	       signgam \
-	       putenv getenv \
+	       putenv getenv setenv unsetenv xw\
 	       brk sbrk \
 	       pathconf sysconf \
 	       tgetent tigetflag tigetnum tigetstr setupterm \




%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/complete.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/complist.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/computil.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/curses.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/datetime.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/deltochar.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/example.so

%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/newuser.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/parameter.so
%%PCRE%%%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/pcre.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/regex.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/rlimits.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/sched.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/stat.so

%%ZSH_FNDIR%%/Calendar/calendar_add
%%ZSH_FNDIR%%/Calendar/calendar_edit
%%ZSH_FNDIR%%/Calendar/calendar_lockfiles
%%ZSH_FNDIR%%/Calendar/calendar_parse
%%ZSH_FNDIR%%/Calendar/calendar_read
%%ZSH_FNDIR%%/Calendar/calendar_scandate
%%ZSH_FNDIR%%/Calendar/calendar_show

%%ZSH_FNDIR%%/Completion/Base/_complete
%%ZSH_FNDIR%%/Completion/Base/_complete_debug
%%ZSH_FNDIR%%/Completion/Base/_complete_help
%%ZSH_FNDIR%%/Completion/Base/_complete_help_generic
%%ZSH_FNDIR%%/Completion/Base/_complete_tag
%%ZSH_FNDIR%%/Completion/Base/_correct
%%ZSH_FNDIR%%/Completion/Base/_correct_filename

%%ZSH_FNDIR%%/Completion/Debian/_debfoster
%%ZSH_FNDIR%%/Completion/Debian/_debsign
%%ZSH_FNDIR%%/Completion/Debian/_dlocate
%%ZSH_FNDIR%%/Completion/Debian/_dpatch-edit-patch
%%ZSH_FNDIR%%/Completion/Debian/_dpkg
%%ZSH_FNDIR%%/Completion/Debian/_dpkg-cross
%%ZSH_FNDIR%%/Completion/Debian/_dpkg_repack
%%ZSH_FNDIR%%/Completion/Debian/_dpkg_source
%%ZSH_FNDIR%%/Completion/Debian/_dput
%%ZSH_FNDIR%%/Completion/Debian/_dupload
%%ZSH_FNDIR%%/Completion/Debian/_invoke-rc.d
%%ZSH_FNDIR%%/Completion/Debian/_lighttpd
%%ZSH_FNDIR%%/Completion/Debian/_linda
%%ZSH_FNDIR%%/Completion/Debian/_lintian
%%ZSH_FNDIR%%/Completion/Debian/_madison
%%ZSH_FNDIR%%/Completion/Debian/_make-kpkg
%%ZSH_FNDIR%%/Completion/Debian/_members
%%ZSH_FNDIR%%/Completion/Debian/_mergechanges
%%ZSH_FNDIR%%/Completion/Debian/_module-assistant
%%ZSH_FNDIR%%/Completion/Debian/_piuparts
%%ZSH_FNDIR%%/Completion/Debian/_reprepro
%%ZSH_FNDIR%%/Completion/Debian/_schroot
%%ZSH_FNDIR%%/Completion/Debian/_svn-buildpackage
%%ZSH_FNDIR%%/Completion/Debian/_toolchain-source
%%ZSH_FNDIR%%/Completion/Debian/_update-alternatives
%%ZSH_FNDIR%%/Completion/Debian/_update-rc.d
%%ZSH_FNDIR%%/Completion/Debian/_uscan
%%ZSH_FNDIR%%/Completion/Debian/_vim-addons
%%ZSH_FNDIR%%/Completion/Debian/_wajig
%%ZSH_FNDIR%%/Completion/Debian/_wanna-build
%%ZSH_FNDIR%%/Completion/Linux/_acpi

%%ZSH_FNDIR%%/Completion/Linux/_iptables
%%ZSH_FNDIR%%/Completion/Linux/_iwconfig
%%ZSH_FNDIR%%/Completion/Linux/_losetup
%%ZSH_FNDIR%%/Completion/Linux/_lsusb
%%ZSH_FNDIR%%/Completion/Linux/_mii-tool
%%ZSH_FNDIR%%/Completion/Linux/_modutils
%%ZSH_FNDIR%%/Completion/Linux/_mondo

%%ZSH_FNDIR%%/Completion/Unix/_canonical_paths
%%ZSH_FNDIR%%/Completion/Unix/_ccal
%%ZSH_FNDIR%%/Completion/Unix/_cdcd
%%ZSH_FNDIR%%/Completion/Unix/_cdrdao
%%ZSH_FNDIR%%/Completion/Unix/_cdrecord
%%ZSH_FNDIR%%/Completion/Unix/_chkconfig
%%ZSH_FNDIR%%/Completion/Unix/_chmod

%%ZSH_FNDIR%%/Completion/Unix/_cplay
%%ZSH_FNDIR%%/Completion/Unix/_cssh
%%ZSH_FNDIR%%/Completion/Unix/_ctags_tags
%%ZSH_FNDIR%%/Completion/Unix/_cut
%%ZSH_FNDIR%%/Completion/Unix/_cvs
%%ZSH_FNDIR%%/Completion/Unix/_darcs
%%ZSH_FNDIR%%/Completion/Unix/_date

%%ZSH_FNDIR%%/Completion/Unix/_diffstat
%%ZSH_FNDIR%%/Completion/Unix/_dir_list
%%ZSH_FNDIR%%/Completion/Unix/_directories
%%ZSH_FNDIR%%/Completion/Unix/_dmidecode
%%ZSH_FNDIR%%/Completion/Unix/_domains
%%ZSH_FNDIR%%/Completion/Unix/_du
%%ZSH_FNDIR%%/Completion/Unix/_dvi

%%ZSH_FNDIR%%/Completion/Unix/_fuser
%%ZSH_FNDIR%%/Completion/Unix/_gcc
%%ZSH_FNDIR%%/Completion/Unix/_gdb
%%ZSH_FNDIR%%/Completion/Unix/_genisoimage
%%ZSH_FNDIR%%/Completion/Unix/_getconf
%%ZSH_FNDIR%%/Completion/Unix/_getent
%%ZSH_FNDIR%%/Completion/Unix/_getmail

%%ZSH_FNDIR%%/Completion/Unix/_grep
%%ZSH_FNDIR%%/Completion/Unix/_groff
%%ZSH_FNDIR%%/Completion/Unix/_groups
%%ZSH_FNDIR%%/Completion/Unix/_growisofs
%%ZSH_FNDIR%%/Completion/Unix/_gs
%%ZSH_FNDIR%%/Completion/Unix/_guilt
%%ZSH_FNDIR%%/Completion/Unix/_gzip
%%ZSH_FNDIR%%/Completion/Unix/_hosts
%%ZSH_FNDIR%%/Completion/Unix/_iconv
%%ZSH_FNDIR%%/Completion/Unix/_id
%%ZSH_FNDIR%%/Completion/Unix/_ifconfig
%%ZSH_FNDIR%%/Completion/Unix/_imagemagick
%%ZSH_FNDIR%%/Completion/Unix/_init_d

%%ZSH_FNDIR%%/Completion/Unix/_knock
%%ZSH_FNDIR%%/Completion/Unix/_kvno
%%ZSH_FNDIR%%/Completion/Unix/_last
%%ZSH_FNDIR%%/Completion/Unix/_ld_debug
%%ZSH_FNDIR%%/Completion/Unix/_ldd
%%ZSH_FNDIR%%/Completion/Unix/_less
%%ZSH_FNDIR%%/Completion/Unix/_links
%%ZSH_FNDIR%%/Completion/Unix/_list_files

%%ZSH_FNDIR%%/Completion/Unix/_mailboxes
%%ZSH_FNDIR%%/Completion/Unix/_make
%%ZSH_FNDIR%%/Completion/Unix/_man
%%ZSH_FNDIR%%/Completion/Unix/_md5sum
%%ZSH_FNDIR%%/Completion/Unix/_mencal
%%ZSH_FNDIR%%/Completion/Unix/_mercurial
%%ZSH_FNDIR%%/Completion/Unix/_metaflac

%%ZSH_FNDIR%%/Completion/Unix/_other_accounts
%%ZSH_FNDIR%%/Completion/Unix/_pack
%%ZSH_FNDIR%%/Completion/Unix/_patch
%%ZSH_FNDIR%%/Completion/Unix/_path_commands
%%ZSH_FNDIR%%/Completion/Unix/_path_files
%%ZSH_FNDIR%%/Completion/Unix/_pax
%%ZSH_FNDIR%%/Completion/Unix/_pbm

%%ZSH_FNDIR%%/Completion/Unix/_quilt
%%ZSH_FNDIR%%/Completion/Unix/_raggle
%%ZSH_FNDIR%%/Completion/Unix/_rake
%%ZSH_FNDIR%%/Completion/Unix/_ranlib
%%ZSH_FNDIR%%/Completion/Unix/_rar
%%ZSH_FNDIR%%/Completion/Unix/_rcs
%%ZSH_FNDIR%%/Completion/Unix/_renice
%%ZSH_FNDIR%%/Completion/Unix/_rlogin
%%ZSH_FNDIR%%/Completion/Unix/_ri
%%ZSH_FNDIR%%/Completion/Unix/_rrdtool
%%ZSH_FNDIR%%/Completion/Unix/_rsync
%%ZSH_FNDIR%%/Completion/Unix/_rubber
%%ZSH_FNDIR%%/Completion/Unix/_ruby

%%ZSH_FNDIR%%/Completion/Unix/_tracepath
%%ZSH_FNDIR%%/Completion/Unix/_twisted
%%ZSH_FNDIR%%/Completion/Unix/_unace
%%ZSH_FNDIR%%/Completion/Unix/_uname
%%ZSH_FNDIR%%/Completion/Unix/_unexpand
%%ZSH_FNDIR%%/Completion/Unix/_uniq
%%ZSH_FNDIR%%/Completion/Unix/_units
%%ZSH_FNDIR%%/Completion/Unix/_urls
%%ZSH_FNDIR%%/Completion/Unix/_user_admin
%%ZSH_FNDIR%%/Completion/Unix/_user_at_host

%%ZSH_FNDIR%%/Completion/X/_xloadimage
%%ZSH_FNDIR%%/Completion/X/_xmodmap
%%ZSH_FNDIR%%/Completion/X/_xpdf
%%ZSH_FNDIR%%/Completion/X/_xrandr
%%ZSH_FNDIR%%/Completion/X/_xscreensaver
%%ZSH_FNDIR%%/Completion/X/_xset
%%ZSH_FNDIR%%/Completion/X/_xt_arguments

%%ZSH_FNDIR%%/Misc/promptnl
%%ZSH_FNDIR%%/Misc/relative
%%ZSH_FNDIR%%/Misc/run-help
%%ZSH_FNDIR%%/Misc/run-help-git
%%ZSH_FNDIR%%/Misc/run-help-svk
%%ZSH_FNDIR%%/Misc/run-help-svn
%%ZSH_FNDIR%%/Misc/sticky-note
%%ZSH_FNDIR%%/Misc/tetris
%%ZSH_FNDIR%%/Misc/xtermctl
%%ZSH_FNDIR%%/Misc/zargs
%%ZSH_FNDIR%%/Misc/zcalc
%%ZSH_FNDIR%%/Misc/zed

Return to bug 122116

Lines 1-20 Link Here

(-)zsh/files/patch-Completion-Unix-Type-_canonical_paths (-20 lines)
1	--- Completion/Unix/Type/_canonical_paths.orig 2006-05-28 13:36:06.000000000 -0500
2	+++ Completion/Unix/Type/_canonical_paths 2007-08-20 21:23:04.000000000 -0500
3	@@ -38,7 +38,7 @@
4	files=($@)
5	else
6	for __index in $@; do
7	- files+=$(readlink -qf $__index)
8	+ files+=$(/usr/bin/stat -qr $__index \| cut -d' ' -f16)
9	done
10	fi
11
12	@@ -48,7 +48,7 @@
13	expref=${~origpref}
14	[[ $origpref == (\|*/). ]] && rltrim=.
15	curpref=${${expref%$rltrim}:-./}
16	- canpref=$(readlink -qf $curpref)
17	+ canpref=$(/usr/bin/stat -qr $curpref \| cut -d' ' -f16)
18	if [[ $? -eq 0 ]]; then
19	[[ $curpref == / && $canpref == [^/] ]] && canpref+=/
20	canpref+=$rltrim

Line 0 Link Here

(-)zsh/files/patch-Completion__Unix__Type___canonical_paths (+65 lines)
		1	--- ./Completion/Unix/Type/_canonical_paths.orig 2006-05-28 20:36:06.000000000 +0200
		2	+++ ./Completion/Unix/Type/_canonical_paths 2008-03-26 19:11:15.000000000 +0100
		3	@@ -27,18 +27,37 @@
		4
		5	shift 2
		6
		7	-if (( ! $+commands[readlink] )); then
		8	+if ! zmodload -F zsh/stat b:zstat 2>/dev/null; then
		9	_wanted "$tag" expl "$desc" compadd $__gopts $@ && ret=0
		10	return ret
		11	fi
		12
		13	+typeset REPLY
		14	typeset -a matches files
		15
		16	+_canonical_paths_get_canonical_path() {
		17	+ typeset newfile
		18	+ typeset -A seen
		19	+
		20	+ REPLY=$1
		21	+ # Guard against loops.
		22	+ while [[ -z ${seen[$REPLY]} ]]; do
		23	+ seen[$REPLY]=1
		24	+ newfile=$(zstat +link $REPLY 2>/dev/null)
		25	+ if [[ -n $newfile ]]; then
		26	+ REPLY=$newfile
		27	+ else
		28	+ break
		29	+ fi
		30	+ done
		31	+}
		32	+
		33	if (( $__opts[(I)-N] )); then
		34	files=($@)
		35	else
		36	for __index in $@; do
		37	- files+=$(readlink -qf $__index)
		38	+ _canonical_paths_get_canonical_path $__index
		39	+ files+=($REPLY)
		40	done
		41	fi
		42
		43	@@ -48,13 +67,16 @@
		44	expref=${~origpref}
		45	[[ $origpref == (\|*/). ]] && rltrim=.
		46	curpref=${${expref%$rltrim}:-./}
		47	- canpref=$(readlink -qf $curpref)
		48	- if [[ $? -eq 0 ]]; then
		49	- [[ $curpref == / && $canpref == [^/] ]] && canpref+=/
		50	- canpref+=$rltrim
		51	- [[ $expref == [^/] && $canpref == / ]] && origpref+=/
		52	- matches+=(${${(M)files:#$canpref*}/$canpref/$origpref})
		53	+ if zstat $curpref >&/dev/null; then
		54	+ _canonical_paths_get_canonical_path $curpref
		55	+ canpref=$REPLY
		56	+ else
		57	+ canpref=$curpref
		58	fi
		59	+ [[ $curpref == / && $canpref == [^/] ]] && canpref+=/
		60	+ canpref+=$rltrim
		61	+ [[ $expref == [^/] && $canpref == / ]] && origpref+=/
		62	+ matches+=(${${(M)files:#$canpref*}/$canpref/$origpref})
		63	for subdir in $expref?*(@); do
		64	_canonical_paths_add_paths ${subdir/$expref/$origpref} add
65	done

Lines 1-15 Link Here

(-)zsh/files/patch-Config_installfns.sh (-15 lines)
1	--- Config/installfns.sh.orig Mon Mar 20 08:06:24 2006
2	+++ Config/installfns.sh Thu Jul 26 11:10:23 2007
3	@@ -45,10 +45,9 @@
4	esac
5	fi
6	test -d $instdir \|\| /bin/sh $sdir_top/mkinstalldirs $instdir \|\| exit 1
7	+ $INSTALL_DATA $sdir_top/$file $instdir \|\| exit 1
8	if test -x $sdir_top/$file; then
9	- $INSTALL_PROGRAM $sdir_top/$file $instdir \|\| exit 1
10	- else
11	- $INSTALL_DATA $sdir_top/$file $instdir \|\| exit 1
12	+ chmod +x $instdir/`echo $file \| sed -e 's%^.*/%%'`
13	fi
14	fi
15	done

Lines 1-23 Link Here

(-)zsh/files/patch-Src::utils.c (-23 lines)
1	--- Src/utils.c.orig Tue Apr 17 10:57:15 2007
2	+++ Src/utils.c Wed Jul 25 15:13:58 2007
3	@@ -1092,6 +1092,7 @@
4	time_t lastmailcheck;
5
6	/* the last time we checked the people in the WATCH variable */
7	+extern char _mktemp(char );
8
9	/**/
10	time_t lastwatch;
11	@@ -4569,11 +4570,11 @@
12	int count;
13	#else
14	unsigned int wval;
15	+ size_t count;
16	# if defined(HAVE_NL_LANGINFO) && defined(CODESET) && defined(HAVE_ICONV)
17	iconv_t cd;
18	char inbuf[4];
19	size_t inbytes, outbytes;
20	- size_t count;
21	# endif
22	#endif
23

Lines 1-253 Link Here

(-)zsh/files/patch-environ (-253 lines)
1	diff -u Src/exec.c Src/exec.c
2	--- Src/exec.c 2007-02-14 10:11:19.000000000 -0600
3	+++ Src/exec.c 2007-07-31 08:49:13.000000000 -0500
4	@@ -501,7 +501,16 @@
5	* that as argv[0] for this external command */
6	if (unset(RESTRICTED) && (z = zgetenv("ARGV0"))) {
7	setdata(firstnode(args), (void *) ztrdup(z));
8	+ /*
9	+ * Note we don't do anything with the parameter structure
10	+ * for ARGV0: that's OK since we're about to exec or exit
11	+ * on failure.
12	+ */
13	+#ifdef USE_SET_UNSET_ENV
14	+ unsetenv("ARGV0");
15	+#else
16	delenvvalue(z - 6);
17	+#endif
18	} else if (dash) {
19	/* Else if the pre-command `-' was given, we add `-' *
20	* to the front of argv[0] for this command. */
21	diff -u Src/params.c Src/params.c
22	--- Src/params.c 2007-04-13 06:40:27.000000000 -0500
23	+++ Src/params.c 2007-07-31 08:49:13.000000000 -0500
24	@@ -606,7 +606,7 @@
25	createparamtable(void)
26	{
27	Param ip, pm;
28	-#ifndef HAVE_PUTENV
29	+#if !defined(HAVE_PUTENV) && !defined(USE_SET_UNSET_ENV)
30	char **new_environ;
31	int envsize;
32	#endif
33	@@ -661,7 +661,7 @@
34
35	setsparam("LOGNAME", ztrdup((str = getlogin()) && *str ? str : cached_username));
36
37	-#ifndef HAVE_PUTENV
38	+#if !defined(HAVE_PUTENV) && !defined(USE_SET_UNSET_ENV)
39	/* Copy the environment variables we are inheriting to dynamic *
40	* memory, so we can do mallocs and frees on it. */
41	envsize = sizeof(char )(1 + arrlen(environ));
42	@@ -3727,6 +3727,30 @@
43	int
44	zputenv(char *str)
45	{
46	+#ifdef USE_SET_UNSET_ENV
47	+ /*
48	+ * If we are using unsetenv() to remove values from the
49	+ * environment, which is the safe thing to do, we
50	+ * need to use setenv() to put them there in the first place.
51	+ * Unfortunately this is a slightly different interface
52	+ * from what zputenv() assumes.
53	+ */
54	+ char *ptr;
55	+ int ret;
56	+
57	+ for (ptr = str; ptr && ptr != '='; ptr++)
58	+ ;
59	+ if (*ptr) {
60	+ *ptr = '\0';
61	+ ret = setenv(str, ptr+1, 1);
62	+ *ptr = '=';
63	+ } else {
64	+ /* safety first */
65	+ DPUTS(1, "bad environment string");
66	+ ret = setenv(str, ptr, 1);
67	+ }
68	+ return ret;
69	+#else
70	#ifdef HAVE_PUTENV
71	return putenv(str);
72	#else
73	@@ -3750,9 +3774,12 @@
74	}
75	return 0;
76	#endif
77	+#endif
78	}
79
80	/**/
81	+#ifndef USE_SET_UNSET_ENV
82	+/**/
83	static int
84	findenv(char name, int pos)
85	{
86	@@ -3771,6 +3798,8 @@
87
88	return 0;
89	}
90	+/**/
91	+#endif
92
93	/* Given name = "foo", it searches the environment for string
94	* "foo=bar", and returns a pointer to the beginning of "bar" */
95	@@ -3811,14 +3840,18 @@
96	void
97	addenv(Param pm, char *value)
98	{
99	- char oldenv = 0, newenv = 0, *env = 0;
100	+ char *newenv = 0;
101	+#ifndef USE_SET_UNSET_ENV
102	+ char oldenv = 0, env = 0;
103	int pos;
104
105	- /* First check if there is already an environment *
106	- * variable matching string `name'. If not, and *
107	- * we are not requested to add new, return */
108	+ /*
109	+ * First check if there is already an environment
110	+ * variable matching string `name'.
111	+ */
112	if (findenv(pm->node.nam, &pos))
113	oldenv = environ[pos];
114	+#endif
115
116	newenv = mkenvstr(pm->node.nam, value, pm->node.flags);
117	if (zputenv(newenv)) {
118	@@ -3826,6 +3859,19 @@
119	pm->env = NULL;
120	return;
121	}
122	+#ifdef USE_SET_UNSET_ENV
123	+ /*
124	+ * If we are using setenv/unsetenv to manage the environment,
125	+ * we simply store the string we created in pm->env since
126	+ * memory management of the environment is handled entirely
127	+ * by the system.
128	+ *
129	+ * TODO: is this good enough to fix problem cases from
130	+ * the other branch? If so, we don't actually need to
131	+ * store pm->env at all, just a flag that the value was set.
132	+ */
133	+ pm->env = newenv;
134	+#else
135	/*
136	* Under Cygwin we must use putenv() to maintain consistency.
137	* Unfortunately, current version (1.1.2) copies argument and may
138	@@ -3845,6 +3891,7 @@
139
140	DPUTS(1, "addenv should never reach the end");
141	pm->env = NULL;
142	+#endif
143	}
144
145
146	@@ -3875,6 +3922,7 @@
147	* string. */
148
149
150	+#ifndef USE_SET_UNSET_ENV
151	/**/
152	void
153	delenvvalue(char *x)
154	@@ -3890,6 +3938,8 @@
155	}
156	zsfree(x);
157	}
158	+#endif
159	+
160
161	/* Delete a pointer from the list of pointers to environment *
162	* variables by shifting all the other pointers up one slot. */
163	@@ -3898,7 +3948,12 @@
164	void
165	delenv(Param pm)
166	{
167	+#ifdef USE_SET_UNSET_ENV
168	+ unsetenv(pm->node.nam);
169	+ zsfree(pm->env);
170	+#else
171	delenvvalue(pm->env);
172	+#endif
173	pm->env = NULL;
174	/*
175	* Note we don't remove PM_EXPORT from the flags. This
176	diff -u Src/system.h Src/system.h
177	--- Src/system.h 2007-04-13 05:11:31.000000000 -0500
178	+++ Src/system.h 2007-07-31 08:49:13.000000000 -0500
179	@@ -693,6 +693,15 @@
180
181	extern char **environ;
182
183	+/*
184	+ * We always need setenv and unsetenv in pairs, because
185	+ * we don't know how to do memory management on the values set.
186	+ */
187	+#if defined(HAVE_SETENV) && defined(HAVE_UNSETENV)
188	+# define USE_SET_UNSET_ENV
189	+#endif
190	+
191	+
192	/* These variables are sometimes defined in, *
193	* and needed by, the termcap library. */
194	#if MUST_DEFINE_OSPEED
195	diff -u Test/B02typeset.ztst Test/B02typeset.ztst
196	--- Test/B02typeset.ztst 2006-06-26 13:17:32.000000000 -0500
197	+++ Test/B02typeset.ztst 2007-07-31 08:49:13.000000000 -0500
198	@@ -379,3 +379,31 @@
199	>integer local i
200	>local tagged scalar
201	>preserved
202	+
203	+ export ENVFOO=bar
204	+ print ENVFOO in environment
205	+ env \| grep '^ENVFOO'
206	+ print Changing ENVFOO
207	+ ENVFOO="not bar any more"
208	+ env \| grep '^ENVFOO'
209	+ unset ENVFOO
210	+ print ENVFOO no longer in environment
211	+ env \| grep '^ENVFOO'
212	+1:Adding and removing values to and from the environment
213	+>ENVFOO in environment
214	+>ENVFOO=bar
215	+>Changing ENVFOO
216	+>ENVFOO=not bar any more
217	+>ENVFOO no longer in environment
218	+
219	+ (export FOOENV=BAR
220	+ env \| grep '^FOOENV'
221	+ print Exec
222	+ exec $ZTST_testdir/../Src/zsh -c '
223	+ print Unset
224	+ unset FOOENV
225	+ env \| grep "^FOOENV"')
226	+1:Can unset environment variables after exec
227	+>FOOENV=BAR
228	+>Exec
229	+>Unset
230	diff -u configure configure
231	--- configure 2007-01-18 10:33:17.000000000 -0600
232	+++ configure 2007-07-31 08:49:06.000000000 -0500
233	@@ -10263,7 +10263,7 @@
234	setlocale \
235	uname \
236	signgam \
237	- putenv getenv \
238	+ putenv getenv setenv unsetenv xw \
239	brk sbrk \
240	pathconf sysconf \
241	tgetent tigetflag tigetnum tigetstr setupterm \
242	diff -u configure.ac configure.ac
243	--- configure.ac 2007-01-05 07:58:04.000000000 -0600
244	+++ configure.ac 2007-07-31 08:49:06.000000000 -0500
245	@@ -1126,7 +1126,7 @@
246	setlocale \
247	uname \
248	signgam \
249	- putenv getenv \
250	+ putenv getenv setenv unsetenv xw\
251	brk sbrk \
252	pathconf sysconf \
253	tgetent tigetflag tigetnum tigetstr setupterm \

Lines 14-19 Link Here

(-)zsh/pkg-plist (+33 lines)
14	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/complete.so	14	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/complete.so
15	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/complist.so	15	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/complist.so
16	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/computil.so	16	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/computil.so
		17	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/curses.so
17	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/datetime.so	18	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/datetime.so
18	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/deltochar.so	19	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/deltochar.so
19	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/example.so	20	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/example.so
Lines 26-31 Link Here
26	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/newuser.so	27	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/newuser.so
27	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/parameter.so	28	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/parameter.so
28	%%PCRE%%%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/pcre.so	29	%%PCRE%%%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/pcre.so
		30	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/regex.so
29	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/rlimits.so	31	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/rlimits.so
30	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/sched.so	32	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/sched.so
31	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/stat.so	33	%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/stat.so
Lines 51-56 Link Here
51	%%ZSH_FNDIR%%/Calendar/calendar_add	53	%%ZSH_FNDIR%%/Calendar/calendar_add
52	%%ZSH_FNDIR%%/Calendar/calendar_edit	54	%%ZSH_FNDIR%%/Calendar/calendar_edit
53	%%ZSH_FNDIR%%/Calendar/calendar_lockfiles	55	%%ZSH_FNDIR%%/Calendar/calendar_lockfiles
		56	%%ZSH_FNDIR%%/Calendar/calendar_parse
54	%%ZSH_FNDIR%%/Calendar/calendar_read	57	%%ZSH_FNDIR%%/Calendar/calendar_read
55	%%ZSH_FNDIR%%/Calendar/calendar_scandate	58	%%ZSH_FNDIR%%/Calendar/calendar_scandate
56	%%ZSH_FNDIR%%/Calendar/calendar_show	59	%%ZSH_FNDIR%%/Calendar/calendar_show
Lines 88-93 Link Here
88	%%ZSH_FNDIR%%/Completion/Base/_complete	91	%%ZSH_FNDIR%%/Completion/Base/_complete
89	%%ZSH_FNDIR%%/Completion/Base/_complete_debug	92	%%ZSH_FNDIR%%/Completion/Base/_complete_debug
90	%%ZSH_FNDIR%%/Completion/Base/_complete_help	93	%%ZSH_FNDIR%%/Completion/Base/_complete_help
		94	%%ZSH_FNDIR%%/Completion/Base/_complete_help_generic
91	%%ZSH_FNDIR%%/Completion/Base/_complete_tag	95	%%ZSH_FNDIR%%/Completion/Base/_complete_tag
92	%%ZSH_FNDIR%%/Completion/Base/_correct	96	%%ZSH_FNDIR%%/Completion/Base/_correct
93	%%ZSH_FNDIR%%/Completion/Base/_correct_filename	97	%%ZSH_FNDIR%%/Completion/Base/_correct_filename
Lines 170-193 Link Here
170	%%ZSH_FNDIR%%/Completion/Debian/_debfoster	174	%%ZSH_FNDIR%%/Completion/Debian/_debfoster
171	%%ZSH_FNDIR%%/Completion/Debian/_debsign	175	%%ZSH_FNDIR%%/Completion/Debian/_debsign
172	%%ZSH_FNDIR%%/Completion/Debian/_dlocate	176	%%ZSH_FNDIR%%/Completion/Debian/_dlocate
		177	%%ZSH_FNDIR%%/Completion/Debian/_dpatch-edit-patch
173	%%ZSH_FNDIR%%/Completion/Debian/_dpkg	178	%%ZSH_FNDIR%%/Completion/Debian/_dpkg
174	%%ZSH_FNDIR%%/Completion/Debian/_dpkg-cross	179	%%ZSH_FNDIR%%/Completion/Debian/_dpkg-cross
		180	%%ZSH_FNDIR%%/Completion/Debian/_dpkg_repack
175	%%ZSH_FNDIR%%/Completion/Debian/_dpkg_source	181	%%ZSH_FNDIR%%/Completion/Debian/_dpkg_source
176	%%ZSH_FNDIR%%/Completion/Debian/_dput	182	%%ZSH_FNDIR%%/Completion/Debian/_dput
177	%%ZSH_FNDIR%%/Completion/Debian/_dupload	183	%%ZSH_FNDIR%%/Completion/Debian/_dupload
178	%%ZSH_FNDIR%%/Completion/Debian/_invoke-rc.d	184	%%ZSH_FNDIR%%/Completion/Debian/_invoke-rc.d
		185	%%ZSH_FNDIR%%/Completion/Debian/_lighttpd
179	%%ZSH_FNDIR%%/Completion/Debian/_linda	186	%%ZSH_FNDIR%%/Completion/Debian/_linda
180	%%ZSH_FNDIR%%/Completion/Debian/_lintian	187	%%ZSH_FNDIR%%/Completion/Debian/_lintian
181	%%ZSH_FNDIR%%/Completion/Debian/_madison	188	%%ZSH_FNDIR%%/Completion/Debian/_madison
182	%%ZSH_FNDIR%%/Completion/Debian/_make-kpkg	189	%%ZSH_FNDIR%%/Completion/Debian/_make-kpkg
		190	%%ZSH_FNDIR%%/Completion/Debian/_members
183	%%ZSH_FNDIR%%/Completion/Debian/_mergechanges	191	%%ZSH_FNDIR%%/Completion/Debian/_mergechanges
184	%%ZSH_FNDIR%%/Completion/Debian/_module-assistant	192	%%ZSH_FNDIR%%/Completion/Debian/_module-assistant
185	%%ZSH_FNDIR%%/Completion/Debian/_piuparts	193	%%ZSH_FNDIR%%/Completion/Debian/_piuparts
		194	%%ZSH_FNDIR%%/Completion/Debian/_reprepro
186	%%ZSH_FNDIR%%/Completion/Debian/_schroot	195	%%ZSH_FNDIR%%/Completion/Debian/_schroot
		196	%%ZSH_FNDIR%%/Completion/Debian/_svn-buildpackage
187	%%ZSH_FNDIR%%/Completion/Debian/_toolchain-source	197	%%ZSH_FNDIR%%/Completion/Debian/_toolchain-source
188	%%ZSH_FNDIR%%/Completion/Debian/_update-alternatives	198	%%ZSH_FNDIR%%/Completion/Debian/_update-alternatives
189	%%ZSH_FNDIR%%/Completion/Debian/_update-rc.d	199	%%ZSH_FNDIR%%/Completion/Debian/_update-rc.d
190	%%ZSH_FNDIR%%/Completion/Debian/_uscan	200	%%ZSH_FNDIR%%/Completion/Debian/_uscan
		201	%%ZSH_FNDIR%%/Completion/Debian/_vim-addons
191	%%ZSH_FNDIR%%/Completion/Debian/_wajig	202	%%ZSH_FNDIR%%/Completion/Debian/_wajig
192	%%ZSH_FNDIR%%/Completion/Debian/_wanna-build	203	%%ZSH_FNDIR%%/Completion/Debian/_wanna-build
193	%%ZSH_FNDIR%%/Completion/Linux/_acpi	204	%%ZSH_FNDIR%%/Completion/Linux/_acpi
Lines 200-205 Link Here
200	%%ZSH_FNDIR%%/Completion/Linux/_iptables	211	%%ZSH_FNDIR%%/Completion/Linux/_iptables
201	%%ZSH_FNDIR%%/Completion/Linux/_iwconfig	212	%%ZSH_FNDIR%%/Completion/Linux/_iwconfig
202	%%ZSH_FNDIR%%/Completion/Linux/_losetup	213	%%ZSH_FNDIR%%/Completion/Linux/_losetup
		214	%%ZSH_FNDIR%%/Completion/Linux/_lsusb
203	%%ZSH_FNDIR%%/Completion/Linux/_mii-tool	215	%%ZSH_FNDIR%%/Completion/Linux/_mii-tool
204	%%ZSH_FNDIR%%/Completion/Linux/_modutils	216	%%ZSH_FNDIR%%/Completion/Linux/_modutils
205	%%ZSH_FNDIR%%/Completion/Linux/_mondo	217	%%ZSH_FNDIR%%/Completion/Linux/_mondo
Lines 239-244 Link Here
239	%%ZSH_FNDIR%%/Completion/Unix/_canonical_paths	251	%%ZSH_FNDIR%%/Completion/Unix/_canonical_paths
240	%%ZSH_FNDIR%%/Completion/Unix/_ccal	252	%%ZSH_FNDIR%%/Completion/Unix/_ccal
241	%%ZSH_FNDIR%%/Completion/Unix/_cdcd	253	%%ZSH_FNDIR%%/Completion/Unix/_cdcd
		254	%%ZSH_FNDIR%%/Completion/Unix/_cdrdao
242	%%ZSH_FNDIR%%/Completion/Unix/_cdrecord	255	%%ZSH_FNDIR%%/Completion/Unix/_cdrecord
243	%%ZSH_FNDIR%%/Completion/Unix/_chkconfig	256	%%ZSH_FNDIR%%/Completion/Unix/_chkconfig
244	%%ZSH_FNDIR%%/Completion/Unix/_chmod	257	%%ZSH_FNDIR%%/Completion/Unix/_chmod
Lines 252-257 Link Here
252	%%ZSH_FNDIR%%/Completion/Unix/_cplay	265	%%ZSH_FNDIR%%/Completion/Unix/_cplay
253	%%ZSH_FNDIR%%/Completion/Unix/_cssh	266	%%ZSH_FNDIR%%/Completion/Unix/_cssh
254	%%ZSH_FNDIR%%/Completion/Unix/_ctags_tags	267	%%ZSH_FNDIR%%/Completion/Unix/_ctags_tags
		268	%%ZSH_FNDIR%%/Completion/Unix/_cut
255	%%ZSH_FNDIR%%/Completion/Unix/_cvs	269	%%ZSH_FNDIR%%/Completion/Unix/_cvs
256	%%ZSH_FNDIR%%/Completion/Unix/_darcs	270	%%ZSH_FNDIR%%/Completion/Unix/_darcs
257	%%ZSH_FNDIR%%/Completion/Unix/_date	271	%%ZSH_FNDIR%%/Completion/Unix/_date
Lines 264-269 Link Here
264	%%ZSH_FNDIR%%/Completion/Unix/_diffstat	278	%%ZSH_FNDIR%%/Completion/Unix/_diffstat
265	%%ZSH_FNDIR%%/Completion/Unix/_dir_list	279	%%ZSH_FNDIR%%/Completion/Unix/_dir_list
266	%%ZSH_FNDIR%%/Completion/Unix/_directories	280	%%ZSH_FNDIR%%/Completion/Unix/_directories
		281	%%ZSH_FNDIR%%/Completion/Unix/_dmidecode
267	%%ZSH_FNDIR%%/Completion/Unix/_domains	282	%%ZSH_FNDIR%%/Completion/Unix/_domains
268	%%ZSH_FNDIR%%/Completion/Unix/_du	283	%%ZSH_FNDIR%%/Completion/Unix/_du
269	%%ZSH_FNDIR%%/Completion/Unix/_dvi	284	%%ZSH_FNDIR%%/Completion/Unix/_dvi
Lines 287-292 Link Here
287	%%ZSH_FNDIR%%/Completion/Unix/_fuser	302	%%ZSH_FNDIR%%/Completion/Unix/_fuser
288	%%ZSH_FNDIR%%/Completion/Unix/_gcc	303	%%ZSH_FNDIR%%/Completion/Unix/_gcc
289	%%ZSH_FNDIR%%/Completion/Unix/_gdb	304	%%ZSH_FNDIR%%/Completion/Unix/_gdb
		305	%%ZSH_FNDIR%%/Completion/Unix/_genisoimage
290	%%ZSH_FNDIR%%/Completion/Unix/_getconf	306	%%ZSH_FNDIR%%/Completion/Unix/_getconf
291	%%ZSH_FNDIR%%/Completion/Unix/_getent	307	%%ZSH_FNDIR%%/Completion/Unix/_getent
292	%%ZSH_FNDIR%%/Completion/Unix/_getmail	308	%%ZSH_FNDIR%%/Completion/Unix/_getmail
Lines 301-310 Link Here
301	%%ZSH_FNDIR%%/Completion/Unix/_grep	317	%%ZSH_FNDIR%%/Completion/Unix/_grep
302	%%ZSH_FNDIR%%/Completion/Unix/_groff	318	%%ZSH_FNDIR%%/Completion/Unix/_groff
303	%%ZSH_FNDIR%%/Completion/Unix/_groups	319	%%ZSH_FNDIR%%/Completion/Unix/_groups
		320	%%ZSH_FNDIR%%/Completion/Unix/_growisofs
304	%%ZSH_FNDIR%%/Completion/Unix/_gs	321	%%ZSH_FNDIR%%/Completion/Unix/_gs
		322	%%ZSH_FNDIR%%/Completion/Unix/_guilt
305	%%ZSH_FNDIR%%/Completion/Unix/_gzip	323	%%ZSH_FNDIR%%/Completion/Unix/_gzip
306	%%ZSH_FNDIR%%/Completion/Unix/_hosts	324	%%ZSH_FNDIR%%/Completion/Unix/_hosts
307	%%ZSH_FNDIR%%/Completion/Unix/_iconv	325	%%ZSH_FNDIR%%/Completion/Unix/_iconv
		326	%%ZSH_FNDIR%%/Completion/Unix/_id
308	%%ZSH_FNDIR%%/Completion/Unix/_ifconfig	327	%%ZSH_FNDIR%%/Completion/Unix/_ifconfig
309	%%ZSH_FNDIR%%/Completion/Unix/_imagemagick	328	%%ZSH_FNDIR%%/Completion/Unix/_imagemagick
310	%%ZSH_FNDIR%%/Completion/Unix/_init_d	329	%%ZSH_FNDIR%%/Completion/Unix/_init_d
Lines 318-323 Link Here
318	%%ZSH_FNDIR%%/Completion/Unix/_knock	337	%%ZSH_FNDIR%%/Completion/Unix/_knock
319	%%ZSH_FNDIR%%/Completion/Unix/_kvno	338	%%ZSH_FNDIR%%/Completion/Unix/_kvno
320	%%ZSH_FNDIR%%/Completion/Unix/_last	339	%%ZSH_FNDIR%%/Completion/Unix/_last
		340	%%ZSH_FNDIR%%/Completion/Unix/_ld_debug
		341	%%ZSH_FNDIR%%/Completion/Unix/_ldd
321	%%ZSH_FNDIR%%/Completion/Unix/_less	342	%%ZSH_FNDIR%%/Completion/Unix/_less
322	%%ZSH_FNDIR%%/Completion/Unix/_links	343	%%ZSH_FNDIR%%/Completion/Unix/_links
323	%%ZSH_FNDIR%%/Completion/Unix/_list_files	344	%%ZSH_FNDIR%%/Completion/Unix/_list_files
Lines 334-339 Link Here
334	%%ZSH_FNDIR%%/Completion/Unix/_mailboxes	355	%%ZSH_FNDIR%%/Completion/Unix/_mailboxes
335	%%ZSH_FNDIR%%/Completion/Unix/_make	356	%%ZSH_FNDIR%%/Completion/Unix/_make
336	%%ZSH_FNDIR%%/Completion/Unix/_man	357	%%ZSH_FNDIR%%/Completion/Unix/_man
		358	%%ZSH_FNDIR%%/Completion/Unix/_md5sum
337	%%ZSH_FNDIR%%/Completion/Unix/_mencal	359	%%ZSH_FNDIR%%/Completion/Unix/_mencal
338	%%ZSH_FNDIR%%/Completion/Unix/_mercurial	360	%%ZSH_FNDIR%%/Completion/Unix/_mercurial
339	%%ZSH_FNDIR%%/Completion/Unix/_metaflac	361	%%ZSH_FNDIR%%/Completion/Unix/_metaflac
Lines 361-366 Link Here
361	%%ZSH_FNDIR%%/Completion/Unix/_other_accounts	383	%%ZSH_FNDIR%%/Completion/Unix/_other_accounts
362	%%ZSH_FNDIR%%/Completion/Unix/_pack	384	%%ZSH_FNDIR%%/Completion/Unix/_pack
363	%%ZSH_FNDIR%%/Completion/Unix/_patch	385	%%ZSH_FNDIR%%/Completion/Unix/_patch
		386	%%ZSH_FNDIR%%/Completion/Unix/_path_commands
364	%%ZSH_FNDIR%%/Completion/Unix/_path_files	387	%%ZSH_FNDIR%%/Completion/Unix/_path_files
365	%%ZSH_FNDIR%%/Completion/Unix/_pax	388	%%ZSH_FNDIR%%/Completion/Unix/_pax
366	%%ZSH_FNDIR%%/Completion/Unix/_pbm	389	%%ZSH_FNDIR%%/Completion/Unix/_pbm
Lines 390-400 Link Here
390	%%ZSH_FNDIR%%/Completion/Unix/_quilt	413	%%ZSH_FNDIR%%/Completion/Unix/_quilt
391	%%ZSH_FNDIR%%/Completion/Unix/_raggle	414	%%ZSH_FNDIR%%/Completion/Unix/_raggle
392	%%ZSH_FNDIR%%/Completion/Unix/_rake	415	%%ZSH_FNDIR%%/Completion/Unix/_rake
		416	%%ZSH_FNDIR%%/Completion/Unix/_ranlib
393	%%ZSH_FNDIR%%/Completion/Unix/_rar	417	%%ZSH_FNDIR%%/Completion/Unix/_rar
394	%%ZSH_FNDIR%%/Completion/Unix/_rcs	418	%%ZSH_FNDIR%%/Completion/Unix/_rcs
395	%%ZSH_FNDIR%%/Completion/Unix/_renice	419	%%ZSH_FNDIR%%/Completion/Unix/_renice
396	%%ZSH_FNDIR%%/Completion/Unix/_rlogin	420	%%ZSH_FNDIR%%/Completion/Unix/_rlogin
397	%%ZSH_FNDIR%%/Completion/Unix/_ri	421	%%ZSH_FNDIR%%/Completion/Unix/_ri
		422	%%ZSH_FNDIR%%/Completion/Unix/_rrdtool
398	%%ZSH_FNDIR%%/Completion/Unix/_rsync	423	%%ZSH_FNDIR%%/Completion/Unix/_rsync
399	%%ZSH_FNDIR%%/Completion/Unix/_rubber	424	%%ZSH_FNDIR%%/Completion/Unix/_rubber
400	%%ZSH_FNDIR%%/Completion/Unix/_ruby	425	%%ZSH_FNDIR%%/Completion/Unix/_ruby
Lines 441-448 Link Here
441	%%ZSH_FNDIR%%/Completion/Unix/_tracepath	466	%%ZSH_FNDIR%%/Completion/Unix/_tracepath
442	%%ZSH_FNDIR%%/Completion/Unix/_twisted	467	%%ZSH_FNDIR%%/Completion/Unix/_twisted
443	%%ZSH_FNDIR%%/Completion/Unix/_unace	468	%%ZSH_FNDIR%%/Completion/Unix/_unace
		469	%%ZSH_FNDIR%%/Completion/Unix/_uname
444	%%ZSH_FNDIR%%/Completion/Unix/_unexpand	470	%%ZSH_FNDIR%%/Completion/Unix/_unexpand
445	%%ZSH_FNDIR%%/Completion/Unix/_uniq	471	%%ZSH_FNDIR%%/Completion/Unix/_uniq
		472	%%ZSH_FNDIR%%/Completion/Unix/_units
446	%%ZSH_FNDIR%%/Completion/Unix/_urls	473	%%ZSH_FNDIR%%/Completion/Unix/_urls
447	%%ZSH_FNDIR%%/Completion/Unix/_user_admin	474	%%ZSH_FNDIR%%/Completion/Unix/_user_admin
448	%%ZSH_FNDIR%%/Completion/Unix/_user_at_host	475	%%ZSH_FNDIR%%/Completion/Unix/_user_at_host
Lines 506-511 Link Here
506	%%ZSH_FNDIR%%/Completion/X/_xloadimage	533	%%ZSH_FNDIR%%/Completion/X/_xloadimage
507	%%ZSH_FNDIR%%/Completion/X/_xmodmap	534	%%ZSH_FNDIR%%/Completion/X/_xmodmap
508	%%ZSH_FNDIR%%/Completion/X/_xpdf	535	%%ZSH_FNDIR%%/Completion/X/_xpdf
		536	%%ZSH_FNDIR%%/Completion/X/_xrandr
509	%%ZSH_FNDIR%%/Completion/X/_xscreensaver	537	%%ZSH_FNDIR%%/Completion/X/_xscreensaver
510	%%ZSH_FNDIR%%/Completion/X/_xset	538	%%ZSH_FNDIR%%/Completion/X/_xset
511	%%ZSH_FNDIR%%/Completion/X/_xt_arguments	539	%%ZSH_FNDIR%%/Completion/X/_xt_arguments
Lines 609-615 Link Here
609	%%ZSH_FNDIR%%/Misc/promptnl	637	%%ZSH_FNDIR%%/Misc/promptnl
610	%%ZSH_FNDIR%%/Misc/relative	638	%%ZSH_FNDIR%%/Misc/relative
611	%%ZSH_FNDIR%%/Misc/run-help	639	%%ZSH_FNDIR%%/Misc/run-help
		640	%%ZSH_FNDIR%%/Misc/run-help-git
		641	%%ZSH_FNDIR%%/Misc/run-help-svk
		642	%%ZSH_FNDIR%%/Misc/run-help-svn
		643	%%ZSH_FNDIR%%/Misc/sticky-note
612	%%ZSH_FNDIR%%/Misc/tetris	644	%%ZSH_FNDIR%%/Misc/tetris
		645	%%ZSH_FNDIR%%/Misc/xtermctl
613	%%ZSH_FNDIR%%/Misc/zargs	646	%%ZSH_FNDIR%%/Misc/zargs
614	%%ZSH_FNDIR%%/Misc/zcalc	647	%%ZSH_FNDIR%%/Misc/zcalc
615	%%ZSH_FNDIR%%/Misc/zed	648	%%ZSH_FNDIR%%/Misc/zed