From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 27 Apr 1997 22:41:00 +0000 (+0000)
Subject: (ange-ftp-file-entry-p): If ange-ftp-get-files returns
X-Git-Tag: emacs-20.1~2361
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=028873a04818daade50153a28d7b89cc2ab197be;p=emacs.git

(ange-ftp-file-entry-p): If ange-ftp-get-files returns
nil, don't try ange-ftp-hash-entry-exists-p, just give up.
---

diff --git a/lisp/ange-ftp.el b/lisp/ange-ftp.el
index 35b63c1ec2c..3586dc4a35c 100644
--- a/lisp/ange-ftp.el
+++ b/lisp/ange-ftp.el
@@ -2669,12 +2669,12 @@ NO-ERROR, if a listing for DIRECTORY cannot be obtained."
 	       ;; will simply send back the ls
 	       ;; error message.
 	       (ange-ftp-get-hash-entry "." ent))
-	  ;; Child lookup failed. Try the parent. If this bombs,
-	  ;; we are at wits end -- signal an error.
-	  ;; Problem: If this signals an error, the error message
-	  ;; may  not have a lot to do with what went wrong.
-	  (ange-ftp-hash-entry-exists-p file
-					(ange-ftp-get-files dir))))))
+	  ;; Child lookup failed, so try the parent.
+	  (let ((table (ange-ftp-get-files dir)))
+	    ;; If the dir doesn't exist, don't use it as a hash table.
+	    (and table
+		 (ange-ftp-hash-entry-exists-p file
+					       table)))))))
 
 (defun ange-ftp-get-file-entry (name)
   "Given NAME, return the given file entry.