changeset 109483:00c18905e17a

* net/tramp.el (tramp-get-ls-command) (tramp-get-ls-command-with-dired): Run tests on "/dev/null" instead of "/".
author Michael Albinus <albinus@detlef>
date Wed, 21 Jul 2010 06:40:47 +0200
parents c9df47f7bbf3
children 9d999899723d
files lisp/ChangeLog lisp/net/tramp.el
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Tue Jul 20 21:56:55 2010 -0400
+++ b/lisp/ChangeLog	Wed Jul 21 06:40:47 2010 +0200
@@ -1,3 +1,9 @@
+2010-07-21  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (tramp-get-ls-command)
+	(tramp-get-ls-command-with-dired): Run tests on "/dev/null"
+	instead of "/".
+
 2010-07-20  Michael R. Mauger  <mmaug@yahoo.com>
 
 	* progmodes/sql.el: Version 2.3.
--- a/lisp/net/tramp.el	Tue Jul 20 21:56:55 2010 -0400
+++ b/lisp/net/tramp.el	Wed Jul 21 06:40:47 2010 +0200
@@ -8344,7 +8344,8 @@
 	     (when (zerop (tramp-send-command-and-check
 			   vec (format "%s -lnd /" result)))
 	       (when (zerop (tramp-send-command-and-check
-			     vec (format "%s --color=never -al /" result)))
+			     vec (format
+				  "%s --color=never -al /dev/null" result)))
 		 (setq result (concat result " --color=never")))
 	       (throw 'ls-found result))
 	     (setq dl (cdr dl))))))
@@ -8358,7 +8359,8 @@
       ;; they fail when "-al" is after the "--dired" argument (for
       ;; example on FreeBSD).
       (zerop (tramp-send-command-and-check
-	      vec (format "%s --dired -al /" (tramp-get-ls-command vec)))))))
+	      vec (format "%s --dired -al /dev/null"
+			  (tramp-get-ls-command vec)))))))
 
 (defun tramp-get-test-command (vec)
   (with-connection-property vec "test"