From 8ae9b0d01fe9175613571fc4e345b078f6bb3882 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 16 Oct 2001 00:55:25 +0000 Subject: [PATCH] (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. --- lisp/eshell/em-unix.el | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 -- 2.39.2