Merge from emacs-24; up to 2014-03-23T23:14:52Z!yamaoka@jpl.org

2 files changed, 110 insertions, 86 deletions

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 106c14805d5..22ea7714743 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2110,6 +2110,12 @@ the uid and gid from FILENAME."
            ;; We can do it directly.
            ((let (file-name-handler-alist)
               (and (file-readable-p localname1)
+                   ;; No sticky bit when renaming.
+                   (or (eq op 'copy)
+                       (zerop
+                        (logand
+                         (file-modes (file-name-directory localname1))
+                         (tramp-compat-octal-to-decimal "1000"))))
                    (file-writable-p (file-name-directory localname2))
                    (or (file-directory-p localname2)
                        (file-writable-p localname2))))
@@ -3311,55 +3317,57 @@ the result will be a local, non-Tramp, filename."
       (with-tramp-progress-reporter
           v 3 (format "Checking `vc-registered' for %s" file)
 
-        (unless remote-file-name-inhibit-cache
-          ;; There could be new files, created by the vc backend.  We
-          ;; cannot reuse the old cache entries, therefore.
-          (let (tramp-vc-registered-file-names
-                (remote-file-name-inhibit-cache (current-time))
-                (file-name-handler-alist
-                 `((,tramp-file-name-regexp . tramp-vc-file-name-handler))))
-
-            ;; Here we collect only file names, which need an operation.
-            (ignore-errors (tramp-run-real-handler 'vc-registered (list file)))
-            (tramp-message v 10 "\n%s" tramp-vc-registered-file-names)
-
-            ;; Send just one command, in order to fill the cache.
-            (when tramp-vc-registered-file-names
-              (tramp-maybe-send-script
-               v
-               (format tramp-vc-registered-read-file-names
-                       (tramp-get-file-exists-command v)
-                       (format "%s -r" (tramp-get-test-command v)))
-               "tramp_vc_registered_read_file_names")
-
-              (dolist
-                  (elt
-                   (ignore-errors
-                     ;; We cannot use `tramp-send-command-and-read',
-                     ;; because this does not cooperate well with
-                     ;; heredoc documents.
-                     (tramp-send-command
-                      v
-                      (format
-                       "tramp_vc_registered_read_file_names <<'%s'\n%s\n%s\n"
-                       tramp-end-of-heredoc
-                       (mapconcat 'tramp-shell-quote-argument
-                                  tramp-vc-registered-file-names
-                                  "\n")
-                       tramp-end-of-heredoc))
-                     (with-current-buffer (tramp-get-connection-buffer v)
-                       ;; Read the expression.
-                       (goto-char (point-min))
-                       (read (current-buffer)))))
-
-                (tramp-set-file-property
-                 v (car elt) (cadr elt) (cadr (cdr elt)))))))
+        ;; There could be new files, created by the vc backend.  We
+        ;; cannot reuse the old cache entries, therefore.  In
+        ;; `tramp-get-file-property', `remote-file-name-inhibit-cache'
+        ;; could also be a timestamp as `current-time' returns.  This
+        ;; means invalidate all cache entries with an older timestamp.
+        (let (tramp-vc-registered-file-names
+              (remote-file-name-inhibit-cache (current-time))
+              (file-name-handler-alist
+               `((,tramp-file-name-regexp . tramp-vc-file-name-handler))))
+
+          ;; Here we collect only file names, which need an operation.
+          (ignore-errors (tramp-run-real-handler 'vc-registered (list file)))
+          (tramp-message v 10 "\n%s" tramp-vc-registered-file-names)
+
+          ;; Send just one command, in order to fill the cache.
+          (when tramp-vc-registered-file-names
+            (tramp-maybe-send-script
+             v
+             (format tramp-vc-registered-read-file-names
+                     (tramp-get-file-exists-command v)
+                     (format "%s -r" (tramp-get-test-command v)))
+             "tramp_vc_registered_read_file_names")
+
+            (dolist
+                (elt
+                 (ignore-errors
+                   ;; We cannot use `tramp-send-command-and-read',
+                   ;; because this does not cooperate well with
+                   ;; heredoc documents.
+                   (tramp-send-command
+                    v
+                    (format
+                     "tramp_vc_registered_read_file_names <<'%s'\n%s\n%s\n"
+                     tramp-end-of-heredoc
+                     (mapconcat 'tramp-shell-quote-argument
+                                tramp-vc-registered-file-names
+                                "\n")
+                     tramp-end-of-heredoc))
+                   (with-current-buffer (tramp-get-connection-buffer v)
+                     ;; Read the expression.
+                     (goto-char (point-min))
+                     (read (current-buffer)))))
+
+              (tramp-set-file-property
+               v (car elt) (cadr elt) (cadr (cdr elt))))))
 
         ;; Second run.  Now all `file-exists-p' or `file-readable-p'
         ;; calls shall be answered from the file cache.  We unset
-        ;; `process-file-side-effects' in order to keep the cache when
-        ;; `process-file' calls appear.
-        (let (process-file-side-effects)
+        ;; `process-file-side-effects' and `remote-file-name-inhibit-cache'
+        ;; in order to keep the cache.
+        (let (remote-file-name-inhibit-cache process-file-side-effects)
           (ignore-errors
             (tramp-run-real-handler 'vc-registered (list file))))))))
 
@@ -3604,8 +3612,13 @@ This function expects to be in the right *tramp* buffer."
     (let (result)
       ;; Check whether the executable is in $PATH. "which(1)" does not
       ;; report always a correct error code; therefore we check the
-      ;; number of words it returns.
-      (unless ignore-path
+      ;; number of words it returns.  "SunOS 5.10" (and maybe "SunOS
+      ;; 5.11") have problems with this command, we disable the call
+      ;; therefore.
+      (unless (or ignore-path
+                  (string-match
+                   (regexp-opt '("SunOS 5.10" "SunOS 5.11"))
+                   (tramp-get-connection-property vec "uname" "")))
         (tramp-send-command vec (format "which \\%s | wc -w" progname))
         (goto-char (point-min))
         (if (looking-at "^\\s-*1$")
@@ -4677,8 +4690,9 @@ function waits for output unless NOOUTPUT is set."
 (defun tramp-send-command-and-check
   (vec command &optional subshell dont-suppress-err)
   "Run COMMAND and check its exit status.
-Sends `echo $?' along with the COMMAND for checking the exit status.  If
-COMMAND is nil, just sends `echo $?'.  Returns the exit status found.
+Sends `echo $?' along with the COMMAND for checking the exit status.
+If COMMAND is nil, just sends `echo $?'.  Returns `t' if the exit
+status is 0, and `nil' otherwise.
 
 If the optional argument SUBSHELL is non-nil, the command is
 executed in a subshell, ie surrounded by parentheses.  If
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index b9b64ed70f8..20948181414 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -241,7 +241,7 @@ pair of the form (KEY VALUE).  The following KEYs are defined:
   * `tramp-copy-program'
     This specifies the name of the program to use for remotely copying
     the file; this might be the absolute filename of rcp or the name of
-    a workalike program.
+    a workalike program.  It is always applied on the local host.
   * `tramp-copy-args'
     This specifies the list of parameters to pass to the above mentioned
     program, the hints for `tramp-login-args' also apply here.
@@ -1044,7 +1044,9 @@ opening a connection to a remote host."
 
 (defcustom tramp-connection-timeout 60
   "Defines the max time to wait for establishing a connection (in seconds).
-This can be overwritten for different connection types in `tramp-methods'."
+This can be overwritten for different connection types in `tramp-methods'.
+
+The timeout does not include the time reading a password."
   :group 'tramp
   :version "24.4"
   :type 'integer)
@@ -4119,40 +4121,48 @@ Invokes `password-read' if available, `read-passwd' else."
               (with-current-buffer (process-buffer proc)
                 (tramp-check-for-regexp proc tramp-password-prompt-regexp)
                 (format "%s for %s " (capitalize (match-string 1)) key))))
-         auth-info auth-passwd)
-    (with-parsed-tramp-file-name key nil
-      (prog1
-          (or
-           ;; See if auth-sources contains something useful, if it's
-           ;; bound.  `auth-source-user-or-password' is an obsoleted
-           ;; function, it has been replaced by `auth-source-search'.
-           (and (boundp 'auth-sources)
-                (tramp-get-connection-property v "first-password-request" nil)
-                ;; Try with Tramp's current method.
-                (if (fboundp 'auth-source-search)
-                    (setq auth-info
-                          (tramp-compat-funcall
-                           'auth-source-search
-                           :max 1
-                           :user (or tramp-current-user t)
-                           :host tramp-current-host
-                           :port tramp-current-method)
-                          auth-passwd (plist-get (nth 0 auth-info) :secret)
-                          auth-passwd (if (functionp auth-passwd)
-                                          (funcall auth-passwd)
-                                        auth-passwd))
-                  (tramp-compat-funcall
-                   'auth-source-user-or-password
-                   "password" tramp-current-host tramp-current-method)))
-           ;; Try the password cache.
-           (when (functionp 'password-read)
-             (let ((password
-                    (tramp-compat-funcall 'password-read pw-prompt key)))
-               (tramp-compat-funcall 'password-cache-add key password)
-               password))
-           ;; Else, get the password interactively.
-           (read-passwd pw-prompt))
-        (tramp-set-connection-property v "first-password-request" nil)))))
+         ;; We suspend the timers while reading the password.
+         (stimers (with-timeout-suspend))
+         auth-info auth-passwd)
+
+    (unwind-protect
+        (with-parsed-tramp-file-name key nil
+          (prog1
+              (or
+               ;; See if auth-sources contains something useful, if
+               ;; it's bound.  `auth-source-user-or-password' is an
+               ;; obsoleted function, it has been replaced by
+               ;; `auth-source-search'.
+               (and (boundp 'auth-sources)
+                    (tramp-get-connection-property
+                     v "first-password-request" nil)
+                    ;; Try with Tramp's current method.
+                    (if (fboundp 'auth-source-search)
+                        (setq auth-info
+                              (tramp-compat-funcall
+                               'auth-source-search
+                               :max 1
+                               :user (or tramp-current-user t)
+                               :host tramp-current-host
+                               :port tramp-current-method)
+                              auth-passwd (plist-get (nth 0 auth-info) :secret)
+                              auth-passwd (if (functionp auth-passwd)
+                                              (funcall auth-passwd)
+                                            auth-passwd))
+                      (tramp-compat-funcall
+                       'auth-source-user-or-password
+                       "password" tramp-current-host tramp-current-method)))
+               ;; Try the password cache.
+               (when (functionp 'password-read)
+                 (let ((password
+                        (tramp-compat-funcall 'password-read pw-prompt key)))
+                   (tramp-compat-funcall 'password-cache-add key password)
+                   password))
+               ;; Else, get the password interactively.
+               (read-passwd pw-prompt))
+            (tramp-set-connection-property v "first-password-request" nil)))
+      ;; Reenable the timers.
+      (with-timeout-unsuspend stimers))))
 
 ;;;###tramp-autoload
 (defun tramp-clear-passwd (vec)