From 35656b6fa473a4c422875a61d24ebb736c1be4e9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20H=C3=B6tzel?= Date: Fri, 7 Aug 2015 20:24:45 +0200 Subject: [PATCH] Improve error checking in tramp-adb.el * lisp/net/tramp-adb.el (tramp-adb-ls-output-name-less-p): Improve error checking. "ls -l" on Android in Enforcing mode can print "lstat './FILENAME failed: Permission denied". --- lisp/net/tramp-adb.el | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el index 63059218579..b81f5974cc7 100644 --- a/lisp/net/tramp-adb.el +++ b/lisp/net/tramp-adb.el @@ -497,12 +497,11 @@ Emacs dired can't find files." (defun tramp-adb-ls-output-name-less-p (a b) "Sort \"ls\" output by name, ascending." - (let (posa posb) - (string-match directory-listing-before-filename-regexp a) - (setq posa (match-end 0)) - (string-match directory-listing-before-filename-regexp b) - (setq posb (match-end 0)) - (string-lessp (substring a posa) (substring b posb)))) + (if (string-match directory-listing-before-filename-regexp a) + (let ((posa (match-end 0))) + (if (string-match directory-listing-before-filename-regexp b) + (let ((posb (match-end 0))) + (string-lessp (substring a posa) (substring b posb))))))) (defun tramp-adb-handle-make-directory (dir &optional parents) "Like `make-directory' for Tramp files." -- 2.39.2