]> code.delx.au - gnu-emacs/blobdiff - lisp/net/tramp-smb.el
Merge from trunk.
[gnu-emacs] / lisp / net / tramp-smb.el
index d50b1aaf9f6d94a314f320a54ee6c2954be46ebf..eb456298c1a80850d82675b3eee6bb2b0b1057bc 100644 (file)
@@ -1,10 +1,10 @@
 ;;; tramp-smb.el --- Tramp access functions for SMB servers
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-;;   2009 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2011 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
+;; Package: tramp
 
 ;; This file is part of GNU Emacs.
 
 
 (eval-when-compile (require 'cl))      ; block, return
 (require 'tramp)
-(require 'tramp-cache)
-(require 'tramp-compat)
 
 ;; Define SMB method ...
-(defcustom tramp-smb-method "smb"
-  "*Method to connect SAMBA and M$ SMB servers."
-  :group 'tramp
-  :type 'string)
+;;;###tramp-autoload
+(defconst tramp-smb-method "smb"
+  "*Method to connect SAMBA and M$ SMB servers.")
 
 ;; ... and add it to the method list.
-(add-to-list 'tramp-methods (cons tramp-smb-method nil))
+;;;###tramp-autoload
+(unless (memq system-type '(cygwin windows-nt))
+  (add-to-list 'tramp-methods (cons tramp-smb-method nil)))
 
 ;; Add a default for `tramp-default-method-alist'. Rule: If there is
 ;; a domain in USER, it must be the SMB method.
+;;;###tramp-autoload
 (add-to-list 'tramp-default-method-alist
             `(nil ,tramp-prefix-domain-regexp ,tramp-smb-method))
 
 ;; Add a default for `tramp-default-user-alist'. Rule: For the SMB method,
 ;; the anonymous user is chosen.
+;;;###tramp-autoload
 (add-to-list 'tramp-default-user-alist
-            `(,tramp-smb-method nil ""))
+            `(,(concat "\\`" tramp-smb-method "\\'") nil nil))
 
 ;; Add completion function for SMB method.
-(tramp-set-completion-function
- tramp-smb-method
- '((tramp-parse-netrc "~/.netrc")))
+;;;###tramp-autoload
+(eval-after-load 'tramp
+  '(tramp-set-completion-function
+    tramp-smb-method
+    '((tramp-parse-netrc "~/.netrc"))))
 
 (defcustom tramp-smb-program "smbclient"
   "*Name of SMB client to run."
   :group 'tramp
   :type 'string)
 
+(defcustom tramp-smb-conf "/dev/null"
+  "*Path of the smb.conf file.
+If it is nil, no smb.conf will be added to the `tramp-smb-program'
+call, letting the SMB client use the default one."
+  :group 'tramp
+  :type '(choice (const nil) (file :must-match t)))
+
+(defvar tramp-smb-version nil
+  "*Version string of the SMB client.")
+
 (defconst tramp-smb-prompt "^smb: .+> \\|^\\s-+Server\\s-+Comment$"
   "Regexp used as prompt in smbclient.")
 
 (defconst tramp-smb-errors
-  ;; `regexp-opt' not possible because of first string.
   (mapconcat
    'identity
-   '(;; Connection error / timeout / unknown command.
-     "Connection to \\S-+ failed"
+   `(;; Connection error / timeout / unknown command.
+     "Connection\\( to \\S-+\\)? failed"
      "Read from server failed, maybe it closed the connection"
      "Call timed out: server did not respond"
      "\\S-+: command not found"
      "Server doesn't support UNIX CIFS calls"
-     ;; Samba.
-     "ERRDOS"
-     "ERRSRV"
-     "ERRbadfile"
-     "ERRbadpw"
-     "ERRfilexists"
-     "ERRnoaccess"
-     "ERRnomem"
-     "ERRnosuchshare"
-     ;; Windows 4.0 (Windows NT), Windows 5.0 (Windows 2000),
-     ;; Windows 5.1 (Windows XP), Windows 5.2 (Windows Server 2003).
-     "NT_STATUS_ACCESS_DENIED"
-     "NT_STATUS_ACCOUNT_LOCKED_OUT"
-     "NT_STATUS_BAD_NETWORK_NAME"
-     "NT_STATUS_CANNOT_DELETE"
-     "NT_STATUS_CONNECTION_REFUSED"
-     "NT_STATUS_DIRECTORY_NOT_EMPTY"
-     "NT_STATUS_DUPLICATE_NAME"
-     "NT_STATUS_FILE_IS_A_DIRECTORY"
-     "NT_STATUS_LOGON_FAILURE"
-     "NT_STATUS_NETWORK_ACCESS_DENIED"
-     "NT_STATUS_NOT_IMPLEMENTED"
-     "NT_STATUS_NO_SUCH_FILE"
-     "NT_STATUS_OBJECT_NAME_COLLISION"
-     "NT_STATUS_OBJECT_NAME_INVALID"
-     "NT_STATUS_OBJECT_NAME_NOT_FOUND"
-     "NT_STATUS_SHARING_VIOLATION"
-     "NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE"
-     "NT_STATUS_WRONG_PASSWORD")
+     ,(regexp-opt
+       '(;; Samba.
+        "ERRDOS"
+        "ERRHRD"
+        "ERRSRV"
+        "ERRbadfile"
+        "ERRbadpw"
+        "ERRfilexists"
+        "ERRnoaccess"
+        "ERRnomem"
+        "ERRnosuchshare"
+        ;; Windows 4.0 (Windows NT), Windows 5.0 (Windows 2000),
+        ;; Windows 5.1 (Windows XP), Windows 5.2 (Windows Server 2003).
+        "NT_STATUS_ACCESS_DENIED"
+        "NT_STATUS_ACCOUNT_LOCKED_OUT"
+        "NT_STATUS_BAD_NETWORK_NAME"
+        "NT_STATUS_CANNOT_DELETE"
+        "NT_STATUS_CONNECTION_REFUSED"
+        "NT_STATUS_DIRECTORY_NOT_EMPTY"
+        "NT_STATUS_DUPLICATE_NAME"
+        "NT_STATUS_FILE_IS_A_DIRECTORY"
+        "NT_STATUS_IO_TIMEOUT"
+        "NT_STATUS_LOGON_FAILURE"
+        "NT_STATUS_NETWORK_ACCESS_DENIED"
+        "NT_STATUS_NOT_IMPLEMENTED"
+        "NT_STATUS_NO_SUCH_FILE"
+        "NT_STATUS_NO_SUCH_USER"
+        "NT_STATUS_OBJECT_NAME_COLLISION"
+        "NT_STATUS_OBJECT_NAME_INVALID"
+        "NT_STATUS_OBJECT_NAME_NOT_FOUND"
+        "NT_STATUS_SHARING_VIOLATION"
+        "NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE"
+        "NT_STATUS_UNSUCCESSFUL"
+        "NT_STATUS_WRONG_PASSWORD")))
    "\\|")
   "Regexp for possible error strings of SMB servers.
 Used instead of analyzing error codes of commands.")
@@ -142,7 +159,7 @@ See `tramp-actions-before-shell' for more info.")
     (directory-file-name . tramp-handle-directory-file-name)
     (directory-files . tramp-smb-handle-directory-files)
     (directory-files-and-attributes
-     . tramp-smb-handle-directory-files-and-attributes)
+     . tramp-handle-directory-files-and-attributes)
     (dired-call-process . ignore)
     (dired-compress-file . ignore)
     (dired-uncache . tramp-handle-dired-uncache)
@@ -150,10 +167,9 @@ See `tramp-actions-before-shell' for more info.")
     (file-accessible-directory-p . tramp-smb-handle-file-directory-p)
     (file-attributes . tramp-smb-handle-file-attributes)
     (file-directory-p .  tramp-smb-handle-file-directory-p)
-    (file-executable-p . tramp-smb-handle-file-exists-p)
-    (file-exists-p . tramp-smb-handle-file-exists-p)
+    (file-executable-p . tramp-handle-file-exists-p)
+    (file-exists-p . tramp-handle-file-exists-p)
     (file-local-copy . tramp-smb-handle-file-local-copy)
-    (file-remote-p . tramp-handle-file-remote-p)
     (file-modes . tramp-handle-file-modes)
     (file-name-all-completions . tramp-smb-handle-file-name-all-completions)
     (file-name-as-directory . tramp-handle-file-name-as-directory)
@@ -161,10 +177,12 @@ See `tramp-actions-before-shell' for more info.")
     (file-name-directory . tramp-handle-file-name-directory)
     (file-name-nondirectory . tramp-handle-file-name-nondirectory)
     ;; `file-name-sans-versions' performed by default handler.
-    (file-newer-than-file-p . tramp-smb-handle-file-newer-than-file-p)
+    (file-newer-than-file-p . tramp-handle-file-newer-than-file-p)
     (file-ownership-preserved-p . ignore)
-    (file-readable-p . tramp-smb-handle-file-exists-p)
+    (file-readable-p . tramp-handle-file-exists-p)
     (file-regular-p . tramp-handle-file-regular-p)
+    (file-remote-p . tramp-handle-file-remote-p)
+    ;; `file-selinux-context' performed by default handler.
     (file-symlink-p . tramp-handle-file-symlink-p)
     ;; `file-truename' performed by default handler.
     (file-writable-p . tramp-smb-handle-file-writable-p)
@@ -179,6 +197,7 @@ See `tramp-actions-before-shell' for more info.")
     (make-symbolic-link . tramp-smb-handle-make-symbolic-link)
     (rename-file . tramp-smb-handle-rename-file)
     (set-file-modes . tramp-smb-handle-set-file-modes)
+    ;; `set-file-selinux-context' performed by default handler.
     (set-file-times . ignore)
     (set-visited-file-modtime . ignore)
     (shell-command . ignore)
@@ -191,11 +210,13 @@ See `tramp-actions-before-shell' for more info.")
   "Alist of handler functions for Tramp SMB method.
 Operations not mentioned here will be handled by the default Emacs primitives.")
 
-(defun tramp-smb-file-name-p (filename)
+;;;###tramp-autoload
+(defsubst tramp-smb-file-name-p (filename)
   "Check if it's a filename for SMB servers."
   (let ((v (tramp-dissect-file-name filename)))
     (string= (tramp-file-name-method v) tramp-smb-method)))
 
+;;;###tramp-autoload
 (defun tramp-smb-file-name-handler (operation &rest args)
   "Invoke the SMB related OPERATION.
 First arg specifies the OPERATION, second arg is a list of arguments to
@@ -205,8 +226,10 @@ pass to the OPERATION."
        (save-match-data (apply (cdr fn) args))
       (tramp-run-real-handler operation args))))
 
-(add-to-list 'tramp-foreign-file-name-handler-alist
-            (cons 'tramp-smb-file-name-p 'tramp-smb-file-name-handler))
+;;;###tramp-autoload
+(unless (memq system-type '(cygwin windows-nt))
+  (add-to-list 'tramp-foreign-file-name-handler-alist
+              (cons 'tramp-smb-file-name-p 'tramp-smb-file-name-handler)))
 
 
 ;; File name primitives.
@@ -241,31 +264,30 @@ pass to the OPERATION."
       ;; `file-attributes' reads the values from there.
       (tramp-flush-file-property v2 (file-name-directory v2-localname))
       (tramp-flush-file-property v2 v2-localname)
-      (let ((cifs (tramp-smb-get-cifs-capabilities v1)))
-       (unless
-           (tramp-smb-send-command
-            v1
-            (format
-             "%s \"%s\" \"%s\""
-             (if cifs "link" "hardlink")
-             (tramp-smb-get-localname v1-localname (not cifs))
-             (tramp-smb-get-localname v2-localname (not cifs))))
-         (tramp-error
-          v2 'file-error
-          "error with add-name-to-file, see buffer `%s' for details"
-          (buffer-name)))))))
+      (unless
+         (tramp-smb-send-command
+          v1
+          (format
+           "%s \"%s\" \"%s\""
+           (if (tramp-smb-get-cifs-capabilities v1) "link" "hardlink")
+           (tramp-smb-get-localname v1)
+           (tramp-smb-get-localname v2)))
+       (tramp-error
+        v2 'file-error
+        "error with add-name-to-file, see buffer `%s' for details"
+        (buffer-name))))))
 
 (defun tramp-smb-handle-copy-directory
   (dirname newname &optional keep-date parents)
-  "Like `copy-directory' for Tramp files."
+  "Like `copy-directory' for Tramp files.  KEEP-DATE is not handled."
   (setq dirname (expand-file-name dirname)
        newname (expand-file-name newname))
   (let ((t1 (tramp-tramp-file-p dirname))
        (t2 (tramp-tramp-file-p newname)))
     (with-parsed-tramp-file-name (if t1 dirname newname) nil
       (cond
+       ;; We must use a local temporary directory.
        ((and t1 t2)
-       ;; We must copy, using a local temporary directory.
        (let ((tmpdir
               (make-temp-name
                (expand-file-name
@@ -273,14 +295,14 @@ pass to the OPERATION."
                 (tramp-compat-temporary-file-directory)))))
          (unwind-protect
              (progn
-               (copy-directory dirname tmpdir keep-date parents)
-               (copy-directory tmpdir newname keep-date parents))
-           (delete-directory tmpdir 'recursive))))
+               (tramp-compat-copy-directory dirname tmpdir keep-date parents)
+               (tramp-compat-copy-directory tmpdir newname keep-date parents))
+           (tramp-compat-delete-directory tmpdir 'recursive))))
+
+       ;; We can copy recursively.
        ((or t1 t2)
-       ;; We can copy recursively.
        (let ((prompt (tramp-smb-send-command v "prompt"))
-             (recurse (tramp-smb-send-command v "recurse"))
-             (cifs (tramp-smb-get-cifs-capabilities v)))
+             (recurse (tramp-smb-send-command v "recurse")))
          (unless (file-directory-p newname)
            (make-directory newname parents))
          (unwind-protect
@@ -288,9 +310,7 @@ pass to the OPERATION."
                  (and
                   prompt recurse
                   (tramp-smb-send-command
-                   v (format
-                      "cd \"%s\""
-                      (tramp-smb-get-localname localname (not cifs))))
+                   v (format "cd \"%s\"" (tramp-smb-get-localname v)))
                   (tramp-smb-send-command
                    v (format "lcd \"%s\"" (if t1 newname dirname)))
                   (if t1
@@ -304,58 +324,60 @@ pass to the OPERATION."
                   v 'file-error
                   "%s `%s'" (match-string 0) (if t1 dirname newname))))
            ;; Go home.
-           (tramp-smb-send-command v (format "cd %s" (if cifs "/" "\\")))
+           (tramp-smb-send-command
+            v (format
+               "cd %s" (if (tramp-smb-get-cifs-capabilities v) "/" "\\")))
            ;; Toggle prompt and recurse OFF.
            (if prompt (tramp-smb-send-command v "prompt"))
            (if recurse (tramp-smb-send-command v "recurse")))))
+
+       ;; We must do it file-wise.
        (t
-       ;; We must do it file-wise.
        (tramp-run-real-handler
         'copy-directory (list dirname newname keep-date parents)))))))
 
 (defun tramp-smb-handle-copy-file
-  (filename newname &optional ok-if-already-exists keep-date preserve-uid-gid)
+  (filename newname &optional ok-if-already-exists keep-date
+           preserve-uid-gid preserve-selinux-context)
   "Like `copy-file' for Tramp files.
 KEEP-DATE is not handled in case NEWNAME resides on an SMB server.
-PRESERVE-UID-GID is completely ignored."
+PRESERVE-UID-GID and PRESERVE-SELINUX-CONTEXT are completely ignored."
   (setq filename (expand-file-name filename)
        newname (expand-file-name newname))
+  (tramp-with-progress-reporter
+      (tramp-dissect-file-name (if (file-remote-p filename) filename newname))
+      0 (format "Copying %s to %s" filename newname)
+
+    (let ((tmpfile (file-local-copy filename)))
+
+      (if tmpfile
+         ;; Remote filename.
+         (condition-case err
+             (rename-file tmpfile newname ok-if-already-exists)
+           ((error quit)
+            (delete-file tmpfile)
+            (signal (car err) (cdr err))))
+
+       ;; Remote newname.
+       (when (file-directory-p newname)
+         (setq newname
+               (expand-file-name (file-name-nondirectory filename) newname)))
+
+       (with-parsed-tramp-file-name newname nil
+         (when (and (not ok-if-already-exists)
+                    (file-exists-p newname))
+           (tramp-error v 'file-already-exists newname))
 
-  (let ((tmpfile (file-local-copy filename)))
-
-    (if tmpfile
-       ;; Remote filename.
-       (condition-case err
-           (rename-file tmpfile newname ok-if-already-exists)
-         ((error quit)
-          (delete-file tmpfile)
-          (signal (car err) (cdr err))))
-
-      ;; Remote newname.
-      (when (file-directory-p newname)
-       (setq newname (expand-file-name
-                      (file-name-nondirectory filename) newname)))
-
-      (with-parsed-tramp-file-name newname nil
-       (when (and (not ok-if-already-exists)
-                  (file-exists-p newname))
-         (tramp-error v 'file-already-exists newname))
-
-       ;; We must also flush the cache of the directory, because
-       ;; `file-attributes' reads the values from there.
-       (tramp-flush-file-property v (file-name-directory localname))
-       (tramp-flush-file-property v localname)
-       (let ((share (tramp-smb-get-share localname))
-             (file (tramp-smb-get-localname
-                    localname (not (tramp-smb-get-cifs-capabilities v)))))
-         (unless share
+         ;; We must also flush the cache of the directory, because
+         ;; `file-attributes' reads the values from there.
+         (tramp-flush-file-property v (file-name-directory localname))
+         (tramp-flush-file-property v localname)
+         (unless (tramp-smb-get-share v)
            (tramp-error
             v 'file-error "Target `%s' must contain a share name" newname))
-         (tramp-message v 0 "Copying file %s to file %s..." filename newname)
-         (if (tramp-smb-send-command
-              v (format "put %s \"%s\"" filename file))
-             (tramp-message
-              v 0 "Copying file %s to file %s...done" filename newname)
+         (unless (tramp-smb-send-command
+                  v (format "put \"%s\" \"%s\""
+                            filename (tramp-smb-get-localname v)))
            (tramp-error v 'file-error "Cannot copy `%s'" filename))))))
 
   ;; KEEP-DATE handling.
@@ -369,30 +391,30 @@ PRESERVE-UID-GID is completely ignored."
        (mapc
         (lambda (file)
           (if (file-directory-p file)
-              (delete-directory file recursive)
+              (tramp-compat-delete-directory file recursive)
             (delete-file file)))
         ;; We do not want to delete "." and "..".
         (directory-files
          directory 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")))
+
     (with-parsed-tramp-file-name directory nil
       ;; We must also flush the cache of the directory, because
       ;; `file-attributes' reads the values from there.
       (tramp-flush-file-property v (file-name-directory localname))
       (tramp-flush-directory-property v localname)
-      (let ((cifs (tramp-smb-get-cifs-capabilities v)))
-       (unless (tramp-smb-send-command
-                v (format
-                   "%s \"%s\""
-                   (if cifs "posix_rmdir" "rmdir")
-                   (tramp-smb-get-localname localname (not cifs))))
-         ;; Error.
-         (with-current-buffer (tramp-get-connection-buffer v)
-           (goto-char (point-min))
-           (search-forward-regexp tramp-smb-errors nil t)
-           (tramp-error
-            v 'file-error "%s `%s'" (match-string 0) directory)))))))
+      (unless (tramp-smb-send-command
+              v (format
+                 "%s \"%s\""
+                 (if (tramp-smb-get-cifs-capabilities v) "posix_rmdir" "rmdir")
+                 (tramp-smb-get-localname v)))
+       ;; Error.
+       (with-current-buffer (tramp-get-connection-buffer v)
+         (goto-char (point-min))
+         (search-forward-regexp tramp-smb-errors nil t)
+         (tramp-error
+          v 'file-error "%s `%s'" (match-string 0) directory))))))
 
-(defun tramp-smb-handle-delete-file (filename)
+(defun tramp-smb-handle-delete-file (filename &optional trash)
   "Like `delete-file' for Tramp files."
   (setq filename (expand-file-name filename))
   (when (file-exists-p filename)
@@ -401,18 +423,17 @@ PRESERVE-UID-GID is completely ignored."
       ;; `file-attributes' reads the values from there.
       (tramp-flush-file-property v (file-name-directory localname))
       (tramp-flush-file-property v localname)
-      (let ((cifs (tramp-smb-get-cifs-capabilities v)))
-       (unless (tramp-smb-send-command
-                v (format
-                   "%s \"%s\""
-                   (if cifs "posix_unlink" "rm")
-                   (tramp-smb-get-localname localname (not cifs))))
-         ;; Error.
-         (with-current-buffer (tramp-get-connection-buffer v)
-           (goto-char (point-min))
-           (search-forward-regexp tramp-smb-errors nil t)
-           (tramp-error
-            v 'file-error "%s `%s'" (match-string 0) filename)))))))
+      (unless (tramp-smb-send-command
+              v (format
+                 "%s \"%s\""
+                 (if (tramp-smb-get-cifs-capabilities v) "posix_unlink" "rm")
+                 (tramp-smb-get-localname v)))
+       ;; Error.
+       (with-current-buffer (tramp-get-connection-buffer v)
+         (goto-char (point-min))
+         (search-forward-regexp tramp-smb-errors nil t)
+         (tramp-error
+          v 'file-error "%s `%s'" (match-string 0) filename))))))
 
 (defun tramp-smb-handle-directory-files
   (directory &optional full match nosort)
@@ -436,15 +457,6 @@ PRESERVE-UID-GID is completely ignored."
     ;; That's it.
     result))
 
-(defun tramp-smb-handle-directory-files-and-attributes
-  (directory &optional full match nosort id-format)
-  "Like `directory-files-and-attributes' for Tramp files."
-  (mapcar
-   (lambda (x)
-     (cons x (tramp-compat-file-attributes
-             (if full x (expand-file-name x directory)) id-format)))
-   (directory-files directory full match nosort)))
-
 (defun tramp-smb-handle-expand-file-name (name &optional dir)
   "Like `expand-file-name' for Tramp files."
   ;; If DIR is not given, use DEFAULT-DIRECTORY or "/".
@@ -480,9 +492,8 @@ PRESERVE-UID-GID is completely ignored."
   (unless id-format (setq id-format 'integer))
   (with-parsed-tramp-file-name filename nil
     (with-file-property v localname (format "file-attributes-%s" id-format)
-      (if (and (tramp-smb-get-share localname)
-              (tramp-smb-get-cifs-capabilities v))
-         (tramp-do-file-attributes-with-stat v localname id-format)
+      (if (and (tramp-smb-get-share v) (tramp-smb-get-stat-capability v))
+         (tramp-smb-do-file-attributes-with-stat v id-format)
        ;; Reading just the filename entry via "dir localname" is not
        ;; possible, because when filename is a directory, some
        ;; smbclient versions return the content of the directory, and
@@ -513,81 +524,76 @@ PRESERVE-UID-GID is completely ignored."
                  inode         ;10 inode number
                  device))))))) ;11 file system number
 
-(defun tramp-do-file-attributes-with-stat
-  (vec localname &optional id-format)
+(defun tramp-smb-do-file-attributes-with-stat (vec &optional id-format)
   "Implement `file-attributes' for Tramp files using stat command."
-  (tramp-message vec 5 "file attributes with stat: %s" localname)
+  (tramp-message
+   vec 5 "file attributes with stat: %s" (tramp-file-name-localname vec))
   (with-current-buffer (tramp-get-buffer vec)
-    (let* ((file (tramp-smb-get-localname localname nil))
-          id link uid gid atime mtime ctime mode inode)
-      (tramp-smb-send-command vec (format "stat \"%s\"" file))
+    (let* (size id link uid gid atime mtime ctime mode inode)
+      (when (tramp-smb-send-command
+            vec (format "stat \"%s\"" (tramp-smb-get-localname vec)))
 
-      ;; Loop the listing.
-      (goto-char (point-min))
-      (unless (re-search-forward tramp-smb-errors nil t)
-       (while (not (eobp))
-         (cond
-          ;;File: /dbus
-          ((looking-at
-            "Size:\\s-+\\([0-9]+\\)\\s-+Blocks:\\s-+[0-9]+\\s-+\\(\\w+\\)")
-           (setq size (string-to-number (match-string 1))
-                 id (if (string-equal "directory" (match-string 2)) t
-                      (if (string-equal "symbolic" (match-string 2)) ""))))
-          ((looking-at
-            "Inode:\\s-+\\([0-9]+\\)\\s-+Links:\\s-+\\([0-9]+\\)")
-           (setq inode (string-to-number (match-string 1))
-                 link (string-to-number (match-string 2))))
-          ((looking-at
-            "Access:\\s-+([0-9]+/\\(\\S-+\\))\\s-+Uid:\\s-+\\([0-9]+\\)\\s-+Gid:\\s-+\\([0-9]+\\)")
-           (setq mode (match-string 1)
-                 uid (if (equal id-format 'string) (match-string 2)
-                       (string-to-number (match-string 2)))
-                 gid (if (equal id-format 'string) (match-string 3)
-                       (string-to-number (match-string 3)))))
-          ((looking-at
-            "Access:\\s-+\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)\\s-+\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\)")
-           (setq atime
-                 (encode-time
-                  (string-to-number (match-string 6)) ;; sec
-                  (string-to-number (match-string 5)) ;; min
-                  (string-to-number (match-string 4)) ;; hour
-                  (string-to-number (match-string 3)) ;; day
-                  (string-to-number (match-string 2)) ;; month
-                  (string-to-number (match-string 1))))) ;; year
-          ((looking-at
-            "Modify:\\s-+\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)\\s-+\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\)")
-           (setq mtime
-                 (encode-time
-                  (string-to-number (match-string 6)) ;; sec
-                  (string-to-number (match-string 5)) ;; min
-                  (string-to-number (match-string 4)) ;; hour
-                  (string-to-number (match-string 3)) ;; day
-                  (string-to-number (match-string 2)) ;; month
-                  (string-to-number (match-string 1))))) ;; year
-          ((looking-at
-            "Change:\\s-+\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)\\s-+\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\)")
-           (setq ctime
-                 (encode-time
-                  (string-to-number (match-string 6)) ;; sec
-                  (string-to-number (match-string 5)) ;; min
-                  (string-to-number (match-string 4)) ;; hour
-                  (string-to-number (match-string 3)) ;; day
-                  (string-to-number (match-string 2)) ;; month
-                  (string-to-number (match-string 1)))))) ;; year
-         (forward-line))
-       ;; Return the result.
-       (list id link uid gid atime mtime ctime size mode nil inode
-             (tramp-get-device vec))))))
+       ;; Loop the listing.
+       (goto-char (point-min))
+       (unless (re-search-forward tramp-smb-errors nil t)
+         (while (not (eobp))
+           (cond
+            ((looking-at
+              "Size:\\s-+\\([0-9]+\\)\\s-+Blocks:\\s-+[0-9]+\\s-+\\(\\w+\\)")
+             (setq size (string-to-number (match-string 1))
+                   id (if (string-equal "directory" (match-string 2)) t
+                        (if (string-equal "symbolic" (match-string 2)) ""))))
+            ((looking-at
+              "Inode:\\s-+\\([0-9]+\\)\\s-+Links:\\s-+\\([0-9]+\\)")
+             (setq inode (string-to-number (match-string 1))
+                   link (string-to-number (match-string 2))))
+            ((looking-at
+              "Access:\\s-+([0-9]+/\\(\\S-+\\))\\s-+Uid:\\s-+\\([0-9]+\\)\\s-+Gid:\\s-+\\([0-9]+\\)")
+             (setq mode (match-string 1)
+                   uid (if (equal id-format 'string) (match-string 2)
+                         (string-to-number (match-string 2)))
+                   gid (if (equal id-format 'string) (match-string 3)
+                         (string-to-number (match-string 3)))))
+            ((looking-at
+              "Access:\\s-+\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)\\s-+\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\)")
+             (setq atime
+                   (encode-time
+                    (string-to-number (match-string 6)) ;; sec
+                    (string-to-number (match-string 5)) ;; min
+                    (string-to-number (match-string 4)) ;; hour
+                    (string-to-number (match-string 3)) ;; day
+                    (string-to-number (match-string 2)) ;; month
+                    (string-to-number (match-string 1))))) ;; year
+            ((looking-at
+              "Modify:\\s-+\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)\\s-+\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\)")
+             (setq mtime
+                   (encode-time
+                    (string-to-number (match-string 6)) ;; sec
+                    (string-to-number (match-string 5)) ;; min
+                    (string-to-number (match-string 4)) ;; hour
+                    (string-to-number (match-string 3)) ;; day
+                    (string-to-number (match-string 2)) ;; month
+                    (string-to-number (match-string 1))))) ;; year
+            ((looking-at
+              "Change:\\s-+\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)\\s-+\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\)")
+             (setq ctime
+                   (encode-time
+                    (string-to-number (match-string 6)) ;; sec
+                    (string-to-number (match-string 5)) ;; min
+                    (string-to-number (match-string 4)) ;; hour
+                    (string-to-number (match-string 3)) ;; day
+                    (string-to-number (match-string 2)) ;; month
+                    (string-to-number (match-string 1)))))) ;; year
+           (forward-line))
+         ;; Return the result.
+         (list id link uid gid atime mtime ctime size mode nil inode
+               (tramp-get-device vec)))))))
 
 (defun tramp-smb-handle-file-directory-p (filename)
   "Like `file-directory-p' for Tramp files."
   (and (file-exists-p filename)
        (eq ?d (aref (nth 8 (file-attributes filename)) 0))))
 
-(defun tramp-smb-handle-file-exists-p (filename)
-  "Like `file-exists-p' for Tramp files."
-  (not (null (file-attributes filename))))
-
 (defun tramp-smb-handle-file-local-copy (filename)
   "Like `file-local-copy' for Tramp files."
   (with-parsed-tramp-file-name filename nil
@@ -595,18 +601,16 @@ PRESERVE-UID-GID is completely ignored."
       (tramp-error
        v 'file-error
        "Cannot make local copy of non-existing file `%s'" filename))
-    (let ((file (tramp-smb-get-localname
-                localname (not (tramp-smb-get-cifs-capabilities v))))
-         (tmpfile (tramp-compat-make-temp-file filename)))
-      (tramp-message v 4 "Fetching %s to tmp file %s..." filename tmpfile)
-      (if (tramp-smb-send-command v (format "get \"%s\" %s" file tmpfile))
-         (tramp-message
-          v 4 "Fetching %s to tmp file %s...done" filename tmpfile)
-       ;; Oops, an error.  We shall cleanup.
-       (delete-file tmpfile)
-       (tramp-error
-        v 'file-error
-        "Cannot make local copy of file `%s'" filename))
+    (let ((tmpfile (tramp-compat-make-temp-file filename)))
+      (tramp-with-progress-reporter
+         v 3 (format "Fetching %s to tmp file %s" filename tmpfile)
+       (unless (tramp-smb-send-command
+                v (format "get \"%s\" \"%s\""
+                          (tramp-smb-get-localname v) tmpfile))
+         ;; Oops, an error.  We shall cleanup.
+         (delete-file tmpfile)
+         (tramp-error
+          v 'file-error "Cannot make local copy of file `%s'" filename)))
       tmpfile)))
 
 ;; This function should return "foo/" for directories and "bar" for
@@ -627,14 +631,6 @@ PRESERVE-UID-GID is completely ignored."
                 (nth 0 x))))
            entries)))))))
 
-(defun tramp-smb-handle-file-newer-than-file-p (file1 file2)
-  "Like `file-newer-than-file-p' for Tramp files."
-  (cond
-   ((not (file-exists-p file1)) nil)
-   ((not (file-exists-p file2)) t)
-   (t (tramp-time-less-p (nth 5 (file-attributes file2))
-                        (nth 5 (file-attributes file1))))))
-
 (defun tramp-smb-handle-file-writable-p (filename)
   "Like `file-writable-p' for Tramp files."
   (if (file-exists-p filename)
@@ -647,13 +643,13 @@ PRESERVE-UID-GID is completely ignored."
   (filename switches &optional wildcard full-directory-p)
   "Like `insert-directory' for Tramp files."
   (setq filename (expand-file-name filename))
-  (when full-directory-p
-    ;; Called from `dired-add-entry'.
-    (setq filename (file-name-as-directory filename)))
+  (if full-directory-p
+      ;; Called from `dired-add-entry'.
+      (setq filename (file-name-as-directory filename))
+    (setq filename (directory-file-name filename)))
   (with-parsed-tramp-file-name filename nil
     (save-match-data
-      (let ((cifs (tramp-smb-get-cifs-capabilities v))
-           (base (file-name-nondirectory filename))
+      (let ((base (file-name-nondirectory filename))
            ;; We should not destroy the cache entry.
            (entries (copy-sequence
                      (tramp-smb-get-file-entries
@@ -706,28 +702,39 @@ PRESERVE-UID-GID is completely ignored."
           entries))
 
        ;; Print entries.
-       (mapcar
+       (mapc
         (lambda (x)
           (when (not (zerop (length (nth 0 x))))
             (let ((attr
-                   (when cifs
-                     (file-attributes (expand-file-name (nth 0 x)) 'string))))
+                   (when (tramp-smb-get-stat-capability v)
+                     (ignore-errors
+                       (file-attributes filename 'string)))))
               (insert
                (format
-                "%10s %3d %-8s %-8s %8s %s %s\n"
+                "%10s %3d %-8s %-8s %8s %s "
                 (or (nth 8 attr) (nth 1 x)) ; mode
-                (or (nth 1 attr) 1) ; link
+                (or (nth 1 attr) 1) ; inode
                 (or (nth 2 attr) "nobody") ; uid
                 (or (nth 3 attr) "nogroup") ; gid
-                (nth 2 x) ; size
+                (or (nth 7 attr) (nth 2 x)) ; size
                 (format-time-string
                  (if (tramp-time-less-p
                       (tramp-time-subtract (current-time) (nth 3 x))
                       tramp-half-a-year)
                      "%b %e %R"
                    "%b %e  %Y")
-                 (nth 3 x)) ; date
-                (nth 0 x))) ; file name
+                 (nth 3 x)))) ; date
+              ;; We mark the file name.  The inserted name could be
+              ;; from somewhere else, so we use the relative file
+              ;; name of `default-directory'.
+              (let ((start (point)))
+                (insert
+                 (format
+                  "%s\n"
+                  (file-relative-name
+                   (expand-file-name
+                    (nth 0 x) (file-name-directory filename)))))
+                (put-text-property start (1- (point)) 'dired-filename t))
               (forward-line)
               (beginning-of-line))))
         entries)))))
@@ -739,10 +746,11 @@ PRESERVE-UID-GID is completely ignored."
     (setq dir (expand-file-name dir default-directory)))
   (with-parsed-tramp-file-name dir nil
     (save-match-data
-      (let* ((share (tramp-smb-get-share localname))
-            (ldir (file-name-directory dir)))
+      (let* ((ldir (file-name-directory dir)))
        ;; Make missing directory parts.
-       (when (and parents share (not (file-directory-p ldir)))
+       (when (and parents
+                  (tramp-smb-get-share v)
+                  (not (file-directory-p ldir)))
          (make-directory ldir parents))
        ;; Just do it.
        (when (file-directory-p ldir)
@@ -757,15 +765,14 @@ PRESERVE-UID-GID is completely ignored."
     (setq directory (expand-file-name directory default-directory)))
   (with-parsed-tramp-file-name directory nil
     (save-match-data
-      (let* ((cifs (tramp-smb-get-cifs-capabilities v))
-            (file (tramp-smb-get-localname localname (not cifs))))
+      (let* ((file (tramp-smb-get-localname v)))
        (when (file-directory-p (file-name-directory directory))
          (tramp-smb-send-command
           v
-          (if cifs
+          (if (tramp-smb-get-cifs-capabilities v)
               (format
                "posix_mkdir \"%s\" %s"
-               file (tramp-decimal-to-octal (default-file-modes)))
+               file (tramp-compat-decimal-to-octal (default-file-modes)))
             (format "mkdir \"%s\"" file)))
          ;; We must also flush the cache of the directory, because
          ;; `file-attributes' reads the values from there.
@@ -820,8 +827,8 @@ target of the symlink differ."
           v1
           (format
            "symlink \"%s\" \"%s\""
-           (tramp-smb-get-localname v1-localname nil)
-           (tramp-smb-get-localname v2-localname nil)))
+           (tramp-smb-get-localname v1)
+           (tramp-smb-get-localname v2)))
        (tramp-error
         v2 'file-error
         "error with make-symbolic-link, see buffer `%s' for details"
@@ -832,39 +839,39 @@ target of the symlink differ."
   "Like `rename-file' for Tramp files."
   (setq filename (expand-file-name filename)
        newname (expand-file-name newname))
+  (tramp-with-progress-reporter
+      (tramp-dissect-file-name (if (file-remote-p filename) filename newname))
+      0 (format "Renaming %s to %s" filename newname)
+
+    (let ((tmpfile (file-local-copy filename)))
+
+      (if tmpfile
+         ;; Remote filename.
+         (condition-case err
+             (rename-file tmpfile newname ok-if-already-exists)
+           ((error quit)
+            (delete-file tmpfile)
+            (signal (car err) (cdr err))))
+
+       ;; Remote newname.
+       (when (file-directory-p newname)
+         (setq newname (expand-file-name
+                        (file-name-nondirectory filename) newname)))
+
+       (with-parsed-tramp-file-name newname nil
+         (when (and (not ok-if-already-exists)
+                    (file-exists-p newname))
+           (tramp-error v 'file-already-exists newname))
+         ;; We must also flush the cache of the directory, because
+         ;; `file-attributes' reads the values from there.
+         (tramp-flush-file-property v (file-name-directory localname))
+         (tramp-flush-file-property v localname)
+         (unless (tramp-smb-send-command
+                  v (format "put %s \"%s\""
+                            filename (tramp-smb-get-localname v)))
+           (tramp-error v 'file-error "Cannot rename `%s'" filename)))))
 
-  (let ((tmpfile (file-local-copy filename)))
-
-    (if tmpfile
-       ;; Remote filename.
-       (condition-case err
-           (rename-file tmpfile newname ok-if-already-exists)
-         ((error quit)
-          (delete-file tmpfile)
-          (signal (car err) (cdr err))))
-
-      ;; Remote newname.
-      (when (file-directory-p newname)
-       (setq newname (expand-file-name
-                     (file-name-nondirectory filename) newname)))
-
-      (with-parsed-tramp-file-name newname nil
-       (when (and (not ok-if-already-exists)
-                  (file-exists-p newname))
-         (tramp-error v 'file-already-exists newname))
-       ;; We must also flush the cache of the directory, because
-       ;; `file-attributes' reads the values from there.
-       (tramp-flush-file-property v (file-name-directory localname))
-       (tramp-flush-file-property v localname)
-       (let ((file (tramp-smb-get-localname
-                    localname (not (tramp-smb-get-cifs-capabilities v)))))
-         (tramp-message v 0 "Copying file %s to file %s..." filename newname)
-         (if (tramp-smb-send-command v (format "put %s \"%s\"" filename file))
-             (tramp-message
-              v 0 "Copying file %s to file %s...done" filename newname)
-           (tramp-error v 'file-error "Cannot rename `%s'" filename))))))
-
-  (delete-file filename))
+    (delete-file filename)))
 
 (defun tramp-smb-handle-set-file-modes (filename mode)
   "Like `set-file-modes' for Tramp files."
@@ -873,8 +880,8 @@ target of the symlink differ."
       (tramp-flush-file-property v localname)
       (unless (tramp-smb-send-command
               v (format "chmod \"%s\" %s"
-                        (tramp-smb-get-localname localname nil)
-                        (tramp-decimal-to-octal mode)))
+                        (tramp-smb-get-localname v)
+                        (tramp-compat-decimal-to-octal mode)))
        (tramp-error
         v 'file-error "Error while changing file's mode %s" filename)))))
 
@@ -910,9 +917,7 @@ errors for shares like \"C$/\", which are common in Microsoft Windows."
     ;; `file-attributes' reads the values from there.
     (tramp-flush-file-property v (file-name-directory localname))
     (tramp-flush-file-property v localname)
-    (let ((file (tramp-smb-get-localname
-                localname (not (tramp-smb-get-cifs-capabilities v))))
-         (curbuf (current-buffer))
+    (let ((curbuf (current-buffer))
          (tmpfile (tramp-compat-make-temp-file filename)))
       ;; We say `no-message' here because we don't want the visited file
       ;; modtime data to be clobbered from the temp file.  We call
@@ -923,13 +928,14 @@ errors for shares like \"C$/\", which are common in Microsoft Windows."
           (list start end tmpfile append 'no-message lockname confirm)
         (list start end tmpfile append 'no-message lockname)))
 
-      (tramp-message v 5 "Writing tmp file %s to file %s..." tmpfile filename)
-      (unwind-protect
-         (if (tramp-smb-send-command v (format "put %s \"%s\"" tmpfile file))
-             (tramp-message
-              v 5 "Writing tmp file %s to file %s...done" tmpfile filename)
-           (tramp-error v 'file-error "Cannot write `%s'" filename))
-       (delete-file tmpfile))
+      (tramp-with-progress-reporter
+         v 3 (format "Moving tmp file %s to %s" tmpfile filename)
+       (unwind-protect
+           (unless (tramp-smb-send-command
+                    v (format "put %s \"%s\""
+                              tmpfile (tramp-smb-get-localname v)))
+             (tramp-error v 'file-error "Cannot write `%s'" filename))
+         (delete-file tmpfile)))
 
       (unless (equal curbuf (current-buffer))
        (tramp-error
@@ -941,34 +947,37 @@ errors for shares like \"C$/\", which are common in Microsoft Windows."
 
 ;; Internal file name functions.
 
-(defun tramp-smb-get-share (localname)
+(defun tramp-smb-get-share (vec)
   "Returns the share name of LOCALNAME."
   (save-match-data
-    (when (string-match "^/?\\([^/]+\\)/" localname)
-      (match-string 1 localname))))
+    (let ((localname (tramp-file-name-localname vec)))
+      (when (string-match "^/?\\([^/]+\\)/" localname)
+       (match-string 1 localname)))))
 
-(defun tramp-smb-get-localname (localname convert)
+(defun tramp-smb-get-localname (vec)
   "Returns the file name of LOCALNAME.
-If CONVERT is non-nil exchange \"/\" by \"\\\\\"."
+If VEC has no cifs capabilities, exchange \"/\" by \"\\\\\"."
   (save-match-data
-    (let ((res localname))
-
+    (let ((localname (tramp-file-name-localname vec)))
       (setq
-       res (if (string-match "^/?[^/]+/\\(.*\\)" res)
-              (if convert
-                  (mapconcat
-                   (lambda (x) (if (equal x ?/) "\\" (char-to-string x)))
-                   (match-string 1 res) "")
-                (match-string 1 res))
-            (if (string-match "^/?\\([^/]+\\)$" res)
-                (match-string 1 res)
-              "")))
+       localname
+       (if (string-match "^/?[^/]+\\(/.*\\)" localname)
+          ;; There is a share, sparated by "/".
+          (if (not (tramp-smb-get-cifs-capabilities vec))
+              (mapconcat
+               (lambda (x) (if (equal x ?/) "\\" (char-to-string x)))
+               (match-string 1 localname) "")
+            (match-string 1 localname))
+        ;; There is just a share.
+        (if (string-match "^/?\\([^/]+\\)$" localname)
+            (match-string 1 localname)
+          "")))
 
       ;; Sometimes we have discarded `substitute-in-file-name'.
-      (when (string-match "\\(\\$\\$\\)\\(/\\|$\\)" res)
-       (setq res (replace-match "$" nil nil res 1)))
+      (when (string-match "\\(\\$\\$\\)\\(/\\|$\\)" localname)
+       (setq localname (replace-match "$" nil nil localname 1)))
 
-      res)))
+      localname)))
 
 ;; Share names of a host are cached. It is very unlikely that the
 ;; shares do change during connection.
@@ -976,12 +985,11 @@ If CONVERT is non-nil exchange \"/\" by \"\\\\\"."
   "Read entries which match DIRECTORY.
 Either the shares are listed, or the `dir' command is executed.
 Result is a list of (LOCALNAME MODE SIZE MONTH DAY TIME YEAR)."
-  (with-parsed-tramp-file-name directory nil
+  (with-parsed-tramp-file-name (file-name-as-directory directory) nil
     (setq localname (or localname "/"))
     (with-file-property v localname "file-entries"
       (with-current-buffer (tramp-get-buffer v)
-       (let* ((share (tramp-smb-get-share localname))
-              (file (tramp-smb-get-localname localname nil))
+       (let* ((share (tramp-smb-get-share v))
               (cache (tramp-get-connection-property v "share-cache" nil))
               res entry)
 
@@ -990,17 +998,16 @@ Result is a list of (LOCALNAME MODE SIZE MONTH DAY TIME YEAR)."
              (setq res cache)
 
            ;; Read entries.
-           (setq file (file-name-as-directory file))
-           (when (string-match "^\\./" file)
-             (setq file (substring file 1)))
            (if share
-               (tramp-smb-send-command v (format "dir \"%s*\"" file))
+               (tramp-smb-send-command
+                v (format "dir \"%s*\"" (tramp-smb-get-localname v)))
              ;; `tramp-smb-maybe-open-connection' lists also the share names.
              (tramp-smb-maybe-open-connection v))
 
            ;; Loop the listing.
            (goto-char (point-min))
-           (unless (re-search-forward tramp-smb-errors nil t)
+           (if (re-search-forward tramp-smb-errors nil t)
+               (tramp-error v 'file-error "%s `%s'" (match-string 0) directory)
              (while (not (eobp))
                (setq entry (tramp-smb-read-file-entry share))
                (forward-line)
@@ -1024,11 +1031,9 @@ Result is a list of (LOCALNAME MODE SIZE MONTH DAY TIME YEAR)."
 ;;
 ;; If shares are listed, the following format is expected:
 ;;
-;; \s-\{8,8}                              - leading spaces
-;; \S-\(.*\S-\)\s-*                       - share name, 14 char
-;; \s-                                    - space delimeter
-;; \S-+\s-*                               - type, 8 char, "Disk    " expected
-;; \(\s-\{2,2\}.*\)?                      - space delimeter, comment
+;; Disk|                                  - leading spaces
+;; [^|]+|                                 - share name, 14 char
+;; .*                                     - comment
 ;;
 ;; Entries provided by smbclient DIR aren't fully regular.
 ;; They should have the format
@@ -1036,17 +1041,17 @@ Result is a list of (LOCALNAME MODE SIZE MONTH DAY TIME YEAR)."
 ;; \s-\{2,2}                              - leading spaces
 ;; \S-\(.*\S-\)\s-*                       - file name, 30 chars, left bound
 ;; \s-+[ADHRSV]*                          - permissions, 7 chars, right bound
-;; \s-                                    - space delimeter
+;; \s-                                    - space delimiter
 ;; \s-+[0-9]+                             - size, 8 chars, right bound
-;; \s-\{2,2\}                             - space delimeter
+;; \s-\{2,2\}                             - space delimiter
 ;; \w\{3,3\}                              - weekday
-;; \s-                                    - space delimeter
+;; \s-                                    - space delimiter
 ;; \w\{3,3\}                              - month
-;; \s-                                    - space delimeter
+;; \s-                                    - space delimiter
 ;; [ 12][0-9]                             - day
-;; \s-                                    - space delimeter
+;; \s-                                    - space delimiter
 ;; [0-9]\{2,2\}:[0-9]\{2,2\}:[0-9]\{2,2\} - time
-;; \s-                                    - space delimeter
+;; \s-                                    - space delimiter
 ;; [0-9]\{4,4\}                           - year
 ;;
 ;; samba/src/client.c (http://samba.org/doxygen/samba/client_8c-source.html)
@@ -1080,13 +1085,13 @@ If SHARE is result, entries are of type dir. Otherwise, shares are listed.
 Result is the list (LOCALNAME MODE SIZE MTIME)."
 ;; We are called from `tramp-smb-get-file-entries', which sets the
 ;; current buffer.
-  (let ((line (buffer-substring (point) (tramp-compat-line-end-position)))
+  (let ((line (buffer-substring (point) (point-at-eol)))
        localname mode size month day hour min sec year mtime)
 
     (if (not share)
 
        ;; Read share entries.
-       (when (string-match "^\\s-+\\(\\S-\\(.*\\S-\\)?\\)\\s-+Disk" line)
+       (when (string-match "^Disk|\\([^|]+\\)|" line)
          (setq localname (match-string 1 line)
                mode "dr-xr-xr-x"
                size 0))
@@ -1144,7 +1149,7 @@ Result is the list (LOCALNAME MODE SIZE MTIME)."
                    (mapconcat
                     (lambda (x) "") "    "
                     (concat "r" (if (string-match "R" mode) "-" "w") "x"))))
-            line (substring line 0 -7))
+            line (substring line 0 -6))
          (return))
 
        ;; localname.
@@ -1164,17 +1169,30 @@ Result is the list (LOCALNAME MODE SIZE MTIME)."
 
 (defun tramp-smb-get-cifs-capabilities (vec)
   "Check, whether the SMB server supports POSIX commands."
-  (with-connection-property
-      (tramp-get-connection-process vec) "cifs-capabilities"
-    (when (tramp-smb-send-command vec "posix")
-      (with-current-buffer (tramp-get-buffer vec)
-       (goto-char (point-min))
-       (when (re-search-forward "Server supports CIFS capabilities" nil t)
-         (member
-          "pathnames"
-          (split-string
-           (buffer-substring
-            (point) (tramp-compat-line-end-position)) nil t)))))))
+  ;; When we are not logged in yet, we return nil.
+  (if (let ((p (tramp-get-connection-process vec)))
+       (and p (processp p) (memq (process-status p) '(run open))))
+      (with-connection-property
+         (tramp-get-connection-process vec) "cifs-capabilities"
+       (save-match-data
+         (when (tramp-smb-send-command vec "posix")
+           (with-current-buffer (tramp-get-buffer vec)
+             (goto-char (point-min))
+             (when
+                 (re-search-forward "Server supports CIFS capabilities" nil t)
+               (member
+                "pathnames"
+                (split-string
+                 (buffer-substring (point) (point-at-eol)) nil t)))))))))
+
+(defun tramp-smb-get-stat-capability (vec)
+  "Check, whether the SMB server supports the STAT command."
+  ;; When we are not logged in yet, we return nil.
+  (if (let ((p (tramp-get-connection-process vec)))
+       (and p (processp p) (memq (process-status p) '(run open))))
+      (with-connection-property
+         (tramp-get-connection-process vec) "stat-capability"
+       (tramp-smb-send-command vec "stat ."))))
 
 
 ;; Connection functions.
@@ -1191,7 +1209,7 @@ Returns nil if there has been an error message from smbclient."
   "Maybe open a connection to HOST, log in as USER, using `tramp-smb-program'.
 Does not do anything if a connection is already open, but re-opens the
 connection if a previous connection has died for some reason."
-  (let* ((share (tramp-smb-get-share (tramp-file-name-localname vec)))
+  (let* ((share (tramp-smb-get-share vec))
         (buf (tramp-get-buffer vec))
         (p (get-buffer-process buf)))
 
@@ -1199,25 +1217,30 @@ connection if a previous connection has died for some reason."
     ;; Otherwise, we must delete the connection cache, because
     ;; capabilities migh have changed.
     (unless (processp p)
-      (unless (let ((default-directory
-                     (tramp-compat-temporary-file-directory)))
-               (executable-find tramp-smb-program))
-       (tramp-error
-        vec 'file-error
-        "Cannot find command %s in %s" tramp-smb-program exec-path))
+      (let ((default-directory (tramp-compat-temporary-file-directory))
+           (command (concat tramp-smb-program " -V")))
+
+       (unless tramp-smb-version
+         (unless (executable-find tramp-smb-program)
+           (tramp-error
+            vec 'file-error
+            "Cannot find command %s in %s" tramp-smb-program exec-path))
+         (setq tramp-smb-version (shell-command-to-string command))
+         (tramp-message vec 6 command)
+         (tramp-message vec 6 "\n%s" tramp-smb-version)
+         (if (string-match "[ \t\n\r]+\\'" tramp-smb-version)
+             (setq tramp-smb-version
+                   (replace-match "" nil nil tramp-smb-version))))
 
-      (let* ((default-directory (tramp-compat-temporary-file-directory))
-            (smbclient-version
-             (shell-command-to-string (concat tramp-smb-program " -V"))))
        (unless (string-equal
-                smbclient-version
-                (tramp-get-connection-property vec "smbclient-version" ""))
-         (when (tramp-get-connection-property vec "smbclient-version" nil)
-           (tramp-flush-directory-property vec "")
-           (tramp-flush-connection-property vec)
-);         (setq buf (tramp-get-buffer vec)))
-         (tramp-set-connection-property
-          vec "smbclient-version" smbclient-version))))
+                tramp-smb-version
+                (tramp-get-connection-property
+                 vec "smbclient-version" tramp-smb-version))
+         (tramp-flush-directory-property vec "")
+         (tramp-flush-connection-property vec))
+
+       (tramp-set-connection-property
+        vec "smbclient-version" tramp-smb-version)))
 
     ;; If too much time has passed since last command was sent, look
     ;; whether there has been an error message; maybe due to
@@ -1256,7 +1279,7 @@ connection if a previous connection has died for some reason."
 
          (if share
              (setq args (list (concat "//" real-host "/" share)))
-           (setq args (list "-L" real-host )))
+           (setq args (list "-g" "-L" real-host )))
 
          (if (not (zerop (length real-user)))
              (setq args (append args (list "-U" real-user)))
@@ -1264,64 +1287,61 @@ connection if a previous connection has died for some reason."
 
          (when domain (setq args (append args (list "-W" domain))))
          (when port   (setq args (append args (list "-p" port))))
-         (setq args (append args (list "-s" "/dev/null")))
+         (when tramp-smb-conf
+           (setq args (append args (list "-s" tramp-smb-conf))))
 
          ;; OK, let's go.
-         (tramp-message
-          vec 3 "Opening connection for //%s%s/%s..."
-          (if (not (zerop (length user))) (concat user "@") "")
-          host (or share ""))
-
-         (let* ((coding-system-for-read nil)
-                (process-connection-type tramp-process-connection-type)
-                (p (let ((default-directory
-                           (tramp-compat-temporary-file-directory)))
-                     (apply #'start-process
-                            (tramp-buffer-name vec) (tramp-get-buffer vec)
-                            tramp-smb-program args))))
-
-           (tramp-message
-            vec 6 "%s" (mapconcat 'identity (process-command p) " "))
-           (tramp-set-process-query-on-exit-flag p nil)
-
-           ;; Set variables for computing the prompt for reading password.
-           (setq tramp-current-method tramp-smb-method
-                 tramp-current-user user
-                 tramp-current-host host)
-
-           ;; Play login scenario.
-           (tramp-process-actions
-            p vec
-            (if share
-                tramp-smb-actions-with-share
-              tramp-smb-actions-without-share))
-
-           ;; Check server version.
-           (with-current-buffer (tramp-get-connection-buffer vec)
-             (goto-char (point-min))
-             (search-forward-regexp
-              "Domain=\\[[^]]*\\] OS=\\[[^]]*\\] Server=\\[[^]]*\\]" nil t)
-             (let ((smbserver-version (match-string 0)))
-               (unless (string-equal
-                        smbserver-version
-                        (tramp-get-connection-property
-                         vec "smbserver-version" ""))
-                 (when (tramp-get-connection-property
-                        vec "smbserver-version" nil)
+         (tramp-with-progress-reporter
+             vec 3
+             (format "Opening connection for //%s%s/%s"
+                     (if (not (zerop (length user))) (concat user "@") "")
+                     host (or share ""))
+
+           (let* ((coding-system-for-read nil)
+                  (process-connection-type tramp-process-connection-type)
+                  (p (let ((default-directory
+                             (tramp-compat-temporary-file-directory)))
+                       (apply #'start-process
+                              (tramp-buffer-name vec) (tramp-get-buffer vec)
+                              tramp-smb-program args))))
+
+             (tramp-message
+              vec 6 "%s" (mapconcat 'identity (process-command p) " "))
+             (tramp-compat-set-process-query-on-exit-flag p nil)
+
+             ;; Set variables for computing the prompt for reading password.
+             (setq tramp-current-method tramp-smb-method
+                   tramp-current-user user
+                   tramp-current-host host)
+
+             ;; Play login scenario.
+             (tramp-process-actions
+              p vec nil
+              (if share
+                  tramp-smb-actions-with-share
+                tramp-smb-actions-without-share))
+
+             ;; Check server version.
+             (with-current-buffer (tramp-get-connection-buffer vec)
+               (goto-char (point-min))
+               (search-forward-regexp
+                "Domain=\\[[^]]*\\] OS=\\[[^]]*\\] Server=\\[[^]]*\\]" nil t)
+               (let ((smbserver-version (match-string 0)))
+                 (unless
+                     (string-equal
+                      smbserver-version
+                      (tramp-get-connection-property
+                       vec "smbserver-version" smbserver-version))
                    (tramp-flush-directory-property vec "")
                    (tramp-flush-connection-property vec))
                  (tramp-set-connection-property
-                  vec "smbserver-version" smbserver-version))))
-
-           ;; Set chunksize.  Otherwise, `tramp-send-string' might
-           ;; try it itself.
-           (tramp-set-connection-property p "smb-share" share)
-           (tramp-set-connection-property p "chunksize" tramp-chunksize)
+                  vec "smbserver-version" smbserver-version)))
 
-           (tramp-message
-            vec 3 "Opening connection for //%s%s/%s...done"
-            (if (not (zerop (length user))) (concat user "@") "")
-            host (or share ""))))))))
+             ;; Set chunksize.  Otherwise, `tramp-send-string' might
+             ;; try it itself.
+             (tramp-set-connection-property p "smb-share" share)
+             (tramp-set-connection-property
+              p "chunksize" tramp-chunksize))))))))
 
 ;; We don't use timeouts.  If needed, the caller shall wrap around.
 (defun tramp-smb-wait-for-output (vec)
@@ -1364,6 +1384,9 @@ Returns nil if an error message has appeared."
       (tramp-message vec 6 "\n%s" (buffer-string))
       (not err))))
 
+(add-hook 'tramp-unload-hook
+         (lambda ()
+           (unload-feature 'tramp-smb 'force)))
 
 (provide 'tramp-smb)
 
@@ -1378,5 +1401,4 @@ Returns nil if an error message has appeared."
 ;;   regular again.
 ;; * Make it multi-hop capable.
 
-;; arch-tag: fcc9dbec-7503-4d73-b638-3c8aa59575f5
 ;;; tramp-smb.el ends here