From: John Wiegley <johnw@newartisans.com>
Date: Wed, 17 Oct 2001 02:00:20 +0000 (+0000)
Subject: (eshell/cat): Do a quick test if something is a regular file, before
X-Git-Tag: ttn-vms-21-2-B4~19401
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9f89e098634f1eeb0bf6e14c2b0b5f9ab575031d;p=emacs.git

(eshell/cat): Do a quick test if something is a regular file, before
checking if it is a directory or symlink. This avoids a call to
eshell-file-attributes, which can be expensive in some situations.
---

diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index c568a4286f4..2fb08d290c7 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -572,9 +572,12 @@ symlink, then revert to the system's definition of cat."
   (if (or eshell-in-pipeline-p
 	  (catch 'special
 	    (eshell-for arg args
-	      (unless (let ((attrs (eshell-file-attributes arg)))
-			(and attrs (memq (aref (nth 8 attrs) 0)
-					 '(?d ?l ?-))))
+	      (unless (or (and (stringp arg)
+			       (> (length arg) 0)
+			       (eq (aref arg 0) ?-))
+			  (let ((attrs (eshell-file-attributes arg)))
+			    (and attrs (memq (aref (nth 8 attrs) 0)
+					     '(?d ?l ?-)))))
 		(throw 'special t)))))
       (let ((ext-cat (eshell-search-path "cat")))
 	(if ext-cat