From d6d4a3abfc84f0940e663cd69537789a039a7056 Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Mon, 19 Jul 1999 14:26:14 +0000
Subject: zsh-3.1.6-test-2

---
 Functions/Zftp/zfgoto | 5 ++++-
 Functions/Zftp/zfinit | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'Functions/Zftp')

diff --git a/Functions/Zftp/zfgoto b/Functions/Zftp/zfgoto
index 8d6f00a3a..bd1cdbfe5 100644
--- a/Functions/Zftp/zfgoto
+++ b/Functions/Zftp/zfgoto
@@ -67,7 +67,10 @@ line=${line#*@}
 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
diff --git a/Functions/Zftp/zfinit b/Functions/Zftp/zfinit
index fbe6c5979..2a5fd9b47 100644
--- a/Functions/Zftp/zfinit
+++ b/Functions/Zftp/zfinit
@@ -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'
-- 
cgit 1.4.1