PATCH: 3.1.6-test-1: small zftp changes

[Peter Stephenson <pws@xxxxxxxxxxxxxxxxx>]

Since I'm not going to be doing anything major soon, here are two small
changes to the zftp functions to get them out of the way.

--- Functions/Zftp/zfgoto.bak	Fri Jun 11 17:55:19 1999
+++ Functions/Zftp/zfgoto	Thu Jul 15 11:41:18 1999
@@ -67,7 +67,10 @@
 host=${line%%:*}
 dir=${line#*:}
 
-if [[ $user = ftp || $user = anonymous ]]; then
+if [[ $ZFTP_USER = $user && $ZFTP_HOST = $host ]]; then
+  # We're already there, just change directory
+  zfcd ${dir:-~}
+elif [[ $user = ftp || $user = anonymous ]]; then
   # Anonymous ftp, so we don't need password etc.
   zfanon $host && [[ -n $dir ]] && zfcd $dir
 elif [[ $zflastsession = ${host}:* && $user = $zflastuser ]]; then
--- Functions/Zftp/zfinit.bak	Fri Jun 11 18:36:36 1999
+++ Functions/Zftp/zfinit	Thu Jul 15 11:41:19 1999
@@ -1,6 +1,6 @@
 emulate -L zsh
 
-[[ $1 = -n ]] || zmodload -ia zftp
+[[ $1 = -n ]] || zmodload -e zftp || zmodload -ia zftp
 
 alias zfcd='noglob zfcd'
 alias zfget='noglob zfget'

-- 
Peter Stephenson <pws@xxxxxxxxxxxxxxxxx>       Tel: +39 050 844536
WWW:  http://www.ifh.de/~pws/
Dipartimento di Fisica, Via Buonarroti 2, 56127 Pisa, Italy