annotate lisp/net/tramp-smb.el @ 110666:3b9bd3888ee9

nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r. nnimap.el (nnimap-find-article-by-message-id): Use EXAMINE instead of SELECT to get the message-id. gnus-art.el, gnus.el, nnimap.el: Fix up make-obsolete-variable declarations throughout. gnus.texi (Mail Source Specifiers): Remove webmail.el mentions. mail-source.el: Removed webmail support. nntp.el (nntp-server-list-active-group): Document. gnus.texi (NNTP): Document nntp-server-list-active-group. gnus.texi (Customizing the IMAP Connection): Remove extra quote. nnimap.el (nnimap-find-article-by-message-id): Really return the article number. nnimap.el: Add nnimap-split-fancy. netrc.el (netrc-credentials, netrc-machine): Return the value of the "default" entry. nnimap.el: Use tls.el exclusively, and not starttls.el at all. nnimap.el (nnimap-wait-for-connection): Accept the moronic openssl s_client -starttls output, too. nnrss.el (nnrss-use-local): Add documentation. message.el (message-ignored-supersedes-headers): Strip Injection-* headers before superseding. nnimap.el (nnimap-open-connection): Reinstate the auto-upgrade from unencrypted to STARTTLS, if possible. nnir.el: Use the server names without suffixes. gnus-sum.el (gnus-summary-show-thread): Skip past invisible text when expanding threads. gnus-registry.el: Don't follow nnmairix references. Install the nnregistry refer method. gnus.texi (Spam Package Configuration Examples, SpamOracle): Remove nnimap-split-rule from examples.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Fri, 01 Oct 2010 00:25:50 +0000
parents 4b26adbef9a2
children d6e88106c5b8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
82201
b3182f0c969c * net/tramp.el:
Michael Albinus <michael.albinus@gmx.de>
parents: 82140
diff changeset
1 ;;; tramp-smb.el --- Tramp access functions for SMB servers
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2
100857
51f12f881f02 * net/tramp-smb.el (top): Use `tramp-prefix-domain-regexp'.
Michael Albinus <michael.albinus@gmx.de>
parents: 99617
diff changeset
3 ;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 105897
diff changeset
4 ;; 2009, 2010 Free Software Foundation, Inc.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
5
60763
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 59996
diff changeset
6 ;; Author: Michael Albinus <michael.albinus@gmx.de>
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7 ;; Keywords: comm, processes
110015
280c8ae2476d Add "Package:" file headers to denote built-in packages.
Chong Yidong <cyd@stupidchicken.com>
parents: 108887
diff changeset
8 ;; Package: tramp
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
9
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
10 ;; This file is part of GNU Emacs.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
11
94677
91e5880a36c1 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
12 ;; GNU Emacs is free software: you can redistribute it and/or modify
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
13 ;; it under the terms of the GNU General Public License as published by
94677
91e5880a36c1 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
14 ;; the Free Software Foundation, either version 3 of the License, or
91e5880a36c1 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
15 ;; (at your option) any later version.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
16
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
17 ;; GNU Emacs is distributed in the hope that it will be useful,
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
20 ;; GNU General Public License for more details.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
21
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
22 ;; You should have received a copy of the GNU General Public License
94677
91e5880a36c1 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
24
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
25 ;;; Commentary:
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
26
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
27 ;; Access functions for SMB servers like SAMBA or M$ Windows from Tramp.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
28
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
29 ;;; Code:
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
30
96186
c66f10196d81 Require 'cl when compiling.
Glenn Morris <rgm@gnu.org>
parents: 94677
diff changeset
31 (eval-when-compile (require 'cl)) ; block, return
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
32 (require 'tramp)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
33
110321
4b26adbef9a2 Major code cleanup. Split tramp.el into tramp.el and tramp-sh.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 110264
diff changeset
34 ;; We call several `tramp-handle-*' functions directly. So we must
4b26adbef9a2 Major code cleanup. Split tramp.el into tramp.el and tramp-sh.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 110264
diff changeset
35 ;; reqire that package as well.
4b26adbef9a2 Major code cleanup. Split tramp.el into tramp.el and tramp-sh.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 110264
diff changeset
36 (require 'tramp-sh)
4b26adbef9a2 Major code cleanup. Split tramp.el into tramp.el and tramp-sh.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 110264
diff changeset
37
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
38 ;; Define SMB method ...
110264
ec526909f60b Migrate to Tramp 2.2. Rearrange load dependencies.
Michael Albinus <michael.albinus@gmx.de>
parents: 110015
diff changeset
39 ;;;###tramp-autoload
ec526909f60b Migrate to Tramp 2.2. Rearrange load dependencies.
Michael Albinus <michael.albinus@gmx.de>
parents: 110015
diff changeset
40 (defconst tramp-smb-method "smb"
ec526909f60b Migrate to Tramp 2.2. Rearrange load dependencies.
Michael Albinus <michael.albinus@gmx.de>
parents: 110015
diff changeset
41 "*Method to connect SAMBA and M$ SMB servers.")
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
42
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
43 ;; ... and add it to the method list.
110264
ec526909f60b Migrate to Tramp 2.2. Rearrange load dependencies.
Michael Albinus <michael.albinus@gmx.de>
parents: 110015
diff changeset
44 ;;;###tramp-autoload
ec526909f60b Migrate to Tramp 2.2. Rearrange load dependencies.
Michael Albinus <michael.albinus@gmx.de>
parents: 110015
diff changeset
45 (unless (memq system-type '(cygwin windows-nt))
ec526909f60b Migrate to Tramp 2.2. Rearrange load dependencies.
Michael Albinus <michael.albinus@gmx.de>
parents: 110015
diff changeset
46 (add-to-list 'tramp-methods (cons tramp-smb-method nil)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
47
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
48 ;; Add a default for `tramp-default-method-alist'. Rule: If there is
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
49 ;; a domain in USER, it must be the SMB method.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
50 (add-to-list 'tramp-default-method-alist
100857
51f12f881f02 * net/tramp-smb.el (top): Use `tramp-prefix-domain-regexp'.
Michael Albinus <michael.albinus@gmx.de>
parents: 99617
diff changeset
51 `(nil ,tramp-prefix-domain-regexp ,tramp-smb-method))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
52
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
53 ;; Add a default for `tramp-default-user-alist'. Rule: For the SMB method,
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
54 ;; the anonymous user is chosen.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
55 (add-to-list 'tramp-default-user-alist
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
56 `(,tramp-smb-method nil ""))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
57
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
58 ;; Add completion function for SMB method.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
59 (tramp-set-completion-function
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
60 tramp-smb-method
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
61 '((tramp-parse-netrc "~/.netrc")))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
62
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
63 (defcustom tramp-smb-program "smbclient"
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
64 "*Name of SMB client to run."
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
65 :group 'tramp
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
66 :type 'string)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
67
106959
5071660bbec4 * net/tramp-smb.el (tramp-smb-conf): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 106815
diff changeset
68 (defcustom tramp-smb-conf "/dev/null"
5071660bbec4 * net/tramp-smb.el (tramp-smb-conf): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 106815
diff changeset
69 "*Path of the smb.conf file.
5071660bbec4 * net/tramp-smb.el (tramp-smb-conf): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 106815
diff changeset
70 If it is nil, no smb.conf will be added to the `tramp-smb-program'
5071660bbec4 * net/tramp-smb.el (tramp-smb-conf): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 106815
diff changeset
71 call, letting the SMB client use the default one."
5071660bbec4 * net/tramp-smb.el (tramp-smb-conf): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 106815
diff changeset
72 :group 'tramp
5071660bbec4 * net/tramp-smb.el (tramp-smb-conf): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 106815
diff changeset
73 :type '(choice (const nil) (file :must-match t)))
5071660bbec4 * net/tramp-smb.el (tramp-smb-conf): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 106815
diff changeset
74
105634
75fb0870b7e0 * net/tramp-smb.el (tramp-smb-version): New defvar.
Michael Albinus <michael.albinus@gmx.de>
parents: 105616
diff changeset
75 (defvar tramp-smb-version nil
75fb0870b7e0 * net/tramp-smb.el (tramp-smb-version): New defvar.
Michael Albinus <michael.albinus@gmx.de>
parents: 105616
diff changeset
76 "*Version string of the SMB client.")
75fb0870b7e0 * net/tramp-smb.el (tramp-smb-version): New defvar.
Michael Albinus <michael.albinus@gmx.de>
parents: 105616
diff changeset
77
60763
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 59996
diff changeset
78 (defconst tramp-smb-prompt "^smb: .+> \\|^\\s-+Server\\s-+Comment$"
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
79 "Regexp used as prompt in smbclient.")
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
80
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
81 (defconst tramp-smb-errors
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
82 ;; `regexp-opt' not possible because of first string.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
83 (mapconcat
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
84 'identity
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
85 '(;; Connection error / timeout / unknown command.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
86 "Connection to \\S-+ failed"
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
87 "Read from server failed, maybe it closed the connection"
84739
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 82201
diff changeset
88 "Call timed out: server did not respond"
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
89 "\\S-+: command not found"
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
90 "Server doesn't support UNIX CIFS calls"
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
91 ;; Samba.
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
92 "ERRDOS"
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
93 "ERRHRD"
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
94 "ERRSRV"
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
95 "ERRbadfile"
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
96 "ERRbadpw"
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
97 "ERRfilexists"
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
98 "ERRnoaccess"
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
99 "ERRnomem"
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
100 "ERRnosuchshare"
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
101 ;; Windows 4.0 (Windows NT), Windows 5.0 (Windows 2000),
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
102 ;; Windows 5.1 (Windows XP), Windows 5.2 (Windows Server 2003).
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
103 "NT_STATUS_ACCESS_DENIED"
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
104 "NT_STATUS_ACCOUNT_LOCKED_OUT"
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
105 "NT_STATUS_BAD_NETWORK_NAME"
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
106 "NT_STATUS_CANNOT_DELETE"
105354
5077632c39ef * net/tramp-smb.el (tramp-smb-errors): Add error message for
Michael Albinus <michael.albinus@gmx.de>
parents: 105276
diff changeset
107 "NT_STATUS_CONNECTION_REFUSED"
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
108 "NT_STATUS_DIRECTORY_NOT_EMPTY"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
109 "NT_STATUS_DUPLICATE_NAME"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
110 "NT_STATUS_FILE_IS_A_DIRECTORY"
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
111 "NT_STATUS_LOGON_FAILURE"
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
112 "NT_STATUS_NETWORK_ACCESS_DENIED"
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
113 "NT_STATUS_NOT_IMPLEMENTED"
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
114 "NT_STATUS_NO_SUCH_FILE"
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
115 "NT_STATUS_OBJECT_NAME_COLLISION"
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
116 "NT_STATUS_OBJECT_NAME_INVALID"
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
117 "NT_STATUS_OBJECT_NAME_NOT_FOUND"
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
118 "NT_STATUS_SHARING_VIOLATION"
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
119 "NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE"
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
120 "NT_STATUS_WRONG_PASSWORD")
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
121 "\\|")
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
122 "Regexp for possible error strings of SMB servers.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
123 Used instead of analyzing error codes of commands.")
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
124
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
125 (defconst tramp-smb-actions-with-share
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
126 '((tramp-smb-prompt tramp-action-succeed)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
127 (tramp-password-prompt-regexp tramp-action-password)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
128 (tramp-wrong-passwd-regexp tramp-action-permission-denied)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
129 (tramp-smb-errors tramp-action-permission-denied)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
130 (tramp-process-alive-regexp tramp-action-process-alive))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
131 "List of pattern/action pairs.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
132 This list is used for login to SMB servers.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
133
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
134 See `tramp-actions-before-shell' for more info.")
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
135
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
136 (defconst tramp-smb-actions-without-share
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
137 '((tramp-password-prompt-regexp tramp-action-password)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
138 (tramp-wrong-passwd-regexp tramp-action-permission-denied)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
139 (tramp-smb-errors tramp-action-permission-denied)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
140 (tramp-process-alive-regexp tramp-action-out-of-band))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
141 "List of pattern/action pairs.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
142 This list is used for login to SMB servers.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
143
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
144 See `tramp-actions-before-shell' for more info.")
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
145
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
146 ;; New handlers should be added here.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
147 (defconst tramp-smb-file-name-handler-alist
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
148 '(
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
149 ;; `access-file' performed by default handler.
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
150 (add-name-to-file . tramp-smb-handle-add-name-to-file)
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
151 ;; `byte-compiler-base-file-name' performed by default handler.
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
152 (copy-directory . tramp-smb-handle-copy-directory)
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
153 (copy-file . tramp-smb-handle-copy-file)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
154 (delete-directory . tramp-smb-handle-delete-directory)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
155 (delete-file . tramp-smb-handle-delete-file)
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
156 ;; `diff-latest-backup-file' performed by default handler.
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
157 (directory-file-name . tramp-handle-directory-file-name)
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
158 (directory-files . tramp-smb-handle-directory-files)
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
159 (directory-files-and-attributes
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
160 . tramp-smb-handle-directory-files-and-attributes)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
161 (dired-call-process . ignore)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
162 (dired-compress-file . ignore)
103531
74d482177a44 * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Add
Michael Albinus <michael.albinus@gmx.de>
parents: 100931
diff changeset
163 (dired-uncache . tramp-handle-dired-uncache)
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
164 (expand-file-name . tramp-smb-handle-expand-file-name)
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
165 (file-accessible-directory-p . tramp-smb-handle-file-directory-p)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
166 (file-attributes . tramp-smb-handle-file-attributes)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
167 (file-directory-p . tramp-smb-handle-file-directory-p)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
168 (file-executable-p . tramp-smb-handle-file-exists-p)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
169 (file-exists-p . tramp-smb-handle-file-exists-p)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
170 (file-local-copy . tramp-smb-handle-file-local-copy)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
171 (file-modes . tramp-handle-file-modes)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
172 (file-name-all-completions . tramp-smb-handle-file-name-all-completions)
99617
0ba4a2790571 * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Handle
Michael Albinus <michael.albinus@gmx.de>
parents: 97037
diff changeset
173 (file-name-as-directory . tramp-handle-file-name-as-directory)
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
174 (file-name-completion . tramp-handle-file-name-completion)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
175 (file-name-directory . tramp-handle-file-name-directory)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
176 (file-name-nondirectory . tramp-handle-file-name-nondirectory)
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
177 ;; `file-name-sans-versions' performed by default handler.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
178 (file-newer-than-file-p . tramp-smb-handle-file-newer-than-file-p)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
179 (file-ownership-preserved-p . ignore)
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
180 (file-readable-p . tramp-smb-handle-file-exists-p)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
181 (file-regular-p . tramp-handle-file-regular-p)
108077
93125d6fab29 Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents: 107092
diff changeset
182 (file-remote-p . tramp-handle-file-remote-p)
93125d6fab29 Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents: 107092
diff changeset
183 ;; `file-selinux-context' performed by default handler.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
184 (file-symlink-p . tramp-handle-file-symlink-p)
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
185 ;; `file-truename' performed by default handler.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
186 (file-writable-p . tramp-smb-handle-file-writable-p)
55420
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
187 (find-backup-file-name . tramp-handle-find-backup-file-name)
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
188 ;; `find-file-noselect' performed by default handler.
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
189 ;; `get-file-buffer' performed by default handler.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
190 (insert-directory . tramp-smb-handle-insert-directory)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
191 (insert-file-contents . tramp-handle-insert-file-contents)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
192 (load . tramp-handle-load)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
193 (make-directory . tramp-smb-handle-make-directory)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
194 (make-directory-internal . tramp-smb-handle-make-directory-internal)
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
195 (make-symbolic-link . tramp-smb-handle-make-symbolic-link)
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
196 (rename-file . tramp-smb-handle-rename-file)
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
197 (set-file-modes . tramp-smb-handle-set-file-modes)
108077
93125d6fab29 Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents: 107092
diff changeset
198 ;; `set-file-selinux-context' performed by default handler.
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
199 (set-file-times . ignore)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
200 (set-visited-file-modtime . ignore)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
201 (shell-command . ignore)
59582
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
202 (substitute-in-file-name . tramp-smb-handle-substitute-in-file-name)
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
203 (unhandled-file-name-directory . tramp-handle-unhandled-file-name-directory)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
204 (vc-registered . ignore)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
205 (verify-visited-file-modtime . ignore)
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
206 (write-region . tramp-smb-handle-write-region)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
207 )
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
208 "Alist of handler functions for Tramp SMB method.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
209 Operations not mentioned here will be handled by the default Emacs primitives.")
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
210
110264
ec526909f60b Migrate to Tramp 2.2. Rearrange load dependencies.
Michael Albinus <michael.albinus@gmx.de>
parents: 110015
diff changeset
211 ;;;###tramp-autoload
ec526909f60b Migrate to Tramp 2.2. Rearrange load dependencies.
Michael Albinus <michael.albinus@gmx.de>
parents: 110015
diff changeset
212 (defsubst tramp-smb-file-name-p (filename)
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
213 "Check if it's a filename for SMB servers."
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
214 (let ((v (tramp-dissect-file-name filename)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
215 (string= (tramp-file-name-method v) tramp-smb-method)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
216
110264
ec526909f60b Migrate to Tramp 2.2. Rearrange load dependencies.
Michael Albinus <michael.albinus@gmx.de>
parents: 110015
diff changeset
217 ;;;###tramp-autoload
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
218 (defun tramp-smb-file-name-handler (operation &rest args)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
219 "Invoke the SMB related OPERATION.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
220 First arg specifies the OPERATION, second arg is a list of arguments to
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
221 pass to the OPERATION."
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
222 (let ((fn (assoc operation tramp-smb-file-name-handler-alist)))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
223 (if fn
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
224 (save-match-data (apply (cdr fn) args))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
225 (tramp-run-real-handler operation args))))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
226
110264
ec526909f60b Migrate to Tramp 2.2. Rearrange load dependencies.
Michael Albinus <michael.albinus@gmx.de>
parents: 110015
diff changeset
227 ;;;###tramp-autoload
ec526909f60b Migrate to Tramp 2.2. Rearrange load dependencies.
Michael Albinus <michael.albinus@gmx.de>
parents: 110015
diff changeset
228 (unless (memq system-type '(cygwin windows-nt))
ec526909f60b Migrate to Tramp 2.2. Rearrange load dependencies.
Michael Albinus <michael.albinus@gmx.de>
parents: 110015
diff changeset
229 (add-to-list 'tramp-foreign-file-name-handler-alist
ec526909f60b Migrate to Tramp 2.2. Rearrange load dependencies.
Michael Albinus <michael.albinus@gmx.de>
parents: 110015
diff changeset
230 (cons 'tramp-smb-file-name-p 'tramp-smb-file-name-handler)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
231
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
232
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
233 ;; File name primitives.
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
234
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
235 (defun tramp-smb-handle-add-name-to-file
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
236 (filename newname &optional ok-if-already-exists)
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
237 "Like `add-name-to-file' for Tramp files."
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
238 (unless (tramp-equal-remote filename newname)
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
239 (with-parsed-tramp-file-name
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
240 (if (tramp-tramp-file-p filename) filename newname) nil
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
241 (tramp-error
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
242 v 'file-error
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
243 "add-name-to-file: %s"
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
244 "only implemented for same method, same user, same host")))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
245 (with-parsed-tramp-file-name filename v1
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
246 (with-parsed-tramp-file-name newname v2
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
247 (when (file-directory-p filename)
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
248 (tramp-error
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
249 v2 'file-error
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
250 "add-name-to-file: %s must not be a directory" filename))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
251 (when (and (not ok-if-already-exists)
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
252 (file-exists-p newname)
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
253 (not (numberp ok-if-already-exists))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
254 (y-or-n-p
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
255 (format
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
256 "File %s already exists; make it a new name anyway? "
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
257 newname)))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
258 (tramp-error
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
259 v2 'file-error
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
260 "add-name-to-file: file %s already exists" newname))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
261 ;; We must also flush the cache of the directory, because
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
262 ;; `file-attributes' reads the values from there.
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
263 (tramp-flush-file-property v2 (file-name-directory v2-localname))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
264 (tramp-flush-file-property v2 v2-localname)
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
265 (unless
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
266 (tramp-smb-send-command
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
267 v1
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
268 (format
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
269 "%s \"%s\" \"%s\""
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
270 (if (tramp-smb-get-cifs-capabilities v1) "link" "hardlink")
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
271 (tramp-smb-get-localname v1)
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
272 (tramp-smb-get-localname v2)))
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
273 (tramp-error
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
274 v2 'file-error
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
275 "error with add-name-to-file, see buffer `%s' for details"
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
276 (buffer-name))))))
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
277
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
278 (defun tramp-smb-handle-copy-directory
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
279 (dirname newname &optional keep-date parents)
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
280 "Like `copy-directory' for Tramp files. KEEP-DATE is not handled."
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
281 (setq dirname (expand-file-name dirname)
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
282 newname (expand-file-name newname))
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
283 (let ((t1 (tramp-tramp-file-p dirname))
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
284 (t2 (tramp-tramp-file-p newname)))
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
285 (with-parsed-tramp-file-name (if t1 dirname newname) nil
105524
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
286 (cond
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
287 ;; We must use a local temporary directory.
105524
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
288 ((and t1 t2)
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
289 (let ((tmpdir
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
290 (make-temp-name
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
291 (expand-file-name
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
292 tramp-temp-name-prefix
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
293 (tramp-compat-temporary-file-directory)))))
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
294 (unwind-protect
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
295 (progn
105897
d8ba90718d44 * net/tramp-smb.el (tramp-smb-handle-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105690
diff changeset
296 (tramp-compat-copy-directory dirname tmpdir keep-date parents)
d8ba90718d44 * net/tramp-smb.el (tramp-smb-handle-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105690
diff changeset
297 (tramp-compat-copy-directory tmpdir newname keep-date parents))
d8ba90718d44 * net/tramp-smb.el (tramp-smb-handle-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105690
diff changeset
298 (tramp-compat-delete-directory tmpdir 'recursive))))
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
299
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
300 ;; We can copy recursively.
105524
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
301 ((or t1 t2)
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
302 (let ((prompt (tramp-smb-send-command v "prompt"))
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
303 (recurse (tramp-smb-send-command v "recurse")))
105524
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
304 (unless (file-directory-p newname)
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
305 (make-directory newname parents))
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
306 (unwind-protect
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
307 (unless
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
308 (and
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
309 prompt recurse
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
310 (tramp-smb-send-command
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
311 v (format "cd \"%s\"" (tramp-smb-get-localname v)))
105524
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
312 (tramp-smb-send-command
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
313 v (format "lcd \"%s\"" (if t1 newname dirname)))
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
314 (if t1
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
315 (tramp-smb-send-command v "mget *")
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
316 (tramp-smb-send-command v "mput *")))
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
317 ;; Error.
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
318 (with-current-buffer (tramp-get-connection-buffer v)
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
319 (goto-char (point-min))
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
320 (search-forward-regexp tramp-smb-errors nil t)
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
321 (tramp-error
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
322 v 'file-error
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
323 "%s `%s'" (match-string 0) (if t1 dirname newname))))
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
324 ;; Go home.
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
325 (tramp-smb-send-command
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
326 v (format
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
327 "cd %s" (if (tramp-smb-get-cifs-capabilities v) "/" "\\")))
105524
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
328 ;; Toggle prompt and recurse OFF.
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
329 (if prompt (tramp-smb-send-command v "prompt"))
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
330 (if recurse (tramp-smb-send-command v "recurse")))))
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
331
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
332 ;; We must do it file-wise.
105524
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
333 (t
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
334 (tramp-run-real-handler
105524
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
335 'copy-directory (list dirname newname keep-date parents)))))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
336
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
337 (defun tramp-smb-handle-copy-file
108077
93125d6fab29 Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents: 107092
diff changeset
338 (filename newname &optional ok-if-already-exists keep-date
93125d6fab29 Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents: 107092
diff changeset
339 preserve-uid-gid preserve-selinux-context)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
340 "Like `copy-file' for Tramp files.
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
341 KEEP-DATE is not handled in case NEWNAME resides on an SMB server.
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
342 PRESERVE-UID-GID is completely ignored."
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
343 (setq filename (expand-file-name filename)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
344 newname (expand-file-name newname))
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
345 (with-progress-reporter
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
346 (tramp-dissect-file-name (if (file-remote-p filename) filename newname))
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
347 0 (format "Copying %s to %s" filename newname)
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
348
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
349 (let ((tmpfile (file-local-copy filename)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
350
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
351 (if tmpfile
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
352 ;; Remote filename.
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
353 (condition-case err
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
354 (rename-file tmpfile newname ok-if-already-exists)
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
355 ((error quit)
108816
94d1d8a6dcfd * net/tramp-compat.el (tramp-compat-delete-file): Use
Michael Albinus <michael.albinus@gmx.de>
parents: 108806
diff changeset
356 (delete-file tmpfile)
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
357 (signal (car err) (cdr err))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
358
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
359 ;; Remote newname.
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
360 (when (file-directory-p newname)
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
361 (setq newname
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
362 (expand-file-name (file-name-nondirectory filename) newname)))
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
363
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
364 (with-parsed-tramp-file-name newname nil
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
365 (when (and (not ok-if-already-exists)
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
366 (file-exists-p newname))
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
367 (tramp-error v 'file-already-exists newname))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
368
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
369 ;; We must also flush the cache of the directory, because
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
370 ;; `file-attributes' reads the values from there.
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
371 (tramp-flush-file-property v (file-name-directory localname))
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
372 (tramp-flush-file-property v localname)
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
373 (unless (tramp-smb-get-share v)
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
374 (tramp-error
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
375 v 'file-error "Target `%s' must contain a share name" newname))
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
376 (unless (tramp-smb-send-command
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
377 v (format "put \"%s\" \"%s\""
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
378 filename (tramp-smb-get-localname v)))
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
379 (tramp-error v 'file-error "Cannot copy `%s'" filename))))))
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
380
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
381 ;; KEEP-DATE handling.
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
382 (when keep-date (set-file-times newname (nth 5 (file-attributes filename)))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
383
105354
5077632c39ef * net/tramp-smb.el (tramp-smb-errors): Add error message for
Michael Albinus <michael.albinus@gmx.de>
parents: 105276
diff changeset
384 (defun tramp-smb-handle-delete-directory (directory &optional recursive)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
385 "Like `delete-directory' for Tramp files."
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
386 (setq directory (directory-file-name (expand-file-name directory)))
60763
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 59996
diff changeset
387 (when (file-exists-p directory)
105354
5077632c39ef * net/tramp-smb.el (tramp-smb-errors): Add error message for
Michael Albinus <michael.albinus@gmx.de>
parents: 105276
diff changeset
388 (if recursive
5077632c39ef * net/tramp-smb.el (tramp-smb-errors): Add error message for
Michael Albinus <michael.albinus@gmx.de>
parents: 105276
diff changeset
389 (mapc
5077632c39ef * net/tramp-smb.el (tramp-smb-errors): Add error message for
Michael Albinus <michael.albinus@gmx.de>
parents: 105276
diff changeset
390 (lambda (file)
5077632c39ef * net/tramp-smb.el (tramp-smb-errors): Add error message for
Michael Albinus <michael.albinus@gmx.de>
parents: 105276
diff changeset
391 (if (file-directory-p file)
105897
d8ba90718d44 * net/tramp-smb.el (tramp-smb-handle-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105690
diff changeset
392 (tramp-compat-delete-directory file recursive)
108887
2c20a51413cb * net/tramp-gvfs.el (tramp-gvfs-handle-expand-file-name): Expand "~/".
Michael Albinus <michael.albinus@gmx.de>
parents: 108816
diff changeset
393 (delete-file file)))
105354
5077632c39ef * net/tramp-smb.el (tramp-smb-errors): Add error message for
Michael Albinus <michael.albinus@gmx.de>
parents: 105276
diff changeset
394 ;; We do not want to delete "." and "..".
5077632c39ef * net/tramp-smb.el (tramp-smb-errors): Add error message for
Michael Albinus <michael.albinus@gmx.de>
parents: 105276
diff changeset
395 (directory-files
5077632c39ef * net/tramp-smb.el (tramp-smb-errors): Add error message for
Michael Albinus <michael.albinus@gmx.de>
parents: 105276
diff changeset
396 directory 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")))
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
397
60763
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 59996
diff changeset
398 (with-parsed-tramp-file-name directory nil
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
399 ;; We must also flush the cache of the directory, because
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
400 ;; `file-attributes' reads the values from there.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
401 (tramp-flush-file-property v (file-name-directory localname))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
402 (tramp-flush-directory-property v localname)
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
403 (unless (tramp-smb-send-command
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
404 v (format
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
405 "%s \"%s\""
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
406 (if (tramp-smb-get-cifs-capabilities v) "posix_rmdir" "rmdir")
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
407 (tramp-smb-get-localname v)))
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
408 ;; Error.
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
409 (with-current-buffer (tramp-get-connection-buffer v)
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
410 (goto-char (point-min))
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
411 (search-forward-regexp tramp-smb-errors nil t)
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
412 (tramp-error
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
413 v 'file-error "%s `%s'" (match-string 0) directory))))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
414
108806
511da81b16c5 Change delete-by-moving-to-trash so Lisp calls explicitly request trashing.
Chong Yidong <cyd@stupidchicken.com>
parents: 108540
diff changeset
415 (defun tramp-smb-handle-delete-file (filename &optional trash)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
416 "Like `delete-file' for Tramp files."
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
417 (setq filename (expand-file-name filename))
60763
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 59996
diff changeset
418 (when (file-exists-p filename)
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 59996
diff changeset
419 (with-parsed-tramp-file-name filename nil
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
420 ;; We must also flush the cache of the directory, because
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
421 ;; `file-attributes' reads the values from there.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
422 (tramp-flush-file-property v (file-name-directory localname))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
423 (tramp-flush-file-property v localname)
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
424 (unless (tramp-smb-send-command
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
425 v (format
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
426 "%s \"%s\""
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
427 (if (tramp-smb-get-cifs-capabilities v) "posix_unlink" "rm")
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
428 (tramp-smb-get-localname v)))
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
429 ;; Error.
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
430 (with-current-buffer (tramp-get-connection-buffer v)
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
431 (goto-char (point-min))
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
432 (search-forward-regexp tramp-smb-errors nil t)
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
433 (tramp-error
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
434 v 'file-error "%s `%s'" (match-string 0) filename))))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
435
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
436 (defun tramp-smb-handle-directory-files
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
437 (directory &optional full match nosort)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
438 "Like `directory-files' for Tramp files."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
439 (let ((result (mapcar 'directory-file-name
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
440 (file-name-all-completions "" directory))))
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
441 ;; Discriminate with regexp.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
442 (when match
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
443 (setq result
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
444 (delete nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
445 (mapcar (lambda (x) (when (string-match match x) x))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
446 result))))
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
447 ;; Append directory.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
448 (when full
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
449 (setq result
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
450 (mapcar
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
451 (lambda (x) (expand-file-name x directory))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
452 result)))
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
453 ;; Sort them if necessary.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
454 (unless nosort (setq result (sort result 'string-lessp)))
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
455 ;; That's it.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
456 result))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
457
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
458 (defun tramp-smb-handle-directory-files-and-attributes
53206
0c19f1a19b2b (tramp-chunksize): Extend docstring. Suggested by
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 52401
diff changeset
459 (directory &optional full match nosort id-format)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
460 "Like `directory-files-and-attributes' for Tramp files."
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
461 (mapcar
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
462 (lambda (x)
105276
0c6bc9d2b10c (tramp-smb-handle-directory-files-and-attributes): Use
Glenn Morris <rgm@gnu.org>
parents: 105249
diff changeset
463 (cons x (tramp-compat-file-attributes
105249
99d98ed749b9 * net/tramp-smb.el (tramp-smb-handle-directory-files-and-attributes):
Michael Albinus <michael.albinus@gmx.de>
parents: 103531
diff changeset
464 (if full x (expand-file-name x directory)) id-format)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
465 (directory-files directory full match nosort)))
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59582
diff changeset
466
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
467 (defun tramp-smb-handle-expand-file-name (name &optional dir)
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
468 "Like `expand-file-name' for Tramp files."
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
469 ;; If DIR is not given, use DEFAULT-DIRECTORY or "/".
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
470 (setq dir (or dir default-directory "/"))
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
471 ;; Unless NAME is absolute, concat DIR and NAME.
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
472 (unless (file-name-absolute-p name)
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
473 (setq name (concat (file-name-as-directory dir) name)))
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
474 ;; If NAME is not a Tramp file, run the real handler.
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
475 (if (not (tramp-tramp-file-p name))
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
476 (tramp-run-real-handler 'expand-file-name (list name nil))
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
477 ;; Dissect NAME.
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
478 (with-parsed-tramp-file-name name nil
105524
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
479 ;; Tilde expansion if necessary. We use the user name as share,
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
480 ;; which is offen the case in domains.
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
481 (when (string-match "\\`/?~\\([^/]*\\)" localname)
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
482 (setq localname
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
483 (replace-match
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
484 (if (zerop (length (match-string 1 localname)))
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
485 (tramp-file-name-real-user v)
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
486 (match-string 1 localname))
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
487 nil nil localname)))
e781cac84553 * net/tramp-smb.el (tramp-smb-handle-copy-directory): Handle the
Michael Albinus <michael.albinus@gmx.de>
parents: 105509
diff changeset
488 ;; Make the file name absolute.
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
489 (unless (tramp-run-real-handler 'file-name-absolute-p (list localname))
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
490 (setq localname (concat "/" localname)))
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
491 ;; No tilde characters in file name, do normal
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
492 ;; `expand-file-name' (this does "/./" and "/../").
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
493 (tramp-make-tramp-file-name
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
494 method user host
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
495 (tramp-run-real-handler 'expand-file-name (list localname))))))
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
496
53206
0c19f1a19b2b (tramp-chunksize): Extend docstring. Suggested by
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 52401
diff changeset
497 (defun tramp-smb-handle-file-attributes (filename &optional id-format)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
498 "Like `file-attributes' for Tramp files."
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
499 (unless id-format (setq id-format 'integer))
60763
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 59996
diff changeset
500 (with-parsed-tramp-file-name filename nil
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
501 (with-file-property v localname (format "file-attributes-%s" id-format)
105690
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
502 (if (and (tramp-smb-get-share v) (tramp-smb-get-stat-capability v))
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
503 (tramp-smb-do-file-attributes-with-stat v id-format)
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
504 ;; Reading just the filename entry via "dir localname" is not
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
505 ;; possible, because when filename is a directory, some
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
506 ;; smbclient versions return the content of the directory, and
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
507 ;; other versions don't. Therefore, the whole content of the
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
508 ;; upper directory is retrieved, and the entry of the filename
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
509 ;; is extracted from.
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
510 (let* ((entries (tramp-smb-get-file-entries
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
511 (file-name-directory filename)))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
512 (entry (assoc (file-name-nondirectory filename) entries))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
513 (uid (if (equal id-format 'string) "nobody" -1))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
514 (gid (if (equal id-format 'string) "nogroup" -1))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
515 (inode (tramp-get-inode v))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
516 (device (tramp-get-device v)))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
517
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
518 ;; Check result.
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
519 (when entry
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
520 (list (and (string-match "d" (nth 1 entry))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
521 t) ;0 file type
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
522 -1 ;1 link count
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
523 uid ;2 uid
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
524 gid ;3 gid
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
525 '(0 0) ;4 atime
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
526 (nth 3 entry) ;5 mtime
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
527 '(0 0) ;6 ctime
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
528 (nth 2 entry) ;7 size
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
529 (nth 1 entry) ;8 mode
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
530 nil ;9 gid weird
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
531 inode ;10 inode number
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
532 device))))))) ;11 file system number
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
533
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
534 (defun tramp-smb-do-file-attributes-with-stat (vec &optional id-format)
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
535 "Implement `file-attributes' for Tramp files using stat command."
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
536 (tramp-message
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
537 vec 5 "file attributes with stat: %s" (tramp-file-name-localname vec))
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
538 (with-current-buffer (tramp-get-buffer vec)
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
539 (let* (size id link uid gid atime mtime ctime mode inode)
105690
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
540 (when (tramp-smb-send-command
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
541 vec (format "stat \"%s\"" (tramp-smb-get-localname vec)))
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
542
105690
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
543 ;; Loop the listing.
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
544 (goto-char (point-min))
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
545 (unless (re-search-forward tramp-smb-errors nil t)
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
546 (while (not (eobp))
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
547 (cond
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
548 ((looking-at
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
549 "Size:\\s-+\\([0-9]+\\)\\s-+Blocks:\\s-+[0-9]+\\s-+\\(\\w+\\)")
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
550 (setq size (string-to-number (match-string 1))
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
551 id (if (string-equal "directory" (match-string 2)) t
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
552 (if (string-equal "symbolic" (match-string 2)) ""))))
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
553 ((looking-at
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
554 "Inode:\\s-+\\([0-9]+\\)\\s-+Links:\\s-+\\([0-9]+\\)")
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
555 (setq inode (string-to-number (match-string 1))
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
556 link (string-to-number (match-string 2))))
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
557 ((looking-at
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
558 "Access:\\s-+([0-9]+/\\(\\S-+\\))\\s-+Uid:\\s-+\\([0-9]+\\)\\s-+Gid:\\s-+\\([0-9]+\\)")
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
559 (setq mode (match-string 1)
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
560 uid (if (equal id-format 'string) (match-string 2)
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
561 (string-to-number (match-string 2)))
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
562 gid (if (equal id-format 'string) (match-string 3)
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
563 (string-to-number (match-string 3)))))
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
564 ((looking-at
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
565 "Access:\\s-+\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)\\s-+\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\)")
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
566 (setq atime
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
567 (encode-time
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
568 (string-to-number (match-string 6)) ;; sec
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
569 (string-to-number (match-string 5)) ;; min
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
570 (string-to-number (match-string 4)) ;; hour
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
571 (string-to-number (match-string 3)) ;; day
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
572 (string-to-number (match-string 2)) ;; month
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
573 (string-to-number (match-string 1))))) ;; year
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
574 ((looking-at
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
575 "Modify:\\s-+\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)\\s-+\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\)")
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
576 (setq mtime
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
577 (encode-time
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
578 (string-to-number (match-string 6)) ;; sec
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
579 (string-to-number (match-string 5)) ;; min
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
580 (string-to-number (match-string 4)) ;; hour
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
581 (string-to-number (match-string 3)) ;; day
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
582 (string-to-number (match-string 2)) ;; month
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
583 (string-to-number (match-string 1))))) ;; year
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
584 ((looking-at
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
585 "Change:\\s-+\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)\\s-+\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\)")
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
586 (setq ctime
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
587 (encode-time
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
588 (string-to-number (match-string 6)) ;; sec
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
589 (string-to-number (match-string 5)) ;; min
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
590 (string-to-number (match-string 4)) ;; hour
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
591 (string-to-number (match-string 3)) ;; day
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
592 (string-to-number (match-string 2)) ;; month
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
593 (string-to-number (match-string 1)))))) ;; year
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
594 (forward-line))
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
595 ;; Return the result.
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
596 (list id link uid gid atime mtime ctime size mode nil inode
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
597 (tramp-get-device vec)))))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
598
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
599 (defun tramp-smb-handle-file-directory-p (filename)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
600 "Like `file-directory-p' for Tramp files."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
601 (and (file-exists-p filename)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
602 (eq ?d (aref (nth 8 (file-attributes filename)) 0))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
603
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
604 (defun tramp-smb-handle-file-exists-p (filename)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
605 "Like `file-exists-p' for Tramp files."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
606 (not (null (file-attributes filename))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
607
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
608 (defun tramp-smb-handle-file-local-copy (filename)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
609 "Like `file-local-copy' for Tramp files."
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
610 (with-parsed-tramp-file-name filename nil
103531
74d482177a44 * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Add
Michael Albinus <michael.albinus@gmx.de>
parents: 100931
diff changeset
611 (unless (file-exists-p filename)
74d482177a44 * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Add
Michael Albinus <michael.albinus@gmx.de>
parents: 100931
diff changeset
612 (tramp-error
74d482177a44 * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Add
Michael Albinus <michael.albinus@gmx.de>
parents: 100931
diff changeset
613 v 'file-error
74d482177a44 * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Add
Michael Albinus <michael.albinus@gmx.de>
parents: 100931
diff changeset
614 "Cannot make local copy of non-existing file `%s'" filename))
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
615 (let ((tmpfile (tramp-compat-make-temp-file filename)))
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
616 (with-progress-reporter
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
617 v 3 (format "Fetching %s to tmp file %s" filename tmpfile)
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
618 (unless (tramp-smb-send-command
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
619 v (format "get \"%s\" \"%s\""
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
620 (tramp-smb-get-localname v) tmpfile))
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
621 ;; Oops, an error. We shall cleanup.
108816
94d1d8a6dcfd * net/tramp-compat.el (tramp-compat-delete-file): Use
Michael Albinus <michael.albinus@gmx.de>
parents: 108806
diff changeset
622 (delete-file tmpfile)
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
623 (tramp-error
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
624 v 'file-error "Cannot make local copy of file `%s'" filename)))
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
625 tmpfile)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
626
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
627 ;; This function should return "foo/" for directories and "bar" for
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
628 ;; files.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
629 (defun tramp-smb-handle-file-name-all-completions (filename directory)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
630 "Like `file-name-all-completions' for Tramp files."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
631 (all-completions
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
632 filename
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
633 (with-parsed-tramp-file-name directory nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
634 (with-file-property v localname "file-name-all-completions"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
635 (save-match-data
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
636 (let ((entries (tramp-smb-get-file-entries directory)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
637 (mapcar
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
638 (lambda (x)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
639 (list
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
640 (if (string-match "d" (nth 1 x))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
641 (file-name-as-directory (nth 0 x))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
642 (nth 0 x))))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
643 entries)))))))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
644
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
645 (defun tramp-smb-handle-file-newer-than-file-p (file1 file2)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
646 "Like `file-newer-than-file-p' for Tramp files."
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
647 (cond
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
648 ((not (file-exists-p file1)) nil)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
649 ((not (file-exists-p file2)) t)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
650 (t (tramp-time-less-p (nth 5 (file-attributes file2))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
651 (nth 5 (file-attributes file1))))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
652
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
653 (defun tramp-smb-handle-file-writable-p (filename)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
654 "Like `file-writable-p' for Tramp files."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
655 (if (file-exists-p filename)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
656 (string-match "w" (or (nth 8 (file-attributes filename)) ""))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
657 (let ((dir (file-name-directory filename)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
658 (and (file-exists-p dir)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
659 (file-writable-p dir)))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
660
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
661 (defun tramp-smb-handle-insert-directory
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
662 (filename switches &optional wildcard full-directory-p)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
663 "Like `insert-directory' for Tramp files."
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
664 (setq filename (expand-file-name filename))
107092
2e763e444bc2 * net/ange-ftp.el (ange-ftp-insert-directory):
Michael Albinus <michael.albinus@gmx.de>
parents: 107085
diff changeset
665 (if full-directory-p
2e763e444bc2 * net/ange-ftp.el (ange-ftp-insert-directory):
Michael Albinus <michael.albinus@gmx.de>
parents: 107085
diff changeset
666 ;; Called from `dired-add-entry'.
2e763e444bc2 * net/ange-ftp.el (ange-ftp-insert-directory):
Michael Albinus <michael.albinus@gmx.de>
parents: 107085
diff changeset
667 (setq filename (file-name-as-directory filename))
2e763e444bc2 * net/ange-ftp.el (ange-ftp-insert-directory):
Michael Albinus <michael.albinus@gmx.de>
parents: 107085
diff changeset
668 (setq filename (directory-file-name filename)))
60763
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 59996
diff changeset
669 (with-parsed-tramp-file-name filename nil
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
670 (save-match-data
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
671 (let ((base (file-name-nondirectory filename))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
672 ;; We should not destroy the cache entry.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
673 (entries (copy-sequence
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
674 (tramp-smb-get-file-entries
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
675 (file-name-directory filename)))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
676
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
677 (when wildcard
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
678 (string-match "\\." base)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
679 (setq base (replace-match "\\\\." nil nil base))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
680 (string-match "\\*" base)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
681 (setq base (replace-match ".*" nil nil base))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
682 (string-match "\\?" base)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
683 (setq base (replace-match ".?" nil nil base)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
684
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
685 ;; Filter entries.
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59582
diff changeset
686 (setq entries
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
687 (delq
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
688 nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
689 (if (or wildcard (zerop (length base)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
690 ;; Check for matching entries.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
691 (mapcar
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
692 (lambda (x)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
693 (when (string-match
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
694 (format "^%s" base) (nth 0 x))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
695 x))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
696 entries)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
697 ;; We just need the only and only entry FILENAME.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
698 (list (assoc base entries)))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
699
87368
8b57223acf6b Sync with Tramp 2.1.12.
Michael Albinus <michael.albinus@gmx.de>
parents: 85962
diff changeset
700 ;; Sort entries.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
701 (setq entries
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
702 (sort
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
703 entries
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
704 (lambda (x y)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
705 (if (string-match "t" switches)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
706 ;; Sort by date.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
707 (tramp-time-less-p (nth 3 y) (nth 3 x))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
708 ;; Sort by name.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
709 (string-lessp (nth 0 x) (nth 0 y))))))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
710
87368
8b57223acf6b Sync with Tramp 2.1.12.
Michael Albinus <michael.albinus@gmx.de>
parents: 85962
diff changeset
711 ;; Handle "-F" switch.
8b57223acf6b Sync with Tramp 2.1.12.
Michael Albinus <michael.albinus@gmx.de>
parents: 85962
diff changeset
712 (when (string-match "F" switches)
87559
59f471917fe0 (tramp-smb-handle-insert-directory): Use mapc rather than mapcar.
Glenn Morris <rgm@gnu.org>
parents: 87368
diff changeset
713 (mapc
87368
8b57223acf6b Sync with Tramp 2.1.12.
Michael Albinus <michael.albinus@gmx.de>
parents: 85962
diff changeset
714 (lambda (x)
8b57223acf6b Sync with Tramp 2.1.12.
Michael Albinus <michael.albinus@gmx.de>
parents: 85962
diff changeset
715 (when (not (zerop (length (car x))))
8b57223acf6b Sync with Tramp 2.1.12.
Michael Albinus <michael.albinus@gmx.de>
parents: 85962
diff changeset
716 (cond
8b57223acf6b Sync with Tramp 2.1.12.
Michael Albinus <michael.albinus@gmx.de>
parents: 85962
diff changeset
717 ((char-equal ?d (string-to-char (nth 1 x)))
8b57223acf6b Sync with Tramp 2.1.12.
Michael Albinus <michael.albinus@gmx.de>
parents: 85962
diff changeset
718 (setcar x (concat (car x) "/")))
8b57223acf6b Sync with Tramp 2.1.12.
Michael Albinus <michael.albinus@gmx.de>
parents: 85962
diff changeset
719 ((char-equal ?x (string-to-char (nth 1 x)))
8b57223acf6b Sync with Tramp 2.1.12.
Michael Albinus <michael.albinus@gmx.de>
parents: 85962
diff changeset
720 (setcar x (concat (car x) "*"))))))
8b57223acf6b Sync with Tramp 2.1.12.
Michael Albinus <michael.albinus@gmx.de>
parents: 85962
diff changeset
721 entries))
8b57223acf6b Sync with Tramp 2.1.12.
Michael Albinus <michael.albinus@gmx.de>
parents: 85962
diff changeset
722
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
723 ;; Print entries.
105690
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
724 (mapc
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
725 (lambda (x)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
726 (when (not (zerop (length (nth 0 x))))
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
727 (let ((attr
105690
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
728 (when (tramp-smb-get-stat-capability v)
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
729 (ignore-errors
107092
2e763e444bc2 * net/ange-ftp.el (ange-ftp-insert-directory):
Michael Albinus <michael.albinus@gmx.de>
parents: 107085
diff changeset
730 (file-attributes filename 'string)))))
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
731 (insert
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
732 (format
105690
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
733 "%10s %3d %-8s %-8s %8s %s "
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
734 (or (nth 8 attr) (nth 1 x)) ; mode
105690
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
735 (or (nth 1 attr) 1) ; inode
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
736 (or (nth 2 attr) "nobody") ; uid
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
737 (or (nth 3 attr) "nogroup") ; gid
105690
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
738 (or (nth 7 attr) (nth 2 x)) ; size
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
739 (format-time-string
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
740 (if (tramp-time-less-p
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
741 (tramp-time-subtract (current-time) (nth 3 x))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
742 tramp-half-a-year)
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
743 "%b %e %R"
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
744 "%b %e %Y")
105690
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
745 (nth 3 x)))) ; date
107085
d7831d04952b * dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents: 106959
diff changeset
746 ;; We mark the file name. The inserted name could be
d7831d04952b * dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents: 106959
diff changeset
747 ;; from somewhere else, so we use the relative file
d7831d04952b * dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents: 106959
diff changeset
748 ;; name of `default-directory'.
105690
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
749 (let ((start (point)))
107085
d7831d04952b * dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents: 106959
diff changeset
750 (insert
d7831d04952b * dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents: 106959
diff changeset
751 (format
d7831d04952b * dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents: 106959
diff changeset
752 "%s\n"
107092
2e763e444bc2 * net/ange-ftp.el (ange-ftp-insert-directory):
Michael Albinus <michael.albinus@gmx.de>
parents: 107085
diff changeset
753 (file-relative-name
2e763e444bc2 * net/ange-ftp.el (ange-ftp-insert-directory):
Michael Albinus <michael.albinus@gmx.de>
parents: 107085
diff changeset
754 (expand-file-name
2e763e444bc2 * net/ange-ftp.el (ange-ftp-insert-directory):
Michael Albinus <michael.albinus@gmx.de>
parents: 107085
diff changeset
755 (nth 0 x) (file-name-directory filename)))))
105690
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
756 (put-text-property start (1- (point)) 'dired-filename t))
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
757 (forward-line)
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
758 (beginning-of-line))))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
759 entries)))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
760
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
761 (defun tramp-smb-handle-make-directory (dir &optional parents)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
762 "Like `make-directory' for Tramp files."
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
763 (setq dir (directory-file-name (expand-file-name dir)))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
764 (unless (file-name-absolute-p dir)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
765 (setq dir (expand-file-name dir default-directory)))
60763
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 59996
diff changeset
766 (with-parsed-tramp-file-name dir nil
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
767 (save-match-data
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
768 (let* ((ldir (file-name-directory dir)))
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
769 ;; Make missing directory parts.
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
770 (when (and parents
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
771 (tramp-smb-get-share v)
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
772 (not (file-directory-p ldir)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
773 (make-directory ldir parents))
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
774 ;; Just do it.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
775 (when (file-directory-p ldir)
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
776 (make-directory-internal dir))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
777 (unless (file-directory-p dir)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
778 (tramp-error v 'file-error "Couldn't make directory %s" dir))))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
779
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
780 (defun tramp-smb-handle-make-directory-internal (directory)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
781 "Like `make-directory-internal' for Tramp files."
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
782 (setq directory (directory-file-name (expand-file-name directory)))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
783 (unless (file-name-absolute-p directory)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
784 (setq directory (expand-file-name directory default-directory)))
60763
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 59996
diff changeset
785 (with-parsed-tramp-file-name directory nil
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
786 (save-match-data
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
787 (let* ((file (tramp-smb-get-localname v)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
788 (when (file-directory-p (file-name-directory directory))
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
789 (tramp-smb-send-command
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
790 v
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
791 (if (tramp-smb-get-cifs-capabilities v)
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
792 (format
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
793 "posix_mkdir \"%s\" %s"
110264
ec526909f60b Migrate to Tramp 2.2. Rearrange load dependencies.
Michael Albinus <michael.albinus@gmx.de>
parents: 110015
diff changeset
794 file (tramp-compat-decimal-to-octal (default-file-modes)))
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
795 (format "mkdir \"%s\"" file)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
796 ;; We must also flush the cache of the directory, because
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
797 ;; `file-attributes' reads the values from there.
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
798 (tramp-flush-file-property v (file-name-directory localname))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
799 (tramp-flush-file-property v localname))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
800 (unless (file-directory-p directory)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
801 (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
802 v 'file-error "Couldn't make directory %s" directory))))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
803
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
804 (defun tramp-smb-handle-make-symbolic-link
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
805 (filename linkname &optional ok-if-already-exists)
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
806 "Like `make-symbolic-link' for Tramp files.
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
807 If LINKNAME is a non-Tramp file, it is used verbatim as the target of
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
808 the symlink. If LINKNAME is a Tramp file, only the localname component is
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
809 used as the target of the symlink.
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
810
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
811 If LINKNAME is a Tramp file and the localname component is relative, then
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
812 it is expanded first, before the localname component is taken. Note that
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
813 this can give surprising results if the user/host for the source and
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
814 target of the symlink differ."
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
815 (unless (tramp-equal-remote filename linkname)
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
816 (with-parsed-tramp-file-name
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
817 (if (tramp-tramp-file-p filename) filename linkname) nil
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
818 (tramp-error
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
819 v 'file-error
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
820 "make-symbolic-link: %s"
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
821 "only implemented for same method, same user, same host")))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
822 (with-parsed-tramp-file-name filename v1
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
823 (with-parsed-tramp-file-name linkname v2
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
824 (when (file-directory-p filename)
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
825 (tramp-error
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
826 v2 'file-error
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
827 "make-symbolic-link: %s must not be a directory" filename))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
828 (when (and (not ok-if-already-exists)
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
829 (file-exists-p linkname)
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
830 (not (numberp ok-if-already-exists))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
831 (y-or-n-p
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
832 (format
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
833 "File %s already exists; make it a new name anyway? "
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
834 linkname)))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
835 (tramp-error
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
836 v2 'file-error
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
837 "make-symbolic-link: file %s already exists" linkname))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
838 (unless (tramp-smb-get-cifs-capabilities v1)
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
839 (tramp-error v2 'file-error "make-symbolic-link not supported"))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
840 ;; We must also flush the cache of the directory, because
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
841 ;; `file-attributes' reads the values from there.
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
842 (tramp-flush-file-property v2 (file-name-directory v2-localname))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
843 (tramp-flush-file-property v2 v2-localname)
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
844 (unless
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
845 (tramp-smb-send-command
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
846 v1
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
847 (format
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
848 "symlink \"%s\" \"%s\""
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
849 (tramp-smb-get-localname v1)
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
850 (tramp-smb-get-localname v2)))
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
851 (tramp-error
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
852 v2 'file-error
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
853 "error with make-symbolic-link, see buffer `%s' for details"
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
854 (buffer-name))))))
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
855
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
856 (defun tramp-smb-handle-rename-file
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
857 (filename newname &optional ok-if-already-exists)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
858 "Like `rename-file' for Tramp files."
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
859 (setq filename (expand-file-name filename)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
860 newname (expand-file-name newname))
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
861 (with-progress-reporter
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
862 (tramp-dissect-file-name (if (file-remote-p filename) filename newname))
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
863 0 (format "Renaming %s to %s" filename newname)
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
864
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
865 (let ((tmpfile (file-local-copy filename)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
866
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
867 (if tmpfile
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
868 ;; Remote filename.
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
869 (condition-case err
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
870 (rename-file tmpfile newname ok-if-already-exists)
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
871 ((error quit)
108816
94d1d8a6dcfd * net/tramp-compat.el (tramp-compat-delete-file): Use
Michael Albinus <michael.albinus@gmx.de>
parents: 108806
diff changeset
872 (delete-file tmpfile)
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
873 (signal (car err) (cdr err))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
874
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
875 ;; Remote newname.
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
876 (when (file-directory-p newname)
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
877 (setq newname (expand-file-name
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
878 (file-name-nondirectory filename) newname)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
879
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
880 (with-parsed-tramp-file-name newname nil
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
881 (when (and (not ok-if-already-exists)
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
882 (file-exists-p newname))
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
883 (tramp-error v 'file-already-exists newname))
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
884 ;; We must also flush the cache of the directory, because
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
885 ;; `file-attributes' reads the values from there.
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
886 (tramp-flush-file-property v (file-name-directory localname))
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
887 (tramp-flush-file-property v localname)
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
888 (unless (tramp-smb-send-command
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
889 v (format "put %s \"%s\""
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
890 filename (tramp-smb-get-localname v)))
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
891 (tramp-error v 'file-error "Cannot rename `%s'" filename)))))
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
892
108816
94d1d8a6dcfd * net/tramp-compat.el (tramp-compat-delete-file): Use
Michael Albinus <michael.albinus@gmx.de>
parents: 108806
diff changeset
893 (delete-file filename)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
894
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
895 (defun tramp-smb-handle-set-file-modes (filename mode)
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
896 "Like `set-file-modes' for Tramp files."
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
897 (with-parsed-tramp-file-name filename nil
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
898 (when (tramp-smb-get-cifs-capabilities v)
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
899 (tramp-flush-file-property v localname)
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
900 (unless (tramp-smb-send-command
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
901 v (format "chmod \"%s\" %s"
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
902 (tramp-smb-get-localname v)
110264
ec526909f60b Migrate to Tramp 2.2. Rearrange load dependencies.
Michael Albinus <michael.albinus@gmx.de>
parents: 110015
diff changeset
903 (tramp-compat-decimal-to-octal mode)))
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
904 (tramp-error
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
905 v 'file-error "Error while changing file's mode %s" filename)))))
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
906
59582
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
907 (defun tramp-smb-handle-substitute-in-file-name (filename)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
908 "Like `handle-substitute-in-file-name' for Tramp files.
85962
7f134b676a0c * net/tramp.el (tramp-handle-substitute-in-file-name): Don't
Michael Albinus <michael.albinus@gmx.de>
parents: 85694
diff changeset
909 \"//\" substitutes only in the local filename part. Catches
7f134b676a0c * net/tramp.el (tramp-handle-substitute-in-file-name): Don't
Michael Albinus <michael.albinus@gmx.de>
parents: 85694
diff changeset
910 errors for shares like \"C$/\", which are common in Microsoft Windows."
7f134b676a0c * net/tramp.el (tramp-handle-substitute-in-file-name): Don't
Michael Albinus <michael.albinus@gmx.de>
parents: 85694
diff changeset
911 (with-parsed-tramp-file-name filename nil
7f134b676a0c * net/tramp.el (tramp-handle-substitute-in-file-name): Don't
Michael Albinus <michael.albinus@gmx.de>
parents: 85694
diff changeset
912 ;; Ignore in LOCALNAME everything before "//".
7f134b676a0c * net/tramp.el (tramp-handle-substitute-in-file-name): Don't
Michael Albinus <michael.albinus@gmx.de>
parents: 85694
diff changeset
913 (when (and (stringp localname) (string-match ".+?/\\(/\\|~\\)" localname))
7f134b676a0c * net/tramp.el (tramp-handle-substitute-in-file-name): Don't
Michael Albinus <michael.albinus@gmx.de>
parents: 85694
diff changeset
914 (setq filename
7f134b676a0c * net/tramp.el (tramp-handle-substitute-in-file-name): Don't
Michael Albinus <michael.albinus@gmx.de>
parents: 85694
diff changeset
915 (concat (file-remote-p filename)
7f134b676a0c * net/tramp.el (tramp-handle-substitute-in-file-name): Don't
Michael Albinus <michael.albinus@gmx.de>
parents: 85694
diff changeset
916 (replace-match "\\1" nil nil localname)))))
59582
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
917 (condition-case nil
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
918 (tramp-run-real-handler 'substitute-in-file-name (list filename))
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
919 (error filename)))
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
920
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
921 (defun tramp-smb-handle-write-region
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
922 (start end filename &optional append visit lockname confirm)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
923 "Like `write-region' for Tramp files."
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
924 (setq filename (expand-file-name filename))
60763
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 59996
diff changeset
925 (with-parsed-tramp-file-name filename nil
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
926 (unless (eq append nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
927 (tramp-error
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
928 v 'file-error "Cannot append to file using Tramp (`%s')" filename))
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
929 ;; XEmacs takes a coding system as the seventh argument, not `confirm'.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
930 (when (and (not (featurep 'xemacs))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
931 confirm (file-exists-p filename))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
932 (unless (y-or-n-p (format "File %s exists; overwrite anyway? "
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
933 filename))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
934 (tramp-error v 'file-error "File not overwritten")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
935 ;; We must also flush the cache of the directory, because
85962
7f134b676a0c * net/tramp.el (tramp-handle-substitute-in-file-name): Don't
Michael Albinus <michael.albinus@gmx.de>
parents: 85694
diff changeset
936 ;; `file-attributes' reads the values from there.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
937 (tramp-flush-file-property v (file-name-directory localname))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
938 (tramp-flush-file-property v localname)
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
939 (let ((curbuf (current-buffer))
85041
a42b8750a992 * net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 85024
diff changeset
940 (tmpfile (tramp-compat-make-temp-file filename)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
941 ;; We say `no-message' here because we don't want the visited file
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
942 ;; modtime data to be clobbered from the temp file. We call
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
943 ;; `set-visited-file-modtime' ourselves later on.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
944 (tramp-run-real-handler
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
945 'write-region
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
946 (if confirm ; don't pass this arg unless defined for backward compat.
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
947 (list start end tmpfile append 'no-message lockname confirm)
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
948 (list start end tmpfile append 'no-message lockname)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
949
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
950 (with-progress-reporter
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
951 v 3 (format "Moving tmp file %s to %s" tmpfile filename)
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
952 (unwind-protect
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
953 (unless (tramp-smb-send-command
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
954 v (format "put %s \"%s\""
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
955 tmpfile (tramp-smb-get-localname v)))
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
956 (tramp-error v 'file-error "Cannot write `%s'" filename))
108816
94d1d8a6dcfd * net/tramp-compat.el (tramp-compat-delete-file): Use
Michael Albinus <michael.albinus@gmx.de>
parents: 108806
diff changeset
957 (delete-file tmpfile)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
958
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
959 (unless (equal curbuf (current-buffer))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
960 (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
961 v 'file-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
962 "Buffer has changed from `%s' to `%s'" curbuf (current-buffer)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
963 (when (eq visit t)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
964 (set-visited-file-modtime)))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
965
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
966
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
967 ;; Internal file name functions.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
968
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
969 (defun tramp-smb-get-share (vec)
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
970 "Returns the share name of LOCALNAME."
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
971 (save-match-data
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
972 (let ((localname (tramp-file-name-localname vec)))
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
973 (when (string-match "^/?\\([^/]+\\)/" localname)
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
974 (match-string 1 localname)))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
975
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
976 (defun tramp-smb-get-localname (vec)
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
977 "Returns the file name of LOCALNAME.
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
978 If VEC has no cifs capabilities, exchange \"/\" by \"\\\\\"."
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
979 (save-match-data
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
980 (let ((localname (tramp-file-name-localname vec)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
981 (setq
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
982 localname
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
983 (if (string-match "^/?[^/]+\\(/.*\\)" localname)
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
984 ;; There is a share, sparated by "/".
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
985 (if (not (tramp-smb-get-cifs-capabilities vec))
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
986 (mapconcat
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
987 (lambda (x) (if (equal x ?/) "\\" (char-to-string x)))
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
988 (match-string 1 localname) "")
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
989 (match-string 1 localname))
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
990 ;; There is just a share.
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
991 (if (string-match "^/?\\([^/]+\\)$" localname)
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
992 (match-string 1 localname)
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
993 "")))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
994
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
995 ;; Sometimes we have discarded `substitute-in-file-name'.
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
996 (when (string-match "\\(\\$\\$\\)\\(/\\|$\\)" localname)
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
997 (setq localname (replace-match "$" nil nil localname 1)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
998
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
999 localname)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1000
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1001 ;; Share names of a host are cached. It is very unlikely that the
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1002 ;; shares do change during connection.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1003 (defun tramp-smb-get-file-entries (directory)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1004 "Read entries which match DIRECTORY.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1005 Either the shares are listed, or the `dir' command is executed.
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1006 Result is a list of (LOCALNAME MODE SIZE MONTH DAY TIME YEAR)."
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
1007 (with-parsed-tramp-file-name (file-name-as-directory directory) nil
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1008 (setq localname (or localname "/"))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1009 (with-file-property v localname "file-entries"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1010 (with-current-buffer (tramp-get-buffer v)
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
1011 (let* ((share (tramp-smb-get-share v))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1012 (cache (tramp-get-connection-property v "share-cache" nil))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1013 res entry)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1014
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1015 (if (and (not share) cache)
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1016 ;; Return cached shares.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1017 (setq res cache)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1018
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1019 ;; Read entries.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1020 (if share
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
1021 (tramp-smb-send-command
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
1022 v (format "dir \"%s*\"" (tramp-smb-get-localname v)))
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1023 ;; `tramp-smb-maybe-open-connection' lists also the share names.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1024 (tramp-smb-maybe-open-connection v))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1025
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1026 ;; Loop the listing.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1027 (goto-char (point-min))
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
1028 (if (re-search-forward tramp-smb-errors nil t)
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
1029 (tramp-error v 'file-error "%s `%s'" (match-string 0) directory)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1030 (while (not (eobp))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1031 (setq entry (tramp-smb-read-file-entry share))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1032 (forward-line)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1033 (when entry (add-to-list 'res entry))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1034
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1035 ;; Cache share entries.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1036 (unless share
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1037 (tramp-set-connection-property v "share-cache" res)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1038
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1039 ;; Add directory itself.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1040 (add-to-list 'res '("" "drwxrwxrwx" 0 (0 0)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1041
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1042 ;; There's a very strange error (debugged with XEmacs 21.4.14)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1043 ;; If there's no short delay, it returns nil. No idea about.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1044 (when (featurep 'xemacs) (sleep-for 0.01))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1045
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1046 ;; Return entries.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1047 (delq nil res))))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1048
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1049 ;; Return either a share name (if SHARE is nil), or a file name.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1050 ;;
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1051 ;; If shares are listed, the following format is expected:
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1052 ;;
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
1053 ;; Disk| - leading spaces
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
1054 ;; [^|]+| - share name, 14 char
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
1055 ;; .* - comment
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1056 ;;
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1057 ;; Entries provided by smbclient DIR aren't fully regular.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1058 ;; They should have the format
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1059 ;;
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1060 ;; \s-\{2,2} - leading spaces
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1061 ;; \S-\(.*\S-\)\s-* - file name, 30 chars, left bound
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1062 ;; \s-+[ADHRSV]* - permissions, 7 chars, right bound
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1063 ;; \s- - space delimeter
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1064 ;; \s-+[0-9]+ - size, 8 chars, right bound
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1065 ;; \s-\{2,2\} - space delimeter
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1066 ;; \w\{3,3\} - weekday
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1067 ;; \s- - space delimeter
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1068 ;; \w\{3,3\} - month
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1069 ;; \s- - space delimeter
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1070 ;; [ 12][0-9] - day
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1071 ;; \s- - space delimeter
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1072 ;; [0-9]\{2,2\}:[0-9]\{2,2\}:[0-9]\{2,2\} - time
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1073 ;; \s- - space delimeter
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1074 ;; [0-9]\{4,4\} - year
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1075 ;;
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1076 ;; samba/src/client.c (http://samba.org/doxygen/samba/client_8c-source.html)
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1077 ;; has function display_finfo:
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1078 ;;
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1079 ;; d_printf(" %-30s%7.7s %8.0f %s",
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1080 ;; finfo->name,
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1081 ;; attrib_string(finfo->mode),
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1082 ;; (double)finfo->size,
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1083 ;; asctime(LocalTime(&t)));
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1084 ;;
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1085 ;; in Samba 1.9, there's the following code:
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1086 ;;
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1087 ;; DEBUG(0,(" %-30s%7.7s%10d %s",
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1088 ;; CNV_LANG(finfo->name),
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1089 ;; attrib_string(finfo->mode),
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1090 ;; finfo->size,
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1091 ;; asctime(LocalTime(&t))));
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1092 ;;
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1093 ;; Problems:
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1094 ;; * Modern regexp constructs, like spy groups and counted repetitions, aren't
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1095 ;; available in older Emacsen.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1096 ;; * The length of constructs (file name, size) might exceed the default.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1097 ;; * File names might contain spaces.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1098 ;; * Permissions might be empty.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1099 ;;
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1100 ;; So we try to analyze backwards.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1101 (defun tramp-smb-read-file-entry (share)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1102 "Parse entry in SMB output buffer.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1103 If SHARE is result, entries are of type dir. Otherwise, shares are listed.
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1104 Result is the list (LOCALNAME MODE SIZE MTIME)."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1105 ;; We are called from `tramp-smb-get-file-entries', which sets the
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1106 ;; current buffer.
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84739
diff changeset
1107 (let ((line (buffer-substring (point) (tramp-compat-line-end-position)))
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1108 localname mode size month day hour min sec year mtime)
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1109
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1110 (if (not share)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1111
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1112 ;; Read share entries.
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
1113 (when (string-match "^Disk|\\([^|]+\\)|" line)
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1114 (setq localname (match-string 1 line)
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1115 mode "dr-xr-xr-x"
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1116 size 0))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1117
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1118 ;; Real listing.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1119 (block nil
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1120
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1121 ;; year.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1122 (if (string-match "\\([0-9]+\\)$" line)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1123 (setq year (string-to-number (match-string 1 line))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1124 line (substring line 0 -5))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1125 (return))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1126
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1127 ;; time.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1128 (if (string-match "\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\)$" line)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1129 (setq hour (string-to-number (match-string 1 line))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1130 min (string-to-number (match-string 2 line))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1131 sec (string-to-number (match-string 3 line))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1132 line (substring line 0 -9))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1133 (return))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1134
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1135 ;; day.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1136 (if (string-match "\\([0-9]+\\)$" line)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1137 (setq day (string-to-number (match-string 1 line))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1138 line (substring line 0 -3))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1139 (return))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1140
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1141 ;; month.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1142 (if (string-match "\\(\\w+\\)$" line)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1143 (setq month (match-string 1 line)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1144 line (substring line 0 -4))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1145 (return))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1146
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1147 ;; weekday.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1148 (if (string-match "\\(\\w+\\)$" line)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1149 (setq line (substring line 0 -5))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1150 (return))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1151
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1152 ;; size.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1153 (if (string-match "\\([0-9]+\\)$" line)
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1154 (let ((length (- (max 10 (1+ (length (match-string 1 line)))))))
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1155 (setq size (string-to-number (match-string 1 line)))
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1156 (when (string-match "\\([ADHRSV]+\\)" (substring line length))
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1157 (setq length (+ length (match-end 0))))
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1158 (setq line (substring line 0 length)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1159 (return))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1160
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1161 ;; mode: ARCH, DIR, HIDDEN, RONLY, SYSTEM, VOLID.
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1162 (if (string-match "\\([ADHRSV]+\\)?$" line)
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1163 (setq
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1164 mode (or (match-string 1 line) "")
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1165 mode (save-match-data (format
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1166 "%s%s"
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1167 (if (string-match "D" mode) "d" "-")
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1168 (mapconcat
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1169 (lambda (x) "") " "
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1170 (concat "r" (if (string-match "R" mode) "-" "w") "x"))))
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
1171 line (substring line 0 -6))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1172 (return))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1173
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1174 ;; localname.
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1175 (if (string-match "^\\s-+\\(\\S-\\(.*\\S-\\)?\\)\\s-*$" line)
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1176 (setq localname (match-string 1 line))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1177 (return))))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1178
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1179 (when (and localname mode size)
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1180 (setq mtime
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1181 (if (and sec min hour day month year)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1182 (encode-time
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1183 sec min hour day
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1184 (cdr (assoc (downcase month) tramp-parse-time-months))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1185 year)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1186 '(0 0)))
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1187 (list localname mode size mtime))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1188
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
1189 (defun tramp-smb-get-cifs-capabilities (vec)
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
1190 "Check, whether the SMB server supports POSIX commands."
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
1191 ;; When we are not logged in yet, we return nil.
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
1192 (if (let ((p (tramp-get-connection-process vec)))
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
1193 (and p (processp p) (memq (process-status p) '(run open))))
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
1194 (with-connection-property
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
1195 (tramp-get-connection-process vec) "cifs-capabilities"
105690
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1196 (save-match-data
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1197 (when (tramp-smb-send-command vec "posix")
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1198 (with-current-buffer (tramp-get-buffer vec)
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1199 (goto-char (point-min))
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1200 (when
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1201 (re-search-forward "Server supports CIFS capabilities" nil t)
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1202 (member
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1203 "pathnames"
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1204 (split-string
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1205 (buffer-substring
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1206 (point) (tramp-compat-line-end-position)) nil t)))))))))
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1207
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1208 (defun tramp-smb-get-stat-capability (vec)
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1209 "Check, whether the SMB server supports the STAT command."
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1210 ;; When we are not logged in yet, we return nil.
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1211 (if (let ((p (tramp-get-connection-process vec)))
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1212 (and p (processp p) (memq (process-status p) '(run open))))
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1213 (with-connection-property
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1214 (tramp-get-connection-process vec) "stat-capability"
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1215 (tramp-smb-send-command vec "stat ."))))
105551
2025d7d04cb9 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105524
diff changeset
1216
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1217
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1218 ;; Connection functions.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1219
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1220 (defun tramp-smb-send-command (vec command)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1221 "Send the COMMAND to connection VEC.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1222 Returns nil if there has been an error message from smbclient."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1223 (tramp-smb-maybe-open-connection vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1224 (tramp-message vec 6 "%s" command)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1225 (tramp-send-string vec command)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1226 (tramp-smb-wait-for-output vec))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1227
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1228 (defun tramp-smb-maybe-open-connection (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1229 "Maybe open a connection to HOST, log in as USER, using `tramp-smb-program'.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1230 Does not do anything if a connection is already open, but re-opens the
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1231 connection if a previous connection has died for some reason."
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
1232 (let* ((share (tramp-smb-get-share vec))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1233 (buf (tramp-get-buffer vec))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1234 (p (get-buffer-process buf)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1235
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1236 ;; Check whether we still have the same smbclient version.
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1237 ;; Otherwise, we must delete the connection cache, because
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1238 ;; capabilities migh have changed.
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1239 (unless (processp p)
105690
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1240 (let ((default-directory (tramp-compat-temporary-file-directory))
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1241 (command (concat tramp-smb-program " -V")))
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1242
105690
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1243 (unless tramp-smb-version
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1244 (unless (executable-find tramp-smb-program)
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1245 (tramp-error
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1246 vec 'file-error
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1247 "Cannot find command %s in %s" tramp-smb-program exec-path))
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1248 (setq tramp-smb-version (shell-command-to-string command))
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1249 (tramp-message vec 6 command)
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1250 (tramp-message vec 6 "\n%s" tramp-smb-version)
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1251 (if (string-match "[ \t\n\r]+\\'" tramp-smb-version)
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1252 (setq tramp-smb-version
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1253 (replace-match "" nil nil tramp-smb-version))))
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1254
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1255 (unless (string-equal
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1256 tramp-smb-version
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1257 (tramp-get-connection-property
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1258 vec "smbclient-version" tramp-smb-version))
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
1259 (tramp-flush-directory-property vec "")
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
1260 (tramp-flush-connection-property vec))
105690
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1261
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1262 (tramp-set-connection-property
8d8fc5285759 * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 105634
diff changeset
1263 vec "smbclient-version" tramp-smb-version)))
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1264
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1265 ;; If too much time has passed since last command was sent, look
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1266 ;; whether there has been an error message; maybe due to
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1267 ;; connection timeout.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1268 (with-current-buffer buf
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1269 (goto-char (point-min))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1270 (when (and (> (tramp-time-diff
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1271 (current-time)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1272 (tramp-get-connection-property
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1273 p "last-cmd-time" '(0 0 0)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1274 60)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1275 p (processp p) (memq (process-status p) '(run open))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1276 (re-search-forward tramp-smb-errors nil t))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1277 (delete-process p)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1278 (setq p nil)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1279
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1280 ;; Check whether it is still the same share.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1281 (unless
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1282 (and p (processp p) (memq (process-status p) '(run open))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1283 (string-equal
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1284 share
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1285 (tramp-get-connection-property p "smb-share" "")))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1286
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1287 (save-match-data
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1288 ;; There might be unread output from checking for share names.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1289 (when buf (with-current-buffer buf (erase-buffer)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1290 (when (and p (processp p)) (delete-process p))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1291
100857
51f12f881f02 * net/tramp-smb.el (top): Use `tramp-prefix-domain-regexp'.
Michael Albinus <michael.albinus@gmx.de>
parents: 99617
diff changeset
1292 (let* ((user (tramp-file-name-user vec))
51f12f881f02 * net/tramp-smb.el (top): Use `tramp-prefix-domain-regexp'.
Michael Albinus <michael.albinus@gmx.de>
parents: 99617
diff changeset
1293 (host (tramp-file-name-host vec))
51f12f881f02 * net/tramp-smb.el (top): Use `tramp-prefix-domain-regexp'.
Michael Albinus <michael.albinus@gmx.de>
parents: 99617
diff changeset
1294 (real-user (tramp-file-name-real-user vec))
51f12f881f02 * net/tramp-smb.el (top): Use `tramp-prefix-domain-regexp'.
Michael Albinus <michael.albinus@gmx.de>
parents: 99617
diff changeset
1295 (real-host (tramp-file-name-real-host vec))
51f12f881f02 * net/tramp-smb.el (top): Use `tramp-prefix-domain-regexp'.
Michael Albinus <michael.albinus@gmx.de>
parents: 99617
diff changeset
1296 (domain (tramp-file-name-domain vec))
51f12f881f02 * net/tramp-smb.el (top): Use `tramp-prefix-domain-regexp'.
Michael Albinus <michael.albinus@gmx.de>
parents: 99617
diff changeset
1297 (port (tramp-file-name-port vec))
51f12f881f02 * net/tramp-smb.el (top): Use `tramp-prefix-domain-regexp'.
Michael Albinus <michael.albinus@gmx.de>
parents: 99617
diff changeset
1298 args)
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1299
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1300 (if share
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1301 (setq args (list (concat "//" real-host "/" share)))
105616
13878abadf01 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105572
diff changeset
1302 (setq args (list "-g" "-L" real-host )))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1303
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1304 (if (not (zerop (length real-user)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1305 (setq args (append args (list "-U" real-user)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1306 (setq args (append args (list "-N"))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1307
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1308 (when domain (setq args (append args (list "-W" domain))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1309 (when port (setq args (append args (list "-p" port))))
106959
5071660bbec4 * net/tramp-smb.el (tramp-smb-conf): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 106815
diff changeset
1310 (when tramp-smb-conf
5071660bbec4 * net/tramp-smb.el (tramp-smb-conf): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 106815
diff changeset
1311 (setq args (append args (list "-s" tramp-smb-conf))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1312
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1313 ;; OK, let's go.
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1314 (with-progress-reporter
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1315 vec 3
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1316 (format "Opening connection for //%s%s/%s"
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1317 (if (not (zerop (length user))) (concat user "@") "")
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1318 host (or share ""))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1319
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1320 (let* ((coding-system-for-read nil)
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1321 (process-connection-type tramp-process-connection-type)
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1322 (p (let ((default-directory
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1323 (tramp-compat-temporary-file-directory)))
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1324 (apply #'start-process
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1325 (tramp-buffer-name vec) (tramp-get-buffer vec)
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1326 tramp-smb-program args))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1327
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1328 (tramp-message
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1329 vec 6 "%s" (mapconcat 'identity (process-command p) " "))
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1330 (tramp-set-process-query-on-exit-flag p nil)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1331
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1332 ;; Set variables for computing the prompt for reading password.
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1333 (setq tramp-current-method tramp-smb-method
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1334 tramp-current-user user
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1335 tramp-current-host host)
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1336
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1337 ;; Play login scenario.
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1338 (tramp-process-actions
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1339 p vec
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1340 (if share
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1341 tramp-smb-actions-with-share
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1342 tramp-smb-actions-without-share))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1343
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1344 ;; Check server version.
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1345 (with-current-buffer (tramp-get-connection-buffer vec)
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1346 (goto-char (point-min))
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1347 (search-forward-regexp
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1348 "Domain=\\[[^]]*\\] OS=\\[[^]]*\\] Server=\\[[^]]*\\]" nil t)
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1349 (let ((smbserver-version (match-string 0)))
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1350 (unless
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1351 (string-equal
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1352 smbserver-version
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1353 (tramp-get-connection-property
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1354 vec "smbserver-version" smbserver-version))
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1355 (tramp-flush-directory-property vec "")
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1356 (tramp-flush-connection-property vec))
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1357 (tramp-set-connection-property
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1358 vec "smbserver-version" smbserver-version)))
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1359
108540
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1360 ;; Set chunksize. Otherwise, `tramp-send-string' might
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1361 ;; try it itself.
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1362 (tramp-set-connection-property p "smb-share" share)
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1363 (tramp-set-connection-property
bfc1be04834c * net/tramp.el (with-progress-reporter): Create reporter object
Michael Albinus <albinus@detlef>
parents: 108244
diff changeset
1364 p "chunksize" tramp-chunksize))))))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1365
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1366 ;; We don't use timeouts. If needed, the caller shall wrap around.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1367 (defun tramp-smb-wait-for-output (vec)
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1368 "Wait for output from smbclient command.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1369 Returns nil if an error message has appeared."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1370 (with-current-buffer (tramp-get-buffer vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1371 (let ((p (get-buffer-process (current-buffer)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1372 (found (progn (goto-char (point-min))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1373 (re-search-forward tramp-smb-prompt nil t)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1374 (err (progn (goto-char (point-min))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1375 (re-search-forward tramp-smb-errors nil t))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1376
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1377 ;; Algorithm: get waiting output. See if last line contains
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1378 ;; tramp-smb-prompt sentinel or tramp-smb-errors strings.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1379 ;; If not, wait a bit and again get waiting output.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1380 (while (and (not found) (not err))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1381
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1382 ;; Accept pending output.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1383 (tramp-accept-process-output p)
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
1384
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1385 ;; Search for prompt.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1386 (goto-char (point-min))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1387 (setq found (re-search-forward tramp-smb-prompt nil t))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1388
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1389 ;; Search for errors.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1390 (goto-char (point-min))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1391 (setq err (re-search-forward tramp-smb-errors nil t)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1392
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1393 ;; When the process is still alive, read pending output.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1394 (while (and (not found) (memq (process-status p) '(run open)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1395
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1396 ;; Accept pending output.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1397 (tramp-accept-process-output p)
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1398
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1399 ;; Search for prompt.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1400 (goto-char (point-min))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1401 (setq found (re-search-forward tramp-smb-prompt nil t)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1402
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1403 ;; Return value is whether no error message has appeared.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1404 (tramp-message vec 6 "\n%s" (buffer-string))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1405 (not err))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1406
110264
ec526909f60b Migrate to Tramp 2.2. Rearrange load dependencies.
Michael Albinus <michael.albinus@gmx.de>
parents: 110015
diff changeset
1407 (add-hook 'tramp-unload-hook
ec526909f60b Migrate to Tramp 2.2. Rearrange load dependencies.
Michael Albinus <michael.albinus@gmx.de>
parents: 110015
diff changeset
1408 (lambda ()
ec526909f60b Migrate to Tramp 2.2. Rearrange load dependencies.
Michael Albinus <michael.albinus@gmx.de>
parents: 110015
diff changeset
1409 (unload-feature 'tramp-smb 'force)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1410
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1411 (provide 'tramp-smb)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1412
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1413 ;;; TODO:
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1414
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1415 ;; * Error handling in case password is wrong.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1416 ;; * Read password from "~/.netrc".
105509
69bf209a4707 * net/tramp-smb.el (tramp-smb-errors): Add error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 105383
diff changeset
1417 ;; * Return more comprehensive file permission string.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1418 ;; * Try to remove the inclusion of dummy "" directory. Seems to be at
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1419 ;; several places, especially in `tramp-smb-handle-insert-directory'.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1420 ;; * (RMS) Use unwind-protect to clean up the state so as to make the state
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1421 ;; regular again.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1422 ;; * Make it multi-hop capable.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1423
93975
1e3a407766b9 Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91489
diff changeset
1424 ;; arch-tag: fcc9dbec-7503-4d73-b638-3c8aa59575f5
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1425 ;;; tramp-smb.el ends here