tramp-smb.el 73.9 KB
Newer Older
Michael Albinus's avatar
Michael Albinus committed
1
;;; tramp-smb.el --- Tramp access functions for SMB servers
2

Paul Eggert's avatar
Paul Eggert committed
3
;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
4

Michael Albinus's avatar
Michael Albinus committed
5
;; Author: Michael Albinus <michael.albinus@gmx.de>
6
;; Keywords: comm, processes
7
;; Package: tramp
8 9 10

;; This file is part of GNU Emacs.

11
;; GNU Emacs is free software: you can redistribute it and/or modify
12
;; it under the terms of the GNU General Public License as published by
13 14
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
15 16 17 18 19 20 21

;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
22
;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
23 24 25 26 27 28 29 30 31

;;; Commentary:

;; Access functions for SMB servers like SAMBA or M$ Windows from Tramp.

;;; Code:

(require 'tramp)

Michael Albinus's avatar
Michael Albinus committed
32 33 34 35
;; Pacify byte-compiler.
(eval-when-compile
  (require 'cl))

36
;; Define SMB method ...
37 38
;;;###tramp-autoload
(defconst tramp-smb-method "smb"
39
  "Method to connect SAMBA and M$ SMB servers.")
40 41

;; ... and add it to the method list.
42 43
;;;###tramp-autoload
(unless (memq system-type '(cygwin windows-nt))
44 45 46 47 48
  (add-to-list 'tramp-methods
    `(,tramp-smb-method
      ;; We define an empty command, because `tramp-smb-call-winexe'
      ;; opens already the powershell.  Used in `tramp-handle-shell-command'.
      (tramp-remote-shell "")
Michael Albinus's avatar
Michael Albinus committed
49
      ;; This is just a guess.  We don't know whether the share "C$"
50 51 52
      ;; is available for public use, and whether the user has write
      ;; access.
      (tramp-tmpdir "/C$/Temp"))))
53 54 55

;; Add a default for `tramp-default-method-alist'. Rule: If there is
;; a domain in USER, it must be the SMB method.
56
;;;###tramp-autoload
57
(add-to-list 'tramp-default-method-alist
58
	     `(nil ,tramp-prefix-domain-regexp ,tramp-smb-method))
59 60 61

;; Add a default for `tramp-default-user-alist'. Rule: For the SMB method,
;; the anonymous user is chosen.
62
;;;###tramp-autoload
63
(add-to-list 'tramp-default-user-alist
64
	     `(,(concat "\\`" tramp-smb-method "\\'") nil nil))
65 66

;; Add completion function for SMB method.
67 68 69 70 71
;;;###tramp-autoload
(eval-after-load 'tramp
  '(tramp-set-completion-function
    tramp-smb-method
    '((tramp-parse-netrc "~/.netrc"))))
72

73
;;;###tramp-autoload
74
(defcustom tramp-smb-program "smbclient"
75
  "Name of SMB client to run."
76 77 78
  :group 'tramp
  :type 'string)

79
;;;###tramp-autoload
80 81 82 83 84 85
(defcustom tramp-smb-acl-program "smbcacls"
  "Name of SMB acls to run."
  :group 'tramp
  :type 'string
  :version "24.4")

86
;;;###tramp-autoload
87
(defcustom tramp-smb-conf "/dev/null"
88
  "Path of the smb.conf file.
89 90 91 92 93
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)))

94
(defvar tramp-smb-version nil
95
  "Version string of the SMB client.")
96

Michael Albinus's avatar
Michael Albinus committed
97 98 99 100 101 102 103 104 105 106 107 108
(defconst tramp-smb-server-version
  "Domain=\\[[^]]*\\] OS=\\[[^]]*\\] Server=\\[[^]]*\\]"
  "Regexp of SMB server identification.")

(defconst tramp-smb-prompt "^\\(smb:\\|PS\\) .+> \\|^\\s-+Server\\s-+Comment$"
  "Regexp used as prompt in smbclient or powershell.")

(defconst tramp-smb-wrong-passwd-regexp
  (regexp-opt
   '("NT_STATUS_LOGON_FAILURE"
     "NT_STATUS_WRONG_PASSWORD"))
  "Regexp for login error strings of SMB servers.")
109 110 111 112

(defconst tramp-smb-errors
  (mapconcat
   'identity
113 114
   `(;; Connection error / timeout / unknown command.
     "Connection\\( to \\S-+\\)? failed"
115
     "Read from server failed, maybe it closed the connection"
116
     "Call timed out: server did not respond"
117
     "\\S-+: command not found"
118
     "Server doesn’t support UNIX CIFS calls"
119 120 121 122 123 124 125 126 127 128 129 130
     ,(regexp-opt
       '(;; Samba.
	 "ERRDOS"
	 "ERRHRD"
	 "ERRSRV"
	 "ERRbadfile"
	 "ERRbadpw"
	 "ERRfilexists"
	 "ERRnoaccess"
	 "ERRnomem"
	 "ERRnosuchshare"
	 ;; Windows 4.0 (Windows NT), Windows 5.0 (Windows 2000),
131 132
	 ;; Windows 5.1 (Windows XP), Windows 5.2 (Windows Server 2003),
	 ;; Windows 6.0 (Windows Vista), Windows 6.1 (Windows 7).
133 134 135 136 137 138 139 140
	 "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"
141
	 "NT_STATUS_HOST_UNREACHABLE"
142
	 "NT_STATUS_IMAGE_ALREADY_LOADED"
143
	 "NT_STATUS_INVALID_LEVEL"
144 145 146 147
	 "NT_STATUS_IO_TIMEOUT"
	 "NT_STATUS_LOGON_FAILURE"
	 "NT_STATUS_NETWORK_ACCESS_DENIED"
	 "NT_STATUS_NOT_IMPLEMENTED"
148
	 "NT_STATUS_NO_LOGON_SERVERS"
149 150 151 152 153 154 155 156 157
	 "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")))
158 159 160 161
   "\\|")
  "Regexp for possible error strings of SMB servers.
Used instead of analyzing error codes of commands.")

162 163 164 165 166 167 168 169 170 171
(defconst tramp-smb-actions-with-share
  '((tramp-smb-prompt tramp-action-succeed)
    (tramp-password-prompt-regexp tramp-action-password)
    (tramp-wrong-passwd-regexp tramp-action-permission-denied)
    (tramp-smb-errors tramp-action-permission-denied)
    (tramp-process-alive-regexp tramp-action-process-alive))
  "List of pattern/action pairs.
This list is used for login to SMB servers.

See `tramp-actions-before-shell' for more info.")
172

173 174 175 176 177 178 179
(defconst tramp-smb-actions-without-share
  '((tramp-password-prompt-regexp tramp-action-password)
    (tramp-wrong-passwd-regexp tramp-action-permission-denied)
    (tramp-smb-errors tramp-action-permission-denied)
    (tramp-process-alive-regexp tramp-action-out-of-band))
  "List of pattern/action pairs.
This list is used for login to SMB servers.
180

181
See `tramp-actions-before-shell' for more info.")
182

Michael Albinus's avatar
Michael Albinus committed
183 184 185 186 187 188 189 190 191 192
(defconst tramp-smb-actions-with-tar
  '((tramp-password-prompt-regexp tramp-action-password)
    (tramp-wrong-passwd-regexp tramp-action-permission-denied)
    (tramp-smb-errors tramp-action-permission-denied)
    (tramp-process-alive-regexp tramp-smb-action-with-tar))
  "List of pattern/action pairs.
This list is used for tar-like copy of directories.

See `tramp-actions-before-shell' for more info.")

Michael Albinus's avatar
Michael Albinus committed
193
(defconst tramp-smb-actions-get-acl
194 195 196
  '((tramp-password-prompt-regexp tramp-action-password)
    (tramp-wrong-passwd-regexp tramp-action-permission-denied)
    (tramp-smb-errors tramp-action-permission-denied)
Michael Albinus's avatar
Michael Albinus committed
197 198 199 200 201 202 203 204 205 206 207
    (tramp-process-alive-regexp tramp-smb-action-get-acl))
  "List of pattern/action pairs.
This list is used for smbcacls actions.

See `tramp-actions-before-shell' for more info.")

(defconst tramp-smb-actions-set-acl
  '((tramp-password-prompt-regexp tramp-action-password)
    (tramp-wrong-passwd-regexp tramp-action-permission-denied)
    (tramp-smb-errors tramp-action-permission-denied)
    (tramp-process-alive-regexp tramp-smb-action-set-acl))
208 209 210 211 212
  "List of pattern/action pairs.
This list is used for smbcacls actions.

See `tramp-actions-before-shell' for more info.")

213 214
;; New handlers should be added here.
(defconst tramp-smb-file-name-handler-alist
Michael Albinus's avatar
Michael Albinus committed
215
  '(;; `access-file' performed by default handler.
216
    (add-name-to-file . tramp-smb-handle-add-name-to-file)
217 218
    ;; `byte-compiler-base-file-name' performed by default handler.
    (copy-directory . tramp-smb-handle-copy-directory)
219 220 221
    (copy-file . tramp-smb-handle-copy-file)
    (delete-directory . tramp-smb-handle-delete-directory)
    (delete-file . tramp-smb-handle-delete-file)
222
    ;; `diff-latest-backup-file' performed by default handler.
223
    (directory-file-name . tramp-handle-directory-file-name)
224
    (directory-files . tramp-smb-handle-directory-files)
225
    (directory-files-and-attributes
226
     . tramp-handle-directory-files-and-attributes)
227 228
    (dired-call-process . ignore)
    (dired-compress-file . ignore)
229
    (dired-uncache . tramp-handle-dired-uncache)
230
    (expand-file-name . tramp-smb-handle-expand-file-name)
231
    (file-accessible-directory-p . tramp-smb-handle-file-directory-p)
232
    (file-acl . tramp-smb-handle-file-acl)
233 234
    (file-attributes . tramp-smb-handle-file-attributes)
    (file-directory-p .  tramp-smb-handle-file-directory-p)
Michael Albinus's avatar
Michael Albinus committed
235
    ;; `file-equal-p' performed by default handler.
236 237
    (file-executable-p . tramp-handle-file-exists-p)
    (file-exists-p . tramp-handle-file-exists-p)
Michael Albinus's avatar
Michael Albinus committed
238
    ;; `file-in-directory-p' performed by default handler.
239 240 241
    (file-local-copy . tramp-smb-handle-file-local-copy)
    (file-modes . tramp-handle-file-modes)
    (file-name-all-completions . tramp-smb-handle-file-name-all-completions)
242
    (file-name-as-directory . tramp-handle-file-name-as-directory)
243 244 245
    (file-name-completion . tramp-handle-file-name-completion)
    (file-name-directory . tramp-handle-file-name-directory)
    (file-name-nondirectory . tramp-handle-file-name-nondirectory)
246
    ;; `file-name-sans-versions' performed by default handler.
247
    (file-newer-than-file-p . tramp-handle-file-newer-than-file-p)
248
    (file-notify-add-watch . tramp-handle-file-notify-add-watch)
Michael Albinus's avatar
Michael Albinus committed
249
    (file-notify-rm-watch . tramp-handle-file-notify-rm-watch)
250
    (file-ownership-preserved-p . ignore)
251
    (file-readable-p . tramp-handle-file-exists-p)
252
    (file-regular-p . tramp-handle-file-regular-p)
Michael Albinus's avatar
Michael Albinus committed
253 254
    (file-remote-p . tramp-handle-file-remote-p)
    ;; `file-selinux-context' performed by default handler.
255
    (file-symlink-p . tramp-handle-file-symlink-p)
256
    ;; `file-truename' performed by default handler.
257
    (file-writable-p . tramp-smb-handle-file-writable-p)
258
    (find-backup-file-name . tramp-handle-find-backup-file-name)
259 260
    ;; `find-file-noselect' performed by default handler.
    ;; `get-file-buffer' performed by default handler.
261 262 263
    (insert-directory . tramp-smb-handle-insert-directory)
    (insert-file-contents . tramp-handle-insert-file-contents)
    (load . tramp-handle-load)
264
    (make-auto-save-file-name . tramp-handle-make-auto-save-file-name)
265 266
    (make-directory . tramp-smb-handle-make-directory)
    (make-directory-internal . tramp-smb-handle-make-directory-internal)
267
    (make-symbolic-link . tramp-smb-handle-make-symbolic-link)
Michael Albinus's avatar
Michael Albinus committed
268
    (process-file . tramp-smb-handle-process-file)
269
    (rename-file . tramp-smb-handle-rename-file)
270
    (set-file-acl . tramp-smb-handle-set-file-acl)
271
    (set-file-modes . tramp-smb-handle-set-file-modes)
272
    (set-file-selinux-context . ignore)
273
    (set-file-times . ignore)
Michael Albinus's avatar
Michael Albinus committed
274
    (set-visited-file-modtime . tramp-handle-set-visited-file-modtime)
Michael Albinus's avatar
Michael Albinus committed
275 276
    (shell-command . tramp-handle-shell-command)
    (start-file-process . tramp-smb-handle-start-file-process)
Michael Albinus's avatar
Michael Albinus committed
277
    (substitute-in-file-name . tramp-smb-handle-substitute-in-file-name)
278
    (unhandled-file-name-directory . tramp-handle-unhandled-file-name-directory)
279
    (vc-registered . ignore)
Michael Albinus's avatar
Michael Albinus committed
280 281
    (verify-visited-file-modtime . tramp-handle-verify-visited-file-modtime)
    (write-region . tramp-smb-handle-write-region))
282 283 284
  "Alist of handler functions for Tramp SMB method.
Operations not mentioned here will be handled by the default Emacs primitives.")

Michael Albinus's avatar
Michael Albinus committed
285
;; Options for remote processes via winexe.
286
;;;###tramp-autoload
Michael Albinus's avatar
Michael Albinus committed
287 288 289 290 291 292
(defcustom tramp-smb-winexe-program "winexe"
  "Name of winexe client to run.
If it isn't found in the local $PATH, the absolute path of winexe
shall be given.  This is needed for remote processes."
  :group 'tramp
  :type 'string
293
  :version "24.3")
Michael Albinus's avatar
Michael Albinus committed
294

295
;;;###tramp-autoload
Michael Albinus's avatar
Michael Albinus committed
296 297 298 299 300
(defcustom tramp-smb-winexe-shell-command "powershell.exe"
  "Shell to be used for processes on remote machines.
This must be Powershell V2 compatible."
  :group 'tramp
  :type 'string
301
  :version "24.3")
Michael Albinus's avatar
Michael Albinus committed
302

303
;;;###tramp-autoload
Michael Albinus's avatar
Michael Albinus committed
304 305 306 307 308
(defcustom tramp-smb-winexe-shell-command-switch "-file -"
  "Command switch used together with `tramp-smb-winexe-shell-command'.
This can be used to disable echo etc."
  :group 'tramp
  :type 'string
309
  :version "24.3")
Michael Albinus's avatar
Michael Albinus committed
310

311 312
;; It must be a `defsubst' in order to push the whole code into
;; tramp-loaddefs.el.  Otherwise, there would be recursive autoloading.
313 314
;;;###tramp-autoload
(defsubst tramp-smb-file-name-p (filename)
315
  "Check if it's a filename for SMB servers."
Michael Albinus's avatar
Michael Albinus committed
316 317
  (string= (tramp-file-name-method (tramp-dissect-file-name filename))
	   tramp-smb-method))
318

319
;;;###tramp-autoload
320 321 322 323 324 325
(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
pass to the OPERATION."
  (let ((fn (assoc operation tramp-smb-file-name-handler-alist)))
    (if fn
326
	(save-match-data (apply (cdr fn) args))
327 328
      (tramp-run-real-handler operation args))))

329 330 331 332
;;;###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)))
333 334


335 336
;; File name primitives.

337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366
(defun tramp-smb-handle-add-name-to-file
  (filename newname &optional ok-if-already-exists)
  "Like `add-name-to-file' for Tramp files."
  (unless (tramp-equal-remote filename newname)
    (with-parsed-tramp-file-name
	(if (tramp-tramp-file-p filename) filename newname) nil
      (tramp-error
       v 'file-error
       "add-name-to-file: %s"
       "only implemented for same method, same user, same host")))
  (with-parsed-tramp-file-name filename v1
    (with-parsed-tramp-file-name newname v2
      (when (file-directory-p filename)
	(tramp-error
	 v2 'file-error
	 "add-name-to-file: %s must not be a directory" filename))
      (when (and (not ok-if-already-exists)
		 (file-exists-p newname)
		 (not (numberp ok-if-already-exists))
		 (y-or-n-p
		  (format
		   "File %s already exists; make it a new name anyway? "
		   newname)))
	(tramp-error
	 v2 'file-error
	 "add-name-to-file: file %s already exists" newname))
      ;; We must also flush the cache of the directory, because
      ;; `file-attributes' reads the values from there.
      (tramp-flush-file-property v2 (file-name-directory v2-localname))
      (tramp-flush-file-property v2 v2-localname)
367 368 369 370 371 372 373 374 375 376
      (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
377
	 "error with add-name-to-file, see buffer ‘%s’ for details"
378
	 (buffer-name))))))
379

Michael Albinus's avatar
Michael Albinus committed
380 381 382 383 384 385 386 387 388 389 390 391 392 393 394
(defun tramp-smb-action-with-tar (proc vec)
  "Untar from connection buffer."
  (if (not (memq (process-status proc) '(run open)))
      (throw 'tramp-action 'process-died)

    (with-current-buffer (tramp-get-connection-buffer vec)
      (goto-char (point-min))
      (when (search-forward-regexp tramp-smb-server-version nil t)
	;; There might be a hidden password prompt.
	(widen)
	(forward-line)
	(tramp-message vec 6 (buffer-substring (point-min) (point)))
	(delete-region (point-min) (point))
	(throw 'tramp-action 'ok)))))

395
(defun tramp-smb-handle-copy-directory
396
  (dirname newname &optional keep-date parents copy-contents)
Michael Albinus's avatar
Michael Albinus committed
397
  "Like `copy-directory' for Tramp files."
398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419
  (if copy-contents
      ;; We must do it file-wise.
      (tramp-run-real-handler
       'copy-directory (list dirname newname keep-date parents copy-contents))

    (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
	(with-tramp-progress-reporter
	    v 0 (format "Copying %s to %s" dirname newname)
	  (cond
	   ;; We must use a local temporary directory.
	   ((and t1 t2)
	    (let ((tmpdir
		   (make-temp-name
		    (expand-file-name
		     tramp-temp-name-prefix
		     (tramp-compat-temporary-file-directory)))))
	      (unwind-protect
		  (progn
420
		    (make-directory tmpdir)
421
		    (tramp-compat-copy-directory
422
		     dirname tmpdir keep-date 'parents)
423
		    (tramp-compat-copy-directory
424 425
		     (expand-file-name (file-name-nondirectory dirname) tmpdir)
		     newname keep-date parents))
426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455
		(tramp-compat-delete-directory tmpdir 'recursive))))

	   ;; We can copy recursively.
	   ((or t1 t2)
	    (when (and (file-directory-p newname)
		       (not (string-equal (file-name-nondirectory dirname)
					  (file-name-nondirectory newname))))
	      (setq newname
		    (expand-file-name
		     (file-name-nondirectory dirname) newname))
	      (if t2 (setq v (tramp-dissect-file-name newname))))
	    (if (not (file-directory-p newname))
		(make-directory newname parents))

	    (setq tramp-current-method (tramp-file-name-method v)
		  tramp-current-user (tramp-file-name-user v)
		  tramp-current-host (tramp-file-name-real-host v))

	    (let* ((real-user (tramp-file-name-real-user v))
		   (real-host (tramp-file-name-real-host v))
		   (domain    (tramp-file-name-domain v))
		   (port      (tramp-file-name-port v))
		   (share     (tramp-smb-get-share v))
		   (localname (file-name-as-directory
			       (tramp-compat-replace-regexp-in-string
				"\\\\" "/" (tramp-smb-get-localname v))))
		   (tmpdir    (make-temp-name
			       (expand-file-name
				tramp-temp-name-prefix
				(tramp-compat-temporary-file-directory))))
456
		   (args      (list (concat "//" real-host "/" share) "-E")))
457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502

	      (if (not (zerop (length real-user)))
		  (setq args (append args (list "-U" real-user)))
		(setq args (append args (list "-N"))))

	      (when domain (setq args (append args (list "-W" domain))))
	      (when port   (setq args (append args (list "-p" port))))
	      (when tramp-smb-conf
		(setq args (append args (list "-s" tramp-smb-conf))))
	      (setq args
		    (if t1
			;; Source is remote.
			(append args
				(list "-D" (shell-quote-argument localname)
				      "-c" (shell-quote-argument "tar qc - *")
				      "|" "tar" "xfC" "-"
				      (shell-quote-argument tmpdir)))
		      ;; Target is remote.
		      (append (list "tar" "cfC" "-"
				    (shell-quote-argument dirname) "." "|")
			      args
			      (list "-D" (shell-quote-argument localname)
				    "-c" (shell-quote-argument "tar qx -")))))

	      (unwind-protect
		  (with-temp-buffer
		    ;; Set the transfer process properties.
		    (tramp-set-connection-property
		     v "process-name" (buffer-name (current-buffer)))
		    (tramp-set-connection-property
		     v "process-buffer" (current-buffer))

		    (when t1
		      ;; The smbclient tar command creates always
		      ;; complete paths.  We must emulate the
		      ;; directory structure, and symlink to the real
		      ;; target.
		      (make-directory
		       (expand-file-name
			".." (concat tmpdir localname)) 'parents)
		      (make-symbolic-link
		       newname (directory-file-name (concat tmpdir localname))))

		    ;; Use an asynchronous processes.  By this,
		    ;; password can be handled.
		    (let* ((default-directory tmpdir)
503 504
			   (p (apply
			       'start-process
505 506
			       (tramp-get-connection-name v)
			       (tramp-get-connection-buffer v)
507
			       tramp-smb-program args)))
508 509 510 511 512 513 514 515 516 517 518 519 520 521

		      (tramp-message
		       v 6 "%s" (mapconcat 'identity (process-command p) " "))
		      (tramp-set-connection-property p "vector" v)
		      (tramp-compat-set-process-query-on-exit-flag p nil)
		      (tramp-process-actions p v nil tramp-smb-actions-with-tar)

		      (while (memq (process-status p) '(run open))
			(sit-for 0.1))
		      (tramp-message v 6 "\n%s" (buffer-string))))

		;; Reset the transfer process properties.
		(tramp-set-connection-property v "process-name" nil)
		(tramp-set-connection-property v "process-buffer" nil)
Michael Albinus's avatar
Michael Albinus committed
522
		(when t1 (tramp-compat-delete-directory tmpdir 'recurse))))
523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541

	    ;; Handle KEEP-DATE argument.
	    (when keep-date
	      (set-file-times newname (nth 5 (file-attributes dirname))))

	    ;; Set the mode.
	    (unless keep-date
	      (set-file-modes newname (tramp-default-file-modes dirname)))

	    ;; When newname did exist, we have wrong cached values.
	    (when t2
	      (with-parsed-tramp-file-name newname nil
		(tramp-flush-file-property v (file-name-directory localname))
		(tramp-flush-file-property v localname))))

	   ;; We must do it file-wise.
	   (t
	    (tramp-run-real-handler
	     'copy-directory (list dirname newname keep-date parents)))))))))
542 543

(defun tramp-smb-handle-copy-file
Michael Albinus's avatar
Michael Albinus committed
544
  (filename newname &optional ok-if-already-exists keep-date
545
	    _preserve-uid-gid _preserve-extended-attributes)
546
  "Like `copy-file' for Tramp files.
Michael Albinus's avatar
Michael Albinus committed
547
KEEP-DATE has no effect in case NEWNAME resides on an SMB server.
548
PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
549 550
  (setq filename (expand-file-name filename)
	newname (expand-file-name newname))
551
  (with-tramp-progress-reporter
Michael Albinus's avatar
Michael Albinus committed
552 553
      (tramp-dissect-file-name
       (if (tramp-tramp-file-p filename) filename newname))
554 555
      0 (format "Copying %s to %s" filename newname)

Michael Albinus's avatar
Michael Albinus committed
556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583
    (if (file-directory-p filename)
	(tramp-compat-copy-directory filename newname keep-date t t)

      (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-get-share v)
	      (tramp-error
584
	       v 'file-error "Target ‘%s’ must contain a share name" newname))
Michael Albinus's avatar
Michael Albinus committed
585 586 587
	    (unless (tramp-smb-send-command
		     v (format "put \"%s\" \"%s\""
			       filename (tramp-smb-get-localname v)))
588
	      (tramp-error
589
	       v 'file-error "Cannot copy ‘%s’ to ‘%s’" filename newname))))))
590

Michael Albinus's avatar
Michael Albinus committed
591 592 593
    ;; KEEP-DATE handling.
    (when keep-date
      (set-file-times newname (nth 5 (file-attributes filename))))))
594

595
(defun tramp-smb-handle-delete-directory (directory &optional recursive)
596
  "Like `delete-directory' for Tramp files."
597
  (setq directory (directory-file-name (expand-file-name directory)))
Michael Albinus's avatar
Michael Albinus committed
598
  (when (file-exists-p directory)
599 600 601 602
    (if recursive
	(mapc
	 (lambda (file)
	   (if (file-directory-p file)
603
	       (tramp-compat-delete-directory file recursive)
604
	     (delete-file file)))
605 606 607
	 ;; We do not want to delete "." and "..".
	 (directory-files
	  directory 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")))
608

Michael Albinus's avatar
Michael Albinus committed
609
    (with-parsed-tramp-file-name directory nil
610
      ;; We must also flush the cache of the directory, because
611
      ;; `file-attributes' reads the values from there.
612 613
      (tramp-flush-file-property v (file-name-directory localname))
      (tramp-flush-directory-property v localname)
614 615 616 617 618 619 620 621 622 623
      (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
624
	   v 'file-error "%s ‘%s’" (match-string 0) directory))))))
625

626
(defun tramp-smb-handle-delete-file (filename &optional _trash)
627
  "Like `delete-file' for Tramp files."
628
  (setq filename (expand-file-name filename))
Michael Albinus's avatar
Michael Albinus committed
629 630
  (when (file-exists-p filename)
    (with-parsed-tramp-file-name filename nil
631
      ;; We must also flush the cache of the directory, because
632
      ;; `file-attributes' reads the values from there.
633 634
      (tramp-flush-file-property v (file-name-directory localname))
      (tramp-flush-file-property v localname)
635 636 637 638 639 640 641 642 643 644
      (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
645
	   v 'file-error "%s ‘%s’" (match-string 0) filename))))))
646 647 648

(defun tramp-smb-handle-directory-files
  (directory &optional full match nosort)
649 650
  "Like `directory-files' for Tramp files."
  (let ((result (mapcar 'directory-file-name
651 652
			(file-name-all-completions "" directory)))
	res)
653
    ;; Discriminate with regexp.
654 655 656 657 658
    (when match
      (setq result
	    (delete nil
		    (mapcar (lambda (x) (when (string-match match x) x))
			    result))))
659
    ;; Append directory.
660 661 662
    (when full
      (setq result
	    (mapcar
663
	     (lambda (x) (format "%s/%s" directory x))
664
	     result)))
665
    ;; Sort them if necessary.
666
    (unless nosort (setq result (sort result 'string-lessp)))
667 668 669
    ;; Remove double entries.
    (dolist (elt result res)
      (add-to-list 'res elt 'append))))
670

671 672 673 674 675 676 677 678 679 680 681 682 683
(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 "/".
  (setq dir (or dir default-directory "/"))
  ;; Unless NAME is absolute, concat DIR and NAME.
  (unless (file-name-absolute-p name)
    (setq name (concat (file-name-as-directory dir) name)))
  ;; If NAME is not a Tramp file, run the real handler.
  (if (not (tramp-tramp-file-p name))
      (tramp-run-real-handler 'expand-file-name (list name nil))
    ;; Dissect NAME.
    (with-parsed-tramp-file-name name nil
      ;; Tilde expansion if necessary.  We use the user name as share,
Paul Eggert's avatar
Paul Eggert committed
684
      ;; which is often the case in domains.
685
      (when (string-match "\\`/?~\\([^/]*\\)" localname)
686 687
	(setq localname
	      (replace-match
688
	       (if (zerop (length (match-string 1 localname)))
689
		   (tramp-file-name-real-user v)
690
		 (match-string 1 localname))
691
	       nil nil localname)))
692 693 694
      ;; Make the file name absolute.
      (unless (tramp-run-real-handler 'file-name-absolute-p (list localname))
	(setq localname (concat "/" localname)))
695 696 697 698 699 700
      ;; No tilde characters in file name, do normal
      ;; `expand-file-name' (this does "/./" and "/../").
      (tramp-make-tramp-file-name
       method user host
       (tramp-run-real-handler 'expand-file-name (list localname))))))

Michael Albinus's avatar
Michael Albinus committed
701
(defun tramp-smb-action-get-acl (proc vec)
702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718
  "Read ACL data from connection buffer."
  (when (not (memq (process-status proc) '(run open)))
    ;; Accept pending output.
    (while (tramp-accept-process-output proc 0.1))
    (with-current-buffer (tramp-get-connection-buffer vec)
      ;; There might be a hidden password prompt.
      (widen)
      (tramp-message vec 10 "\n%s" (buffer-string))
      (goto-char (point-min))
      (while (and (not (eobp)) (not (looking-at "^REVISION:")))
	(forward-line)
	(delete-region (point-min) (point)))
      (while (and (not (eobp)) (looking-at "^.+:.+"))
 	(forward-line))
      (delete-region (point) (point-max))
      (throw 'tramp-action 'ok))))

719 720 721 722
(defun tramp-smb-handle-file-acl (filename)
  "Like `file-acl' for Tramp files."
  (with-parsed-tramp-file-name filename nil
    (with-tramp-file-property v localname "file-acl"
723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767
      (when (executable-find tramp-smb-acl-program)

	(setq tramp-current-method (tramp-file-name-method v)
	      tramp-current-user (tramp-file-name-user v)
	      tramp-current-host (tramp-file-name-real-host v))

	(let* ((real-user (tramp-file-name-real-user v))
	       (real-host (tramp-file-name-real-host v))
	       (domain    (tramp-file-name-domain v))
	       (port      (tramp-file-name-port v))
	       (share     (tramp-smb-get-share v))
	       (localname (tramp-compat-replace-regexp-in-string
			   "\\\\" "/" (tramp-smb-get-localname v)))
	       (args      (list (concat "//" real-host "/" share) "-E")))

	  (if (not (zerop (length real-user)))
	      (setq args (append args (list "-U" real-user)))
	    (setq args (append args (list "-N"))))

	  (when domain (setq args (append args (list "-W" domain))))
	  (when port   (setq args (append args (list "-p" port))))
	  (when tramp-smb-conf
	    (setq args (append args (list "-s" tramp-smb-conf))))
	  (setq
	   args
	   (append args (list (shell-quote-argument localname) "2>/dev/null")))

	  (unwind-protect
	      (with-temp-buffer
		;; Set the transfer process properties.
		(tramp-set-connection-property
		 v "process-name" (buffer-name (current-buffer)))
		(tramp-set-connection-property
		 v "process-buffer" (current-buffer))

		;; Use an asynchronous processes.  By this, password
		;; can be handled.
		(let ((p (apply
			  'start-process
			  (tramp-get-connection-name v)
			  (tramp-get-connection-buffer v)
			  tramp-smb-acl-program args)))

		  (tramp-message
		   v 6 "%s" (mapconcat 'identity (process-command p) " "))
Michael Albinus's avatar
Michael Albinus committed
768
		  (tramp-set-connection-property p "vector" v)
769
		  (tramp-compat-set-process-query-on-exit-flag p nil)
Michael Albinus's avatar
Michael Albinus committed
770
		  (tramp-process-actions p v nil tramp-smb-actions-get-acl)
771 772 773 774 775 776 777
		  (when (> (point-max) (point-min))
		    (tramp-compat-funcall
		     'substring-no-properties (buffer-string)))))

	    ;; Reset the transfer process properties.
	    (tramp-set-connection-property v "process-name" nil)
	    (tramp-set-connection-property v "process-buffer" nil)))))))
778

779
(defun tramp-smb-handle-file-attributes (filename &optional id-format)
780
  "Like `file-attributes' for Tramp files."
781
  (unless id-format (setq id-format 'integer))
782 783
  (ignore-errors
    (with-parsed-tramp-file-name filename nil
784 785
      (with-tramp-file-property
	  v localname (format "file-attributes-%s" id-format)
786
	(if (tramp-smb-get-stat-capability v)
787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816
	    (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
	  ;; other versions don't.  Therefore, the whole content of the
	  ;; upper directory is retrieved, and the entry of the filename
	  ;; is extracted from.
	  (let* ((entries (tramp-smb-get-file-entries
			   (file-name-directory filename)))
		 (entry (assoc (file-name-nondirectory filename) entries))
		 (uid (if (equal id-format 'string) "nobody" -1))
		 (gid (if (equal id-format 'string) "nogroup" -1))
		 (inode (tramp-get-inode v))
		 (device (tramp-get-device v)))

	    ;; Check result.
	    (when entry
	      (list (and (string-match "d" (nth 1 entry))
			 t)        ;0 file type
		    -1	           ;1 link count
		    uid	           ;2 uid
		    gid	           ;3 gid
		    '(0 0)	   ;4 atime
		    (nth 3 entry)  ;5 mtime
		    '(0 0)	   ;6 ctime
		    (nth 2 entry)  ;7 size
		    (nth 1 entry)  ;8 mode
		    nil	           ;9 gid weird
		    inode	   ;10 inode number
		    device)))))))) ;11 file system number
817

818
(defun tramp-smb-do-file-attributes-with-stat (vec &optional id-format)
819
  "Implement `file-attributes' for Tramp files using stat command."
820 821
  (tramp-message
   vec 5 "file attributes with stat: %s" (tramp-file-name-localname vec))
Michael Albinus's avatar
Michael Albinus committed
822
  (with-current-buffer (tramp-get-connection-buffer vec)
823
    (let* (size id link uid gid atime mtime ctime mode inode)
824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881
      (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
	     ((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)))))))
882 883

(defun tramp-smb-handle-file-directory-p (filename)
884 885 886
  "Like `file-directory-p' for Tramp files."
  (and (file-exists-p filename)
       (eq ?d (aref (nth 8 (file-attributes filename)) 0))))
887 888

(defun tramp-smb-handle-file-local-copy (filename)
889
  "Like `file-local-copy' for Tramp files."
890
  (with-parsed-tramp-file-name filename nil
891 892 893
    (unless (file-exists-p filename)
      (tramp-error
       v 'file-error
894
       "Cannot make local copy of non-existing file ‘%s’" filename))
895
    (let ((tmpfile (tramp-compat-make-temp-file filename)))
896
      (with-tramp-progress-reporter
897 898 899 900 901
	  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.
902
	  (delete-file tmpfile)
903
	  (tramp-error
904
	   v 'file-error "Cannot make local copy of file ‘%s’" filename)))
905
      tmpfile)))
906 907 908 909

;; This function should return "foo/" for directories and "bar" for
;; files.
(defun tramp-smb-handle-file-name-all-completions (filename directory)
910 911 912 913
  "Like `file-name-all-completions' for Tramp files."
  (all-completions
   filename
   (with-parsed-tramp-file-name directory nil
914
     (with-tramp-file-property v localname "file-name-all-completions"
915 916
       (save-match-data
	 (let ((entries (tramp-smb-get-file-entries directory)))
917 918 919 920 921 922 923 924 925
	   (mapcar
	    (lambda (x)
	      (list
	       (if (string-match "d" (nth 1 x))
		   (file-name-as-directory (nth 0 x))
		 (nth 0 x))))
	    entries)))))))

(defun tramp-smb-handle-file-writable-p (filename)
926 927 928 929 930 931
  "Like `file-writable-p' for Tramp files."
  (if (file-exists-p filename)
      (string-match "w" (or (nth 8 (file-attributes filename)) ""))
    (let ((dir (file-name-directory filename)))
      (and (file-exists-p dir)
	   (file-writable-p dir)))))
932 933 934

(defun tramp-smb-handle-insert-directory
  (filename switches &optional wildcard full-directory-p)
935
  "Like `insert-directory' for Tramp files."
936
  (setq filename (expand-file-name filename))
937
  (unless switches (setq switches ""))
938 939 940 941
  ;; Mark trailing "/".
  (when (and (zerop (length (file-name-nondirectory filename)))
	     (not full-directory-p))
    (setq switches (concat switches "F")))
942 943 944 945
  (if full-directory-p
      ;; Called from `dired-add-entry'.
      (setq filename (file-name-as-directory filename))
    (setq filename (directory-file-name filename)))
Michael Albinus's avatar
Michael Albinus committed
946
  (with-parsed-tramp-file-name filename nil
947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984
    (with-tramp-progress-reporter v 0 (format "Opening directory %s" filename)
      (save-match-data
	(let ((base (file-name-nondirectory filename))
	      ;; We should not destroy the cache entry.
	      (entries (copy-sequence
			(tramp-smb-get-file-entries
			 (file-name-directory filename)))))

	  (when wildcard
	    (string-match "\\." base)
	    (setq base (replace-match "\\\\." nil nil base))
	    (string-match "\\*" base)
	    (setq base (replace-match ".*" nil nil base))
	    (string-match "\\?" base)
	    (setq base (replace-match ".?" nil nil base)))

	  ;; Filter entries.
	  (setq entries
		(delq
		 nil
		 (if (or wildcard (zerop (length base)))
		     ;; Check for matching entries.
		     (mapcar
		      (lambda (x)
			(when (string-match
			       (format "^%s" base) (nth 0 x))
			  x))
		      entries)
		   ;; We just need the only and only entry FILENAME.
		   (list (assoc base entries)))))

	  ;; Sort entries.
	  (setq entries
		(sort
		 entries
		 (lambda (x y)
		   (if (string-match "t" switches)
		       ;; Sort by date.
985
		       (time-less-p (nth 3 y) (nth 3 x))
986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001
		     ;; Sort by name.
		     (string-lessp (nth 0 x) (nth 0 y))))))

	  ;; Handle "-F" switch.
	  (when (string-match "F" switches)
	    (mapc
	     (lambda (x)
	       (when (not (zerop (length (car x))))
		 (cond
		  ((char-equal ?d (string-to-char (nth 1 x)))
		   (setcar x (concat (car x) "/")))
		  ((char-equal ?x (string-to-char (nth 1 x)))
		   (setcar x (concat (car x) "*"))))))
	     entries))

	  ;; Print entries.
1002
	  (mapc
Michael Albinus's avatar
Michael Albinus committed
1003
	   (lambda (x)
1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018
	     (when (not (zerop (length (nth 0 x))))
	       (when (string-match "l" switches)
		 (let ((attr
			(when (tramp-smb-get-stat-capability v)
			  (ignore-errors
			    (file-attributes filename 'string)))))
		   (insert
		    (format
		     "%10s %3d %-8s %-8s %8s %s "
		     (or (nth 8 attr) (nth 1 x)) ; mode
		     (or (nth 1 attr) 1) ; inode
		     (or (nth 2 attr) "nobody") ; uid
		     (or (nth 3 attr) "nogroup") ; gid
		     (or (nth 7 attr) (nth 2 x)) ; size
		     (format-time-string
1019
		      (if (time-less-p (time-subtract (current-time) (nth 3 x))
1020 1021 1022 1023 1024 1025 1026 1027 1028
			   tramp-half-a-year)
			  "%b %e %R"
			"%b %e  %Y")
		      (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)))
1029 1030
		 (insert
		  (format
1031 1032 1033 1034 1035 1036 1037 1038 1039
		   "%s\n"
		   (file-relative-name
		    (expand-file-name
		     (nth 0 x) (file-name-directory filename))
		    (when full-directory-p (file-name-directory filename)))))
		 (put-text-property start (1- (point)) 'dired-filename t))
	       (forward-line)
	       (beginning-of-line)))
	   entries))))))
1040 1041

(defun tramp-smb-handle-make-directory (dir &optional parents)
1042
  "Like `make-directory' for Tramp files."
1043 1044
  (setq dir (directory-file-name (expand-file-name dir)))
  (unless (file-name-absolute-p dir)
1045
    (setq dir (expand-file-name dir default-directory)))
Michael Albinus's avatar
Michael Albinus committed
1046
  (with-parsed-tramp-file-name dir nil
1047
    (save-match-data
1048
      (let* ((ldir (file-name-directory dir)))
1049
	;; Make missing directory parts.
1050 1051 1052
	(when (and parents
		   (tramp-smb-get-share v)
		   (not (file-directory-p ldir)))
1053
	  (make-directory ldir parents))
1054
	;; Just do it.
1055
	(when (file-directory-p ldir)
1056
	  (make-directory-internal dir))
1057
	(unless (file-directory-p dir)
1058
	  (tramp-error v 'file-error "Couldn’t make directory %s" dir))))))
1059 1060

(defun tramp-smb-handle-make-directory-internal (directory)
1061
  "Like `make-directory-internal' for Tramp files."
1062 1063
  (setq directory (directory-file-name (expand-file-name directory)))
  (unless (file-name-absolute-p directory)
1064
    (setq directory (expand-file-name directory default-directory)))
Michael Albinus's avatar
Michael Albinus committed
1065
  (with-parsed-tramp-file-name directory nil