annotate lisp/net/tramp.el @ 106643:9e3bbd77797c

* net/tramp.el (tramp-handle-insert-directory): Quote "'" in the switches. Check also for //SUBDIRED// line.
author Michael Albinus <michael.albinus@gmx.de>
date Sat, 26 Dec 2009 20:04:43 +0000
parents 291ea018e478
children 1d1d5d9bd884
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1 ;;; tramp.el --- Transparent Remote Access, Multiple Protocol
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2
64701
34bd8e434dd7 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64559
diff changeset
3 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
4 ;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
5
75361
9cc44485654f (tramp-perl-encode, tramp-perl-decode): Update copyrights.
Glenn Morris <rgm@gnu.org>
parents: 75194
diff changeset
6 ;; (copyright statements below in code to be updated with the above notice)
9cc44485654f (tramp-perl-encode, tramp-perl-decode): Update copyrights.
Glenn Morris <rgm@gnu.org>
parents: 75194
diff changeset
7
93103
19a32f437b65 Fix up encoding.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93082
diff changeset
8 ;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
64772
060177e931f8 Sync with Tramp 2.0.50.
Michael Albinus <michael.albinus@gmx.de>
parents: 64701
diff changeset
9 ;; Michael Albinus <michael.albinus@gmx.de>
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
10 ;; Keywords: comm, processes
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
11
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
12 ;; This file is part of GNU Emacs.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
13
94677
91e5880a36c1 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94436
diff changeset
14 ;; GNU Emacs is free software: you can redistribute it and/or modify
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
15 ;; 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: 94436
diff changeset
16 ;; 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: 94436
diff changeset
17 ;; (at your option) any later version.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
18
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
19 ;; GNU Emacs is distributed in the hope that it will be useful,
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
20 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
22 ;; GNU General Public License for more details.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
23
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
24 ;; 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: 94436
diff changeset
25 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
26
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
27 ;;; Commentary:
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
28
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
29 ;; This package provides remote file editing, similar to ange-ftp.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
30 ;; The difference is that ange-ftp uses FTP to transfer files between
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
31 ;; the local and the remote host, whereas tramp.el uses a combination
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
32 ;; of rsh and rcp or other work-alike programs, such as ssh/scp.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
33 ;;
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
34 ;; For more detailed instructions, please see the info file.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
35 ;;
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
36 ;; Notes:
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
37 ;; -----
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59582
diff changeset
38 ;;
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
39 ;; This package only works for Emacs 21.1 and higher, and for XEmacs 21.4
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
40 ;; and higher. For XEmacs 21, you need the package `fsf-compat' for
106643
9e3bbd77797c * net/tramp.el (tramp-handle-insert-directory): Quote "'" in the
Michael Albinus <michael.albinus@gmx.de>
parents: 106613
diff changeset
41 ;; the `with-timeout' macro.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
42 ;;
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
43 ;; Also see the todo list at the bottom of this file.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
44 ;;
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
45 ;; The current version of Tramp can be retrieved from the following URL:
60763
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 60287
diff changeset
46 ;; http://ftp.gnu.org/gnu/tramp/
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
47 ;;
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
48 ;; There's a mailing list for this, as well. Its name is:
60763
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 60287
diff changeset
49 ;; tramp-devel@gnu.org
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 60287
diff changeset
50 ;; You can use the Web to subscribe, under the following URL:
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 60287
diff changeset
51 ;; http://lists.gnu.org/mailman/listinfo/tramp-devel
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
52 ;;
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
53 ;; For the adventurous, the current development sources are available
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
54 ;; via CVS. You can find instructions about this at the following URL:
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
55 ;; http://savannah.gnu.org/projects/tramp/
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
56 ;; Click on "CVS" in the navigation bar near the top.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
57 ;;
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
58 ;; Don't forget to put on your asbestos longjohns, first!
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
59
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
60 ;;; Code:
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
61
100216
9c5b974a0a5b * net/tramp.el (top): Write a message, when loading Tramp.
Michael Albinus <michael.albinus@gmx.de>
parents: 99950
diff changeset
62 ;; Since Emacs 23.1, loading messages have been disabled during
9c5b974a0a5b * net/tramp.el (top): Write a message, when loading Tramp.
Michael Albinus <michael.albinus@gmx.de>
parents: 99950
diff changeset
63 ;; autoload. However, loading Tramp takes a while, and it could
9c5b974a0a5b * net/tramp.el (top): Write a message, when loading Tramp.
Michael Albinus <michael.albinus@gmx.de>
parents: 99950
diff changeset
64 ;; happen while typing a filename in the minibuffer. Therefore, Tramp
9c5b974a0a5b * net/tramp.el (top): Write a message, when loading Tramp.
Michael Albinus <michael.albinus@gmx.de>
parents: 99950
diff changeset
65 ;; shall inform about.
9c5b974a0a5b * net/tramp.el (top): Write a message, when loading Tramp.
Michael Albinus <michael.albinus@gmx.de>
parents: 99950
diff changeset
66 (when (and load-in-progress (null (current-message)))
9c5b974a0a5b * net/tramp.el (top): Write a message, when loading Tramp.
Michael Albinus <michael.albinus@gmx.de>
parents: 99950
diff changeset
67 (message "Loading tramp..."))
9c5b974a0a5b * net/tramp.el (top): Write a message, when loading Tramp.
Michael Albinus <michael.albinus@gmx.de>
parents: 99950
diff changeset
68
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
69 ;; The Tramp version number and bug report address, as prepared by configure.
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
70 (require 'trampver)
68335
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
71 (add-hook 'tramp-unload-hook
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
72 (lambda ()
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
73 (when (featurep 'trampver)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
74 (unload-feature 'trampver 'force))))
68335
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
75
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
76 (require 'tramp-compat)
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
77 (add-hook 'tramp-unload-hook
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
78 (lambda ()
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
79 (when (featurep 'tramp-compat)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
80 (unload-feature 'tramp-compat 'force))))
68335
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
81
87322
e99e230d7eb3 * files.el (cd-absolute): Set `list-buffers-directory' in order to
Michael Albinus <michael.albinus@gmx.de>
parents: 87040
diff changeset
82 (require 'format-spec) ; from Gnus 5.8, also in tar ball
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
83 ;; As long as password.el is not part of (X)Emacs, it shouldn't
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
84 ;; be mandatory
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
85 (if (featurep 'xemacs)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
86 (load "password" 'noerror)
87040
dcdf399ba8a4 Require password-cache or password.
Glenn Morris <rgm@gnu.org>
parents: 86241
diff changeset
87 (or (require 'password-cache nil 'noerror)
dcdf399ba8a4 Require password-cache or password.
Glenn Morris <rgm@gnu.org>
parents: 86241
diff changeset
88 (require 'password nil 'noerror))) ; from No Gnus, also in tar ball
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
89
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
90 (require 'shell)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
91 (require 'advice)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
92
95067
e29bfedb7864 (top-level): Load auth-source when compiling.
Glenn Morris <rgm@gnu.org>
parents: 95050
diff changeset
93 (eval-and-compile
e29bfedb7864 (top-level): Load auth-source when compiling.
Glenn Morris <rgm@gnu.org>
parents: 95050
diff changeset
94 (if (featurep 'xemacs)
e29bfedb7864 (top-level): Load auth-source when compiling.
Glenn Morris <rgm@gnu.org>
parents: 95050
diff changeset
95 (load "auth-source" 'noerror)
e29bfedb7864 (top-level): Load auth-source when compiling.
Glenn Morris <rgm@gnu.org>
parents: 95050
diff changeset
96 (require 'auth-source nil 'noerror)))
95025
bdaea36b81dd * net/tramp.el: Load auth-source library.
Michael Albinus <michael.albinus@gmx.de>
parents: 94975
diff changeset
97
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
98 ;; Requiring 'tramp-cache results in an endless loop.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
99 (autoload 'tramp-get-file-property "tramp-cache")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
100 (autoload 'tramp-set-file-property "tramp-cache")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
101 (autoload 'tramp-flush-file-property "tramp-cache")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
102 (autoload 'tramp-flush-directory-property "tramp-cache")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
103 (autoload 'tramp-get-connection-property "tramp-cache")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
104 (autoload 'tramp-set-connection-property "tramp-cache")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
105 (autoload 'tramp-flush-connection-property "tramp-cache")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
106 (autoload 'tramp-parse-connection-properties "tramp-cache")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
107 (add-hook 'tramp-unload-hook
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
108 (lambda ()
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
109 (when (featurep 'tramp-cache)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
110 (unload-feature 'tramp-cache 'force))))
78887
8faf94b6c420 * net/tramp.el (tramp-completion-mode-p): Rename from
Michael Albinus <michael.albinus@gmx.de>
parents: 78489
diff changeset
111
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
112 (autoload 'tramp-uuencode-region "tramp-uu"
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
113 "Implementation of `uuencode' in Lisp.")
68335
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
114 (add-hook 'tramp-unload-hook
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
115 (lambda ()
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
116 (when (featurep 'tramp-uu)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
117 (unload-feature 'tramp-uu 'force))))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
118
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
119 (autoload 'uudecode-decode-region "uudecode")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
120
87648
7ae99e295dfd * vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents: 87368
diff changeset
121 ;; The following Tramp packages must be loaded after tramp.el, because
7ae99e295dfd * vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents: 87368
diff changeset
122 ;; they require it as well.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
123 (eval-after-load "tramp"
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
124 '(dolist
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
125 (feature
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
126 (list
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
127
87648
7ae99e295dfd * vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents: 87368
diff changeset
128 ;; Tramp interactive commands.
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
129 'tramp-cmds
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
130
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
131 ;; Load foreign FTP method.
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
132 (if (featurep 'xemacs) 'tramp-efs 'tramp-ftp)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
133
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
134 ;; tramp-smb uses "smbclient" from Samba. Not available
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
135 ;; under Cygwin and Windows, because they don't offer
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
136 ;; "smbclient". And even not necessary there, because Emacs
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
137 ;; supports UNC file names like "//host/share/localname".
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
138 (unless (memq system-type '(cygwin windows-nt)) 'tramp-smb)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
139
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
140 ;; Load foreign FISH method.
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
141 'tramp-fish
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
142
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
143 ;; tramp-gvfs needs D-Bus messages. Available since Emacs 23
104216
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
144 ;; on some system types. We don't call `dbus-ping', because
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
145 ;; this would load dbus.el.
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
146 (when (and (featurep 'dbusbind)
104143
49b412e99f1e * net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents: 104137
diff changeset
147 (condition-case nil
49b412e99f1e * net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents: 104137
diff changeset
148 (funcall 'dbus-get-unique-name :session)
49b412e99f1e * net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents: 104137
diff changeset
149 (error nil))
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
150 (tramp-compat-process-running-p "gvfs-fuse-daemon"))
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
151 'tramp-gvfs)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
152
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
153 ;; Load gateways. It needs `make-network-process' from Emacs 22.
105248
ebd8445069df *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 104866
diff changeset
154 (when (functionp 'make-network-process) 'tramp-gw)
ebd8445069df *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 104866
diff changeset
155
ebd8445069df *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 104866
diff changeset
156 ;; tramp-imap needs both epa (from Emacs 23.1) and imap-hash
ebd8445069df *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 104866
diff changeset
157 ;; (from Emacs 23.2).
ebd8445069df *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 104866
diff changeset
158 (when (and (locate-library "epa") (locate-library "imap-hash"))
ebd8445069df *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 104866
diff changeset
159 'tramp-imap)))
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
160
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
161 (when feature
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
162 ;; We have used just some basic tests, whether a package shall
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
163 ;; be added. There might still be other errors during loading,
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
164 ;; which we will catch here.
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
165 (catch 'tramp-loading
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
166 (require feature)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
167 (add-hook 'tramp-unload-hook
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
168 `(lambda ()
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
169 (when (featurep (quote ,feature))
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
170 (unload-feature (quote ,feature) 'force)))))
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
171 (unless (featurep feature)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
172 (message "Loading %s failed, ignoring this package" feature)))))
77986
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
173
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
174 ;;; User Customizable Internal Variables:
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
175
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
176 (defgroup tramp nil
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
177 "Edit remote files with a combination of rsh and rcp or similar programs."
58005
f15a720d0f24 (tramp group): Add :version.
Richard M. Stallman <rms@gnu.org>
parents: 57995
diff changeset
178 :group 'files
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59582
diff changeset
179 :version "22.1")
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
180
94436
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
181 ;; Maybe we need once a real Tramp mode, with key bindings etc.
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
182 ;;;###autoload
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
183 (defcustom tramp-mode t
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
184 "*Whether Tramp is enabled.
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
185 If it is set to nil, all remote file names are used literally."
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
186 :group 'tramp
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
187 :type 'boolean)
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
188
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
189 (defcustom tramp-verbose 3
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
190 "*Verbosity level for Tramp messages.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
191 Any level x includes messages for all levels 1 .. x-1. The levels are
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
192
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
193 0 silent (no tramp messages at all)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
194 1 errors
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
195 2 warnings
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
196 3 connection to remote hosts (default level)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
197 4 activities
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
198 5 internal
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
199 6 sent and received strings
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
200 7 file caching
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
201 8 connection properties
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
202 10 traces (huge)."
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
203 :group 'tramp
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
204 :type 'integer)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
205
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
206 ;; Emacs case.
55420
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
207 (eval-and-compile
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
208 (when (boundp 'backup-directory-alist)
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
209 (defcustom tramp-backup-directory-alist nil
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
210 "Alist of filename patterns and backup directory names.
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
211 Each element looks like (REGEXP . DIRECTORY), with the same meaning like
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
212 in `backup-directory-alist'. If a Tramp file is backed up, and DIRECTORY
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
213 is a local file name, the backup directory is prepended with Tramp file
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
214 name prefix \(method, user, host\) of file.
55420
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
215
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
216 \(setq tramp-backup-directory-alist backup-directory-alist\)
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
217
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
218 gives the same backup policy for Tramp files on their hosts like the
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
219 policy for local files."
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
220 :group 'tramp
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
221 :type '(repeat (cons (regexp :tag "Regexp matching filename")
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
222 (directory :tag "Backup directory name"))))))
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
223
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
224 ;; XEmacs case. We cannot check for `bkup-backup-directory-info', because
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
225 ;; the package "backup-dir" might not be loaded yet.
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
226 (eval-and-compile
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
227 (when (featurep 'xemacs)
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
228 (defcustom tramp-bkup-backup-directory-info nil
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
229 "*Alist of (FILE-REGEXP BACKUP-DIR OPTIONS ...))
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
230 It has the same meaning like `bkup-backup-directory-info' from package
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
231 `backup-dir'. If a Tramp file is backed up, and BACKUP-DIR is a local
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
232 file name, the backup directory is prepended with Tramp file name prefix
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
233 \(method, user, host\) of file.
55420
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
234
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
235 \(setq tramp-bkup-backup-directory-info bkup-backup-directory-info\)
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
236
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
237 gives the same backup policy for Tramp files on their hosts like the
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
238 policy for local files."
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59582
diff changeset
239 :type '(repeat
55420
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
240 (list (regexp :tag "File regexp")
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
241 (string :tag "Backup Dir")
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
242 (set :inline t
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
243 (const ok-create)
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
244 (const full-path)
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
245 (const prepend-name)
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
246 (const search-upward))))
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
247 :group 'tramp)))
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
248
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
249 (defcustom tramp-auto-save-directory nil
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
250 "*Put auto-save files in this directory, if set.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
251 The idea is to use a local directory so that auto-saving is faster."
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
252 :group 'tramp
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
253 :type '(choice (const nil) string))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
254
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
255 (defcustom tramp-encoding-shell
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
256 (if (memq system-type '(windows-nt))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
257 (getenv "COMSPEC")
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
258 "/bin/sh")
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
259 "*Use this program for encoding and decoding commands on the local host.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
260 This shell is used to execute the encoding and decoding command on the
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
261 local host, so if you want to use `~' in those commands, you should
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
262 choose a shell here which groks tilde expansion. `/bin/sh' normally
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
263 does not understand tilde expansion.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
264
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
265 For encoding and deocding, commands like the following are executed:
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
266
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
267 /bin/sh -c COMMAND < INPUT > OUTPUT
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
268
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
269 This variable can be used to change the \"/bin/sh\" part. See the
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
270 variable `tramp-encoding-command-switch' for the \"-c\" part.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
271
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
272 Note that this variable is not used for remote commands. There are
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
273 mechanisms in tramp.el which automatically determine the right shell to
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
274 use for the remote host."
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
275 :group 'tramp
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
276 :type '(file :must-match t))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
277
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
278 (defcustom tramp-encoding-command-switch
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
279 (if (string-match "cmd\\.exe" tramp-encoding-shell)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
280 "/c"
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
281 "-c")
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
282 "*Use this switch together with `tramp-encoding-shell' for local commands.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
283 See the variable `tramp-encoding-shell' for more information."
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
284 :group 'tramp
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
285 :type 'string)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
286
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
287 (defcustom tramp-copy-size-limit 10240
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
288 "*The maximum file size where inline copying is preferred over an out-of-the-band copy."
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
289 :group 'tramp
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
290 :type 'integer)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
291
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
292 (defcustom tramp-terminal-type "dumb"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
293 "*Value of TERM environment variable for logging in to remote host.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
294 Because Tramp wants to parse the output of the remote shell, it is easily
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
295 confused by ANSI color escape sequences and suchlike. Often, shell init
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
296 files conditionalize this setup based on the TERM environment variable."
46584
f548d7d0c651 Bump version to 2.0.2.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46347
diff changeset
297 :group 'tramp
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
298 :type 'string)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
299
106470
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
300 ;; ksh on OpenBSD 4.5 requires, that PS1 contains a `#' character for
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
301 ;; root users. It uses the `$' character for other users. In order
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
302 ;; to guarantee a proper prompt, we use "#$" for the prompt.
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
303
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
304 (defvar tramp-end-of-output
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
305 (format
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
306 "///%s#$"
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
307 (md5 (concat (prin1-to-string process-environment) (current-time-string))))
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
308 "String used to recognize end of output.
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
309 The '$' character at the end is quoted; the string cannot be
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
310 detected as prompt when being sent on echoing hosts, therefore.")
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
311
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
312 (defconst tramp-initial-end-of-output "#$ "
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
313 "Prompt when establishing a connection.")
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
314
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
315 (defvar tramp-methods
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
316 `(("rcp" (tramp-login-program "rsh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
317 (tramp-login-args (("%h") ("-l" "%u")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
318 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
319 (tramp-copy-program "rcp")
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
320 (tramp-copy-args (("-p" "%k") ("-r")))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
321 (tramp-copy-keep-date t)
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
322 (tramp-copy-recursive t)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
323 (tramp-password-end-of-line nil))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
324 ("scp" (tramp-login-program "ssh")
96941
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
325 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") ("-q")
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
326 ("-e" "none")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
327 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
328 (tramp-copy-program "scp")
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
329 (tramp-copy-args (("-P" "%p") ("-p" "%k")
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
330 ("-q") ("-r")))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
331 (tramp-copy-keep-date t)
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
332 (tramp-copy-recursive t)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
333 (tramp-password-end-of-line nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
334 (tramp-gw-args (("-o"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
335 "GlobalKnownHostsFile=/dev/null")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
336 ("-o" "UserKnownHostsFile=/dev/null")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
337 ("-o" "StrictHostKeyChecking=no")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
338 (tramp-default-port 22))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
339 ("scp1" (tramp-login-program "ssh")
96941
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
340 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") ("-q")
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
341 ("-1" "-e" "none")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
342 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
343 (tramp-copy-program "scp")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
344 (tramp-copy-args (("-1") ("-P" "%p") ("-p" "%k")
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
345 ("-q") ("-r")))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
346 (tramp-copy-keep-date t)
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
347 (tramp-copy-recursive t)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
348 (tramp-password-end-of-line nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
349 (tramp-gw-args (("-o"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
350 "GlobalKnownHostsFile=/dev/null")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
351 ("-o" "UserKnownHostsFile=/dev/null")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
352 ("-o" "StrictHostKeyChecking=no")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
353 (tramp-default-port 22))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
354 ("scp2" (tramp-login-program "ssh")
96941
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
355 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") ("-q")
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
356 ("-2" "-e" "none")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
357 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
358 (tramp-copy-program "scp")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
359 (tramp-copy-args (("-2") ("-P" "%p") ("-p" "%k")
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
360 ("-q") ("-r")))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
361 (tramp-copy-keep-date t)
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
362 (tramp-copy-recursive t)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
363 (tramp-password-end-of-line nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
364 (tramp-gw-args (("-o"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
365 "GlobalKnownHostsFile=/dev/null")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
366 ("-o" "UserKnownHostsFile=/dev/null")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
367 ("-o" "StrictHostKeyChecking=no")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
368 (tramp-default-port 22))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
369 ("scp1_old"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
370 (tramp-login-program "ssh1")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
371 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
372 ("-e" "none")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
373 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
374 (tramp-copy-program "scp1")
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
375 (tramp-copy-args (("-p" "%k") ("-r")))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
376 (tramp-copy-keep-date t)
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
377 (tramp-copy-recursive t)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
378 (tramp-password-end-of-line nil))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
379 ("scp2_old"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
380 (tramp-login-program "ssh2")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
381 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
382 ("-e" "none")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
383 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
384 (tramp-copy-program "scp2")
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
385 (tramp-copy-args (("-p" "%k") ("-r")))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
386 (tramp-copy-keep-date t)
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
387 (tramp-copy-recursive t)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
388 (tramp-password-end-of-line nil))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
389 ("sftp" (tramp-login-program "ssh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
390 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
391 ("-e" "none")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
392 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
393 (tramp-copy-program "sftp")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
394 (tramp-copy-args nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
395 (tramp-copy-keep-date nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
396 (tramp-password-end-of-line nil))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
397 ("rsync" (tramp-login-program "ssh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
398 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
399 ("-e" "none")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
400 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
401 (tramp-copy-program "rsync")
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
402 (tramp-copy-args (("-e" "ssh") ("-t" "%k") ("-r")))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
403 (tramp-copy-keep-date t)
105718
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
404 (tramp-copy-keep-tmpfile t)
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
405 (tramp-copy-recursive t)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
406 (tramp-password-end-of-line nil))
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
407 ("rsyncc"
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
408 (tramp-login-program "ssh")
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
409 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p")
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
410 ("-o" "ControlPath=%t.%%r@%%h:%%p")
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
411 ("-o" "ControlMaster=yes")
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
412 ("-e" "none")))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
413 (tramp-remote-sh "/bin/sh")
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
414 (tramp-copy-program "rsync")
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
415 (tramp-copy-args (("-t" "%k") ("-r")))
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
416 (tramp-copy-env (("RSYNC_RSH")
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
417 (,(concat
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
418 "ssh"
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
419 " -o ControlPath=%t.%%r@%%h:%%p"
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
420 " -o ControlMaster=auto"))))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
421 (tramp-copy-keep-date t)
105718
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
422 (tramp-copy-keep-tmpfile t)
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
423 (tramp-copy-recursive t)
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
424 (tramp-password-end-of-line nil))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
425 ("remcp" (tramp-login-program "remsh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
426 (tramp-login-args (("%h") ("-l" "%u")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
427 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
428 (tramp-copy-program "rcp")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
429 (tramp-copy-args (("-p" "%k")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
430 (tramp-copy-keep-date t)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
431 (tramp-password-end-of-line nil))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
432 ("rsh" (tramp-login-program "rsh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
433 (tramp-login-args (("%h") ("-l" "%u")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
434 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
435 (tramp-copy-program nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
436 (tramp-copy-args nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
437 (tramp-copy-keep-date nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
438 (tramp-password-end-of-line nil))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
439 ("ssh" (tramp-login-program "ssh")
96941
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
440 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") ("-q")
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
441 ("-e" "none")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
442 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
443 (tramp-copy-program nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
444 (tramp-copy-args nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
445 (tramp-copy-keep-date nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
446 (tramp-password-end-of-line nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
447 (tramp-gw-args (("-o"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
448 "GlobalKnownHostsFile=/dev/null")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
449 ("-o" "UserKnownHostsFile=/dev/null")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
450 ("-o" "StrictHostKeyChecking=no")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
451 (tramp-default-port 22))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
452 ("ssh1" (tramp-login-program "ssh")
96941
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
453 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") ("-q")
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
454 ("-1" "-e" "none")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
455 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
456 (tramp-copy-program nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
457 (tramp-copy-args nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
458 (tramp-copy-keep-date nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
459 (tramp-password-end-of-line nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
460 (tramp-gw-args (("-o"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
461 "GlobalKnownHostsFile=/dev/null")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
462 ("-o" "UserKnownHostsFile=/dev/null")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
463 ("-o" "StrictHostKeyChecking=no")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
464 (tramp-default-port 22))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
465 ("ssh2" (tramp-login-program "ssh")
96941
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
466 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") ("-q")
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
467 ("-2" "-e" "none")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
468 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
469 (tramp-copy-program nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
470 (tramp-copy-args nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
471 (tramp-copy-keep-date nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
472 (tramp-password-end-of-line nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
473 (tramp-gw-args (("-o"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
474 "GlobalKnownHostsFile=/dev/null")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
475 ("-o" "UserKnownHostsFile=/dev/null")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
476 ("-o" "StrictHostKeyChecking=no")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
477 (tramp-default-port 22))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
478 ("ssh1_old"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
479 (tramp-login-program "ssh1")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
480 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
481 ("-e" "none")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
482 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
483 (tramp-copy-program nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
484 (tramp-copy-args nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
485 (tramp-copy-keep-date nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
486 (tramp-password-end-of-line nil))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
487 ("ssh2_old"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
488 (tramp-login-program "ssh2")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
489 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
490 ("-e" "none")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
491 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
492 (tramp-copy-program nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
493 (tramp-copy-args nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
494 (tramp-copy-keep-date nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
495 (tramp-password-end-of-line nil))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
496 ("remsh" (tramp-login-program "remsh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
497 (tramp-login-args (("%h") ("-l" "%u")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
498 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
499 (tramp-copy-program nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
500 (tramp-copy-args nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
501 (tramp-copy-keep-date nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
502 (tramp-password-end-of-line nil))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
503 ("telnet"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
504 (tramp-login-program "telnet")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
505 (tramp-login-args (("%h") ("%p")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
506 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
507 (tramp-copy-program nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
508 (tramp-copy-args nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
509 (tramp-copy-keep-date nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
510 (tramp-password-end-of-line nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
511 (tramp-default-port 23))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
512 ("su" (tramp-login-program "su")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
513 (tramp-login-args (("-") ("%u")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
514 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
515 (tramp-copy-program nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
516 (tramp-copy-args nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
517 (tramp-copy-keep-date nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
518 (tramp-password-end-of-line nil))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
519 ("sudo" (tramp-login-program "sudo")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
520 (tramp-login-args (("-u" "%u")
88072
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
521 ("-s") ("-H") ("-p" "Password:")))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
522 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
523 (tramp-copy-program nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
524 (tramp-copy-args nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
525 (tramp-copy-keep-date nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
526 (tramp-password-end-of-line nil))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
527 ("scpc" (tramp-login-program "ssh")
96941
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
528 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") ("-q")
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
529 ("-o" "ControlPath=%t.%%r@%%h:%%p")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
530 ("-o" "ControlMaster=yes")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
531 ("-e" "none")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
532 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
533 (tramp-copy-program "scp")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
534 (tramp-copy-args (("-P" "%p") ("-p" "%k") ("-q")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
535 ("-o" "ControlPath=%t.%%r@%%h:%%p")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
536 ("-o" "ControlMaster=auto")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
537 (tramp-copy-keep-date t)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
538 (tramp-password-end-of-line nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
539 (tramp-gw-args (("-o"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
540 "GlobalKnownHostsFile=/dev/null")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
541 ("-o" "UserKnownHostsFile=/dev/null")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
542 ("-o" "StrictHostKeyChecking=no")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
543 (tramp-default-port 22))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
544 ("scpx" (tramp-login-program "ssh")
96941
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
545 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") ("-q")
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
546 ("-e" "none" "-t" "-t" "/bin/sh")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
547 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
548 (tramp-copy-program "scp")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
549 (tramp-copy-args (("-p" "%k")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
550 (tramp-copy-keep-date t)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
551 (tramp-password-end-of-line nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
552 (tramp-gw-args (("-o"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
553 "GlobalKnownHostsFile=/dev/null")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
554 ("-o" "UserKnownHostsFile=/dev/null")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
555 ("-o" "StrictHostKeyChecking=no")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
556 (tramp-default-port 22))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
557 ("sshx" (tramp-login-program "ssh")
96941
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
558 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") ("-q")
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
559 ("-e" "none" "-t" "-t" "/bin/sh")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
560 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
561 (tramp-copy-program nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
562 (tramp-copy-args nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
563 (tramp-copy-keep-date nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
564 (tramp-password-end-of-line nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
565 (tramp-gw-args (("-o"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
566 "GlobalKnownHostsFile=/dev/null")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
567 ("-o" "UserKnownHostsFile=/dev/null")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
568 ("-o" "StrictHostKeyChecking=no")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
569 (tramp-default-port 22))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
570 ("krlogin"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
571 (tramp-login-program "krlogin")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
572 (tramp-login-args (("%h") ("-l" "%u") ("-x")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
573 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
574 (tramp-copy-program nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
575 (tramp-copy-args nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
576 (tramp-copy-keep-date nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
577 (tramp-password-end-of-line nil))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
578 ("plink" (tramp-login-program "plink")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
579 (tramp-login-args (("%h") ("-l" "%u") ("-P" "%p")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
580 ("-ssh")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
581 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
582 (tramp-copy-program nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
583 (tramp-copy-args nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
584 (tramp-copy-keep-date nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
585 (tramp-password-end-of-line "xy") ;see docstring for "xy"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
586 (tramp-default-port 22))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
587 ("plink1"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
588 (tramp-login-program "plink")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
589 (tramp-login-args (("%h") ("-l" "%u") ("-P" "%p")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
590 ("-1" "-ssh")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
591 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
592 (tramp-copy-program nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
593 (tramp-copy-args nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
594 (tramp-copy-keep-date nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
595 (tramp-password-end-of-line "xy") ;see docstring for "xy"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
596 (tramp-default-port 22))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
597 ("plinkx"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
598 (tramp-login-program "plink")
88072
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
599 ;; ("%h") must be a single element, see
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
600 ;; `tramp-compute-multi-hops'.
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
601 (tramp-login-args (("-load") ("%h") ("-t")
81938
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
602 (,(format
106470
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
603 "env 'TERM=%s' 'PROMPT_COMMAND=' 'PS1=%s'"
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
604 tramp-terminal-type
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
605 tramp-initial-end-of-output))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
606 ("/bin/sh")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
607 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
608 (tramp-copy-program nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
609 (tramp-copy-args nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
610 (tramp-copy-keep-date nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
611 (tramp-password-end-of-line nil))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
612 ("pscp" (tramp-login-program "plink")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
613 (tramp-login-args (("%h") ("-l" "%u") ("-P" "%p")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
614 ("-ssh")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
615 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
616 (tramp-copy-program "pscp")
93829
11d77c788381 * net/tramp.el (tramp-methods): Fix again tramp-copy-args of
Michael Albinus <michael.albinus@gmx.de>
parents: 93666
diff changeset
617 (tramp-copy-args (("-P" "%p") ("-scp") ("-p" "%k")))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
618 (tramp-copy-keep-date t)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
619 (tramp-password-end-of-line "xy") ;see docstring for "xy"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
620 (tramp-default-port 22))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
621 ("psftp" (tramp-login-program "plink")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
622 (tramp-login-args (("%h") ("-l" "%u") ("-P" "%p")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
623 ("-ssh")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
624 (tramp-remote-sh "/bin/sh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
625 (tramp-copy-program "pscp")
93829
11d77c788381 * net/tramp.el (tramp-methods): Fix again tramp-copy-args of
Michael Albinus <michael.albinus@gmx.de>
parents: 93666
diff changeset
626 (tramp-copy-args (("-P" "%p") ("-sftp") ("-p" "%k")))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
627 (tramp-copy-keep-date t)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
628 (tramp-password-end-of-line "xy")) ;see docstring for "xy"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
629 ("fcp" (tramp-login-program "fsh")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
630 (tramp-login-args (("%h") ("-l" "%u") ("sh" "-i")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
631 (tramp-remote-sh "/bin/sh -i")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
632 (tramp-copy-program "fcp")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
633 (tramp-copy-args (("-p" "%k")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
634 (tramp-copy-keep-date t)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
635 (tramp-password-end-of-line nil)))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
636 "*Alist of methods for remote files.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
637 This is a list of entries of the form (NAME PARAM1 PARAM2 ...).
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
638 Each NAME stands for a remote access method. Each PARAM is a
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
639 pair of the form (KEY VALUE). The following KEYs are defined:
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
640 * `tramp-remote-sh'
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
641 This specifies the Bourne shell to use on the remote host. This
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
642 MUST be a Bourne-like shell. It is normally not necessary to set
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
643 this to any value other than \"/bin/sh\": Tramp wants to use a shell
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
644 which groks tilde expansion, but it can search for it. Also note
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
645 that \"/bin/sh\" exists on all Unixen, this might not be true for
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
646 the value that you decide to use. You Have Been Warned.
51177
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
647 * `tramp-login-program'
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
648 This specifies the name of the program to use for logging in to the
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
649 remote host. This may be the name of rsh or a workalike program,
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
650 or the name of telnet or a workalike, or the name of su or a workalike.
51177
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
651 * `tramp-login-args'
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
652 This specifies the list of arguments to pass to the above
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
653 mentioned program. Please note that this is a list of list of arguments,
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
654 that is, normally you don't want to put \"-a -b\" or \"-f foo\"
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
655 here. Instead, you want a list (\"-a\" \"-b\"), or (\"-f\" \"foo\").
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
656 There are some patterns: \"%h\" in this list is replaced by the host
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
657 name, \"%u\" is replaced by the user name, \"%p\" is replaced by the
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
658 port number, and \"%%\" can be used to obtain a literal percent character.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
659 If a list containing \"%h\", \"%u\" or \"%p\" is unchanged during
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
660 expansion (i.e. no host or no user specified), this list is not used as
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
661 argument. By this, arguments like (\"-l\" \"%u\") are optional.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
662 \"%t\" is replaced by the temporary file name produced with
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
663 `tramp-make-tramp-temp-file'. \"%k\" indicates the keep-date
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
664 parameter of a program, if exists.
51177
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
665 * `tramp-copy-program'
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
666 This specifies the name of the program to use for remotely copying
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
667 the file; this might be the absolute filename of rcp or the name of
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
668 a workalike program.
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
669 * `tramp-copy-args'
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
670 This specifies the list of parameters to pass to the above mentioned
51177
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
671 program, the hints for `tramp-login-args' also apply here.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
672 * `tramp-copy-keep-date'
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
673 This specifies whether the copying program when the preserves the
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
674 timestamp of the original file.
105718
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
675 * `tramp-copy-keep-tmpfile'
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
676 This specifies whether a temporary local file shall be kept
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
677 for optimization reasons (useful for \"rsync\" methods).
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
678 * `tramp-copy-recursive'
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
679 Whether the operation copies directories recursively.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
680 * `tramp-default-port'
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
681 The default port of a method is needed in case of gateway connections.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
682 Additionally, it is used as indication which method is prepared for
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
683 passing gateways.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
684 * `tramp-gw-args'
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
685 As the attribute name says, additional arguments are specified here
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
686 when a method is applied via a gateway.
51968
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
687 * `tramp-password-end-of-line'
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
688 This specifies the string to use for terminating the line after
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
689 submitting the password. If this method parameter is nil, then the
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
690 value of the normal variable `tramp-default-password-end-of-line'
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
691 is used. This parameter is necessary because the \"plink\" program
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
692 requires any two characters after sending the password. These do
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
693 not have to be newline or carriage return characters. Other login
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
694 programs are happy with just one character, the newline character.
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
695 We use \"xy\" as the value for methods using \"plink\".
51177
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
696
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
697 What does all this mean? Well, you should specify `tramp-login-program'
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
698 for all methods; this program is used to log in to the remote site. Then,
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
699 there are two ways to actually transfer the files between the local and the
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
700 remote side. One way is using an additional rcp-like program. If you want
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
701 to do this, set `tramp-copy-program' in the method.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
702
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
703 Another possibility for file transfer is inline transfer, i.e. the
51177
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
704 file is passed through the same buffer used by `tramp-login-program'. In
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
705 this case, the file contents need to be protected since the
51177
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
706 `tramp-login-program' might use escape codes or the connection might not
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
707 be eight-bit clean. Therefore, file contents are encoded for transit.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
708 See the variables `tramp-local-coding-commands' and
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
709 `tramp-remote-coding-commands' for details.
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
710
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
711 So, to summarize: if the method is an out-of-band method, then you
51177
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
712 must specify `tramp-copy-program' and `tramp-copy-args'. If it is an
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
713 inline method, then these two parameters should be nil. Methods which
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
714 are fit for gateways must have `tramp-default-port' at least.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
715
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
716 Notes:
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
717
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
718 When using `su' or `sudo' the phrase `open connection to a remote
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
719 host' sounds strange, but it is used nevertheless, for consistency.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
720 No connection is opened to a remote host, but `su' or `sudo' is
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
721 started on the local host. You should specify a remote host
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
722 `localhost' or the name of the local host. Another host name is
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
723 useful only in combination with `tramp-default-proxies-alist'.")
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
724
51177
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
725 (defcustom tramp-default-method
74777
948c86bf6396 * net/tramp.el (tramp-default-method): We still need to check for
Michael Albinus <michael.albinus@gmx.de>
parents: 74766
diff changeset
726 ;; An external copy method seems to be preferred, because it is much
948c86bf6396 * net/tramp.el (tramp-default-method): We still need to check for
Michael Albinus <michael.albinus@gmx.de>
parents: 74766
diff changeset
727 ;; more performant for large files, and it hasn't too serious delays
948c86bf6396 * net/tramp.el (tramp-default-method): We still need to check for
Michael Albinus <michael.albinus@gmx.de>
parents: 74766
diff changeset
728 ;; for small files. But it must be ensured that there aren't
948c86bf6396 * net/tramp.el (tramp-default-method): We still need to check for
Michael Albinus <michael.albinus@gmx.de>
parents: 74766
diff changeset
729 ;; permanent password queries. Either a password agent like
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
730 ;; "ssh-agent" or "Pageant" shall run, or the optional
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
731 ;; password-cache.el or auth-sources.el packages shall be active for
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
732 ;; password caching. "scpc" would be another good choice because of
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
733 ;; the "ControlMaster" option, but this is a more modern alternative
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
734 ;; in OpenSSH 4, which cannot be taken as default.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
735 (cond
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
736 ;; PuTTY is installed.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
737 ((executable-find "pscp")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
738 (if (or (fboundp 'password-read)
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
739 (fboundp 'auth-source-user-or-password)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
740 ;; Pageant is running.
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
741 (tramp-compat-process-running-p "Pageant"))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
742 "pscp"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
743 "plink"))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
744 ;; There is an ssh installation.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
745 ((executable-find "scp")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
746 (if (or (fboundp 'password-read)
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
747 (fboundp 'auth-source-user-or-password)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
748 ;; ssh-agent is running.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
749 (getenv "SSH_AUTH_SOCK")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
750 (getenv "SSH_AGENT_PID"))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
751 "scp"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
752 "ssh"))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
753 ;; Fallback.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
754 (t "ftp"))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
755 "*Default method to use for transferring files.
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
756 See `tramp-methods' for possibilities.
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
757 Also see `tramp-default-method-alist'."
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
758 :group 'tramp
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
759 :type 'string)
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
760
46306
66cce4969490 (tramp-default-method): New default method "sm"
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46166
diff changeset
761 (defcustom tramp-default-method-alist
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
762 '(("\\`localhost\\'" "\\`root\\'" "su"))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
763 "*Default method to use for specific host/user pairs.
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
764 This is an alist of items (HOST USER METHOD). The first matching item
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
765 specifies the method to use for a file name which does not specify a
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
766 method. HOST and USER are regular expressions or nil, which is
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
767 interpreted as a regular expression which always matches. If no entry
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
768 matches, the variable `tramp-default-method' takes effect.
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
769
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
770 If the file name does not specify the user, lookup is done using the
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
771 empty string for the user name.
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
772
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
773 See `tramp-methods' for a list of possibilities for METHOD."
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
774 :group 'tramp
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
775 :type '(repeat (list (regexp :tag "Host regexp")
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
776 (regexp :tag "User regexp")
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
777 (string :tag "Method"))))
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
778
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
779 (defcustom tramp-default-user
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
780 nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
781 "*Default user to use for transferring files.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
782 It is nil by default; otherwise settings in configuration files like
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
783 \"~/.ssh/config\" would be overwritten. Also see `tramp-default-user-alist'.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
784
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
785 This variable is regarded as obsolete, and will be removed soon."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
786 :group 'tramp
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
787 :type '(choice (const nil) string))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
788
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
789 (defcustom tramp-default-user-alist
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
790 `(("\\`su\\(do\\)?\\'" nil "root")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
791 ("\\`r\\(em\\)?\\(cp\\|sh\\)\\|telnet\\|plink1?\\'"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
792 nil ,(user-login-name)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
793 "*Default user to use for specific method/host pairs.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
794 This is an alist of items (METHOD HOST USER). The first matching item
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
795 specifies the user to use for a file name which does not specify a
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
796 user. METHOD and USER are regular expressions or nil, which is
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
797 interpreted as a regular expression which always matches. If no entry
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
798 matches, the variable `tramp-default-user' takes effect.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
799
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
800 If the file name does not specify the method, lookup is done using the
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
801 empty string for the method name."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
802 :group 'tramp
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
803 :type '(repeat (list (regexp :tag "Method regexp")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
804 (regexp :tag "Host regexp")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
805 (string :tag "User"))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
806
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
807 (defcustom tramp-default-host
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
808 (system-name)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
809 "*Default host to use for transferring files.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
810 Useful for su and sudo methods mostly."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
811 :group 'tramp
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
812 :type 'string)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
813
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
814 (defcustom tramp-default-proxies-alist nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
815 "*Route to be followed for specific host/user pairs.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
816 This is an alist of items (HOST USER PROXY). The first matching
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
817 item specifies the proxy to be passed for a file name located on
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
818 a remote target matching USER@HOST. HOST and USER are regular
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
819 expressions. PROXY must be a Tramp filename without a localname
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
820 part. Method and user name on PROXY are optional, which is
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
821 interpreted with the default values. PROXY can contain the
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
822 patterns %h and %u, which are replaced by the strings matching
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
823 HOST or USER, respectively.
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
824
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
825 HOST, USER or PROXY could also be Lisp forms, which will be
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
826 evaluated. The result must be a string or nil, which is
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
827 interpreted as a regular expression which always matches."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
828 :group 'tramp
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
829 :type '(repeat (list (choice :tag "Host regexp" regexp sexp)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
830 (choice :tag "User regexp" regexp sexp)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
831 (choice :tag "Proxy remote name" string (const nil)))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
832
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
833 (defconst tramp-local-host-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
834 (concat
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
835 "^" (regexp-opt (list "localhost" (system-name) "127\.0\.0\.1" "::1") t) "$")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
836 "*Host names which are regarded as local host.")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
837
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
838 (defconst tramp-completion-function-alist-rsh
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
839 '((tramp-parse-rhosts "/etc/hosts.equiv")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
840 (tramp-parse-rhosts "~/.rhosts"))
51177
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
841 "Default list of (FUNCTION FILE) pairs to be examined for rsh methods.")
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
842
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
843 (defconst tramp-completion-function-alist-ssh
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
844 '((tramp-parse-rhosts "/etc/hosts.equiv")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
845 (tramp-parse-rhosts "/etc/shosts.equiv")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
846 (tramp-parse-shosts "/etc/ssh_known_hosts")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
847 (tramp-parse-sconfig "/etc/ssh_config")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
848 (tramp-parse-shostkeys "/etc/ssh2/hostkeys")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
849 (tramp-parse-sknownhosts "/etc/ssh2/knownhosts")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
850 (tramp-parse-rhosts "~/.rhosts")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
851 (tramp-parse-rhosts "~/.shosts")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
852 (tramp-parse-shosts "~/.ssh/known_hosts")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
853 (tramp-parse-sconfig "~/.ssh/config")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
854 (tramp-parse-shostkeys "~/.ssh2/hostkeys")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
855 (tramp-parse-sknownhosts "~/.ssh2/knownhosts"))
51177
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
856 "Default list of (FUNCTION FILE) pairs to be examined for ssh methods.")
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
857
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
858 (defconst tramp-completion-function-alist-telnet
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
859 '((tramp-parse-hosts "/etc/hosts"))
51177
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
860 "Default list of (FUNCTION FILE) pairs to be examined for telnet methods.")
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
861
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
862 (defconst tramp-completion-function-alist-su
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
863 '((tramp-parse-passwd "/etc/passwd"))
51177
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
864 "Default list of (FUNCTION FILE) pairs to be examined for su methods.")
47578
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
865
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
866 (defconst tramp-completion-function-alist-putty
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
867 '((tramp-parse-putty
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
868 "HKEY_CURRENT_USER\\Software\\SimonTatham\\PuTTY\\Sessions"))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
869 "Default list of (FUNCTION REGISTRY) pairs to be examined for putty methods.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
870
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
871 (defvar tramp-completion-function-alist nil
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
872 "*Alist of methods for remote files.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
873 This is a list of entries of the form (NAME PAIR1 PAIR2 ...).
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
874 Each NAME stands for a remote access method. Each PAIR is of the form
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
875 \(FUNCTION FILE). FUNCTION is responsible to extract user names and host
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
876 names from FILE for completion. The following predefined FUNCTIONs exists:
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
877
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
878 * `tramp-parse-rhosts' for \"~/.rhosts\" like files,
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
879 * `tramp-parse-shosts' for \"~/.ssh/known_hosts\" like files,
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
880 * `tramp-parse-sconfig' for \"~/.ssh/config\" like files,
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
881 * `tramp-parse-shostkeys' for \"~/.ssh2/hostkeys/*\" like files,
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
882 * `tramp-parse-sknownhosts' for \"~/.ssh2/knownhosts/*\" like files,
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
883 * `tramp-parse-hosts' for \"/etc/hosts\" like files,
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
884 * `tramp-parse-passwd' for \"/etc/passwd\" like files.
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
885 * `tramp-parse-netrc' for \"~/.netrc\" like files.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
886 * `tramp-parse-putty' for PuTTY registry keys.
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
887
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
888 FUNCTION can also be a customer defined function. For more details see
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
889 the info pages.")
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
890
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
891 (eval-after-load "tramp"
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
892 '(progn
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
893 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
894 "rcp" tramp-completion-function-alist-rsh)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
895 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
896 "scp" tramp-completion-function-alist-ssh)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
897 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
898 "scp1" tramp-completion-function-alist-ssh)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
899 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
900 "scp2" tramp-completion-function-alist-ssh)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
901 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
902 "scp1_old" tramp-completion-function-alist-ssh)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
903 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
904 "scp2_old" tramp-completion-function-alist-ssh)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
905 (tramp-set-completion-function
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
906 "rsync" tramp-completion-function-alist-ssh)
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
907 (tramp-set-completion-function
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
908 "rsyncc" tramp-completion-function-alist-ssh)
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
909 (tramp-set-completion-function
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
910 "remcp" tramp-completion-function-alist-rsh)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
911 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
912 "rsh" tramp-completion-function-alist-rsh)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
913 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
914 "ssh" tramp-completion-function-alist-ssh)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
915 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
916 "ssh1" tramp-completion-function-alist-ssh)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
917 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
918 "ssh2" tramp-completion-function-alist-ssh)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
919 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
920 "ssh1_old" tramp-completion-function-alist-ssh)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
921 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
922 "ssh2_old" tramp-completion-function-alist-ssh)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
923 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
924 "remsh" tramp-completion-function-alist-rsh)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
925 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
926 "telnet" tramp-completion-function-alist-telnet)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
927 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
928 "su" tramp-completion-function-alist-su)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
929 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
930 "sudo" tramp-completion-function-alist-su)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
931 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
932 "scpx" tramp-completion-function-alist-ssh)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
933 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
934 "sshx" tramp-completion-function-alist-ssh)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
935 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
936 "krlogin" tramp-completion-function-alist-rsh)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
937 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
938 "plink" tramp-completion-function-alist-ssh)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
939 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
940 "plink1" tramp-completion-function-alist-ssh)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
941 (tramp-set-completion-function
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
942 "plinkx" tramp-completion-function-alist-putty)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
943 (tramp-set-completion-function
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
944 "pscp" tramp-completion-function-alist-ssh)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
945 (tramp-set-completion-function
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
946 "fcp" tramp-completion-function-alist-ssh)))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
947
94975
5bb8f7b3f835 * net/tramp.el (tramp-echo-mark): Update docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 94677
diff changeset
948 (defconst tramp-echo-mark-marker "_echo"
5bb8f7b3f835 * net/tramp.el (tramp-echo-mark): Update docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 94677
diff changeset
949 "String marker to surround echoed commands.")
5bb8f7b3f835 * net/tramp.el (tramp-echo-mark): Update docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 94677
diff changeset
950
106597
b0e5aae20733 * net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 106508
diff changeset
951 (defconst tramp-echo-mark-marker-length (length tramp-echo-mark-marker)
b0e5aae20733 * net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 106508
diff changeset
952 "String length of `tramp-echo-mark-marker'.")
b0e5aae20733 * net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 106508
diff changeset
953
b0e5aae20733 * net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 106508
diff changeset
954 (defconst tramp-echo-mark
b0e5aae20733 * net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 106508
diff changeset
955 (concat tramp-echo-mark-marker
b0e5aae20733 * net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 106508
diff changeset
956 (make-string tramp-echo-mark-marker-length ?\b))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
957 "String mark to be transmitted around shell commands.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
958 Used to separate their echo from the output they produce. This
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
959 will only be used if we cannot disable remote echo via stty.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
960 This string must have no effect on the remote shell except for
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
961 producing some echo which can later be detected by
94975
5bb8f7b3f835 * net/tramp.el (tramp-echo-mark): Update docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 94677
diff changeset
962 `tramp-echoed-echo-mark-regexp'. Using `tramp-echo-mark-marker',
5bb8f7b3f835 * net/tramp.el (tramp-echo-mark): Update docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 94677
diff changeset
963 followed by an equal number of backspaces to erase them will
5bb8f7b3f835 * net/tramp.el (tramp-echo-mark): Update docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 94677
diff changeset
964 usually suffice.")
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
965
106597
b0e5aae20733 * net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 106508
diff changeset
966 (defconst tramp-echoed-echo-mark-regexp
b0e5aae20733 * net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 106508
diff changeset
967 (format "%s\\(\b\\( \b\\)?\\)\\{%d\\}"
b0e5aae20733 * net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 106508
diff changeset
968 tramp-echo-mark-marker tramp-echo-mark-marker-length)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
969 "Regexp which matches `tramp-echo-mark' as it gets echoed by
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
970 the remote shell.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
971
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
972 (defcustom tramp-rsh-end-of-line "\n"
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
973 "*String used for end of line in rsh connections.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
974 I don't think this ever needs to be changed, so please tell me about it
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
975 if you need to change this.
51968
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
976 Also see the method parameter `tramp-password-end-of-line' and the normal
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
977 variable `tramp-default-password-end-of-line'."
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
978 :group 'tramp
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
979 :type 'string)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
980
51968
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
981 (defcustom tramp-default-password-end-of-line
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
982 tramp-rsh-end-of-line
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
983 "*String used for end of line after sending a password.
51968
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
984 This variable provides the default value for the method parameter
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
985 `tramp-password-end-of-line', see `tramp-methods' for more details.
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
986
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
987 It seems that people using plink under Windows need to send
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
988 \"\\r\\n\" (carriage-return, then newline) after a password, but just
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
989 \"\\n\" after all other lines. This variable can be used for the
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
990 password, see `tramp-rsh-end-of-line' for the other cases.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
991
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
992 The default value is to use the same value as `tramp-rsh-end-of-line'."
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
993 :group 'tramp
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
994 :type 'string)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
995
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
996 ;; "getconf PATH" yields:
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
997 ;; HP-UX: /usr/bin:/usr/ccs/bin:/opt/ansic/bin:/opt/langtools/bin:/opt/fortran/bin
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
998 ;; Solaris: /usr/xpg4/bin:/usr/ccs/bin:/usr/bin:/opt/SUNWspro/bin
87648
7ae99e295dfd * vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents: 87368
diff changeset
999 ;; GNU/Linux (Debian, Suse): /bin:/usr/bin
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1000 ;; FreeBSD: /usr/bin:/bin:/usr/sbin:/sbin: - beware trailing ":"!
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1001 (defcustom tramp-remote-path
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1002 '(tramp-default-remote-path "/usr/sbin" "/usr/local/bin"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1003 "/local/bin" "/local/freeware/bin" "/local/gnu/bin"
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1004 "/usr/freeware/bin" "/usr/pkg/bin" "/usr/contrib/bin")
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1005 "*List of directories to search for executables on remote host.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1006 For every remote host, this variable will be set buffer local,
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1007 keeping the list of existing directories on that host.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1008
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1009 You can use `~' in this list, but when searching for a shell which groks
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1010 tilde expansion, all directory names starting with `~' will be ignored.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1011
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1012 `Default Directories' represent the list of directories given by
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1013 the command \"getconf PATH\". It is recommended to use this
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1014 entry on top of this list, because these are the default
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
1015 directories for POSIX compatible commands.
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
1016
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
1017 `Private Directories' are the settings of the $PATH environment,
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
1018 as given in your `~/.profile'."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1019 :group 'tramp
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1020 :type '(repeat (choice
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1021 (const :tag "Default Directories" tramp-default-remote-path)
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
1022 (const :tag "Private Directories" tramp-own-remote-path)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1023 (string :tag "Directory"))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1024
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1025 (defcustom tramp-remote-process-environment
87921
c49bc2860fd0 * net/tramp.el (tramp-remote-process-environment): Set "LC_ALL=C".
Michael Albinus <michael.albinus@gmx.de>
parents: 87748
diff changeset
1026 `("HISTFILE=$HOME/.tramp_history" "HISTSIZE=1" "LC_ALL=C"
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1027 ,(concat "TERM=" tramp-terminal-type)
97613
d78633cfcc28 * net/tramp.el (tramp-remote-process-environment): Add "EMACS=t"
Michael Albinus <michael.albinus@gmx.de>
parents: 97445
diff changeset
1028 "EMACS=t" ;; Deprecated.
d78633cfcc28 * net/tramp.el (tramp-remote-process-environment): Add "EMACS=t"
Michael Albinus <michael.albinus@gmx.de>
parents: 97445
diff changeset
1029 ,(format "INSIDE_EMACS=%s,tramp:%s" emacs-version tramp-version)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1030 "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH="
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1031 "autocorrect=" "correct=")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1032
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1033 "*List of environment variables to be set on the remote host.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1034
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1035 Each element should be a string of the form ENVVARNAME=VALUE. An
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1036 entry ENVVARNAME= diables the corresponding environment variable,
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1037 which might have been set in the init files like ~/.profile.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1038
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1039 Special handling is applied to the PATH environment, which should
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1040 not be set here. Instead of, it should be set via `tramp-remote-path'."
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1041 :group 'tramp
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1042 :type '(repeat string))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1043
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1044 (defcustom tramp-login-prompt-regexp
65605
efa862a76bc2 * net/tramp.el (tramp-login-prompt-regexp): Expand regexp in order to
Michael Albinus <michael.albinus@gmx.de>
parents: 65359
diff changeset
1045 ".*ogin\\( .*\\)?: *"
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1046 "*Regexp matching login-like prompts.
65605
efa862a76bc2 * net/tramp.el (tramp-login-prompt-regexp): Expand regexp in order to
Michael Albinus <michael.albinus@gmx.de>
parents: 65359
diff changeset
1047 The regexp should match at end of buffer.
efa862a76bc2 * net/tramp.el (tramp-login-prompt-regexp): Expand regexp in order to
Michael Albinus <michael.albinus@gmx.de>
parents: 65359
diff changeset
1048
efa862a76bc2 * net/tramp.el (tramp-login-prompt-regexp): Expand regexp in order to
Michael Albinus <michael.albinus@gmx.de>
parents: 65359
diff changeset
1049 Sometimes the prompt is reported to look like \"login as:\"."
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1050 :group 'tramp
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1051 :type 'regexp)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1052
46998
9d6aef07c793 Version 2.0.14 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46992
diff changeset
1053 (defcustom tramp-shell-prompt-pattern
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
1054 ;; Allow a prompt to start right after a ^M since it indeed would be
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
1055 ;; displayed at the beginning of the line (and Zsh uses it).
106470
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
1056 "\\(?:^\\|\r\\)[^#$%>\n]*#?[#$%>] *\\(\e\\[[0-9;]*[a-zA-Z] *\\)*"
46998
9d6aef07c793 Version 2.0.14 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46992
diff changeset
1057 "Regexp to match prompts from remote shell.
9d6aef07c793 Version 2.0.14 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46992
diff changeset
1058 Normally, Tramp expects you to configure `shell-prompt-pattern'
9d6aef07c793 Version 2.0.14 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46992
diff changeset
1059 correctly, but sometimes it happens that you are connecting to a
9d6aef07c793 Version 2.0.14 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46992
diff changeset
1060 remote host which sends a different kind of shell prompt. Therefore,
9d6aef07c793 Version 2.0.14 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46992
diff changeset
1061 Tramp recognizes things matched by `shell-prompt-pattern' as prompt,
9d6aef07c793 Version 2.0.14 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46992
diff changeset
1062 and also things matched by this variable. The default value of this
51177
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
1063 variable is similar to the default value of `shell-prompt-pattern',
106470
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
1064 which should work well in many cases.
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
1065
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
1066 This regexp must match both `tramp-initial-end-of-output' and
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
1067 `tramp-end-of-output'."
46998
9d6aef07c793 Version 2.0.14 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46992
diff changeset
1068 :group 'tramp
9d6aef07c793 Version 2.0.14 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46992
diff changeset
1069 :type 'regexp)
9d6aef07c793 Version 2.0.14 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46992
diff changeset
1070
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1071 (defcustom tramp-password-prompt-regexp
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1072 "^.*\\([pP]assword\\|[pP]assphrase\\).*:\^@? *"
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1073 "*Regexp matching password-like prompts.
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1074 The regexp should match at end of buffer.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1075
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1076 The `sudo' program appears to insert a `^@' character into the prompt."
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1077 :group 'tramp
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1078 :type 'regexp)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1079
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1080 (defcustom tramp-wrong-passwd-regexp
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1081 (concat "^.*"
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1082 ;; These strings should be on the last line
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
1083 (regexp-opt '("Permission denied"
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1084 "Login incorrect"
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1085 "Login Incorrect"
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1086 "Connection refused"
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1087 "Connection closed"
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1088 "Sorry, try again."
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1089 "Name or service not known"
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1090 "Host key verification failed."
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
1091 "No supported authentication methods left to try!") t)
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1092 ".*"
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1093 "\\|"
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1094 "^.*\\("
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1095 ;; Here comes a list of regexes, separated by \\|
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1096 "Received signal [0-9]+"
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1097 "\\).*")
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1098 "*Regexp matching a `login failed' message.
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1099 The regexp should match at end of buffer."
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1100 :group 'tramp
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1101 :type 'regexp)
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1102
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1103 (defcustom tramp-yesno-prompt-regexp
46992
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
1104 (concat
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
1105 (regexp-opt '("Are you sure you want to continue connecting (yes/no)?") t)
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
1106 "\\s-*")
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
1107 "Regular expression matching all yes/no queries which need to be confirmed.
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1108 The confirmation should be done with yes or no.
46992
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
1109 The regexp should match at end of buffer.
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
1110 See also `tramp-yn-prompt-regexp'."
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1111 :group 'tramp
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1112 :type 'regexp)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1113
46992
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
1114 (defcustom tramp-yn-prompt-regexp
74985
155a8e75cd11 Sync with Tramp 2.0.55.
Michael Albinus <michael.albinus@gmx.de>
parents: 74777
diff changeset
1115 (concat
155a8e75cd11 Sync with Tramp 2.0.55.
Michael Albinus <michael.albinus@gmx.de>
parents: 74777
diff changeset
1116 (regexp-opt '("Store key in cache? (y/n)"
155a8e75cd11 Sync with Tramp 2.0.55.
Michael Albinus <michael.albinus@gmx.de>
parents: 74777
diff changeset
1117 "Update cached key? (y/n, Return cancels connection)") t)
155a8e75cd11 Sync with Tramp 2.0.55.
Michael Albinus <michael.albinus@gmx.de>
parents: 74777
diff changeset
1118 "\\s-*")
46992
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
1119 "Regular expression matching all y/n queries which need to be confirmed.
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
1120 The confirmation should be done with y or n.
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
1121 The regexp should match at end of buffer.
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
1122 See also `tramp-yesno-prompt-regexp'."
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
1123 :group 'tramp
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
1124 :type 'regexp)
47771
ac3dfc909b56 Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47683
diff changeset
1125
ac3dfc909b56 Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47683
diff changeset
1126 (defcustom tramp-terminal-prompt-regexp
ac3dfc909b56 Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47683
diff changeset
1127 (concat "\\("
ac3dfc909b56 Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47683
diff changeset
1128 "TERM = (.*)"
ac3dfc909b56 Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47683
diff changeset
1129 "\\|"
ac3dfc909b56 Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47683
diff changeset
1130 "Terminal type\\? \\[.*\\]"
ac3dfc909b56 Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47683
diff changeset
1131 "\\)\\s-*")
ac3dfc909b56 Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47683
diff changeset
1132 "Regular expression matching all terminal setting prompts.
ac3dfc909b56 Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47683
diff changeset
1133 The regexp should match at end of buffer.
ac3dfc909b56 Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47683
diff changeset
1134 The answer will be provided by `tramp-action-terminal', which see."
ac3dfc909b56 Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47683
diff changeset
1135 :group 'tramp
ac3dfc909b56 Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47683
diff changeset
1136 :type 'regexp)
46992
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
1137
59582
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
1138 (defcustom tramp-operation-not-permitted-regexp
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
1139 (concat "\\(" "preserving times.*" "\\|" "set mode" "\\)" ":\\s-*"
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
1140 (regexp-opt '("Operation not permitted") t))
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
1141 "Regular expression matching keep-date problems in (s)cp operations.
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
1142 Copying has been performed successfully already, so this message can
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
1143 be ignored safely."
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
1144 :group 'tramp
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
1145 :type 'regexp)
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
1146
74166
5b973e5dc882 (tramp-default-method): Under Windows, change from plink to pscp.
Lars Hansen <larsh@soem.dk>
parents: 74052
diff changeset
1147 (defcustom tramp-copy-failed-regexp
5b973e5dc882 (tramp-default-method): Under Windows, change from plink to pscp.
Lars Hansen <larsh@soem.dk>
parents: 74052
diff changeset
1148 (concat "\\(.+: "
5b973e5dc882 (tramp-default-method): Under Windows, change from plink to pscp.
Lars Hansen <larsh@soem.dk>
parents: 74052
diff changeset
1149 (regexp-opt '("Permission denied"
5b973e5dc882 (tramp-default-method): Under Windows, change from plink to pscp.
Lars Hansen <larsh@soem.dk>
parents: 74052
diff changeset
1150 "not a regular file"
5b973e5dc882 (tramp-default-method): Under Windows, change from plink to pscp.
Lars Hansen <larsh@soem.dk>
parents: 74052
diff changeset
1151 "is a directory"
5b973e5dc882 (tramp-default-method): Under Windows, change from plink to pscp.
Lars Hansen <larsh@soem.dk>
parents: 74052
diff changeset
1152 "No such file or directory") t)
5b973e5dc882 (tramp-default-method): Under Windows, change from plink to pscp.
Lars Hansen <larsh@soem.dk>
parents: 74052
diff changeset
1153 "\\)\\s-*")
5b973e5dc882 (tramp-default-method): Under Windows, change from plink to pscp.
Lars Hansen <larsh@soem.dk>
parents: 74052
diff changeset
1154 "Regular expression matching copy problems in (s)cp operations."
5b973e5dc882 (tramp-default-method): Under Windows, change from plink to pscp.
Lars Hansen <larsh@soem.dk>
parents: 74052
diff changeset
1155 :group 'tramp
5b973e5dc882 (tramp-default-method): Under Windows, change from plink to pscp.
Lars Hansen <larsh@soem.dk>
parents: 74052
diff changeset
1156 :type 'regexp)
5b973e5dc882 (tramp-default-method): Under Windows, change from plink to pscp.
Lars Hansen <larsh@soem.dk>
parents: 74052
diff changeset
1157
55844
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
1158 (defcustom tramp-process-alive-regexp
55420
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
1159 ""
55844
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
1160 "Regular expression indicating a process has finished.
55420
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
1161 In fact this expression is empty by intention, it will be used only to
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
1162 check regularly the status of the associated process.
56460
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
1163 The answer will be provided by `tramp-action-process-alive',
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1164 `tramp-action-out-of-band', which see."
55420
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
1165 :group 'tramp
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
1166 :type 'regexp)
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
1167
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1168 (defcustom tramp-temp-name-prefix "tramp."
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1169 "*Prefix to use for temporary files.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1170 If this is a relative file name (such as \"tramp.\"), it is considered
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1171 relative to the directory name returned by the function
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
1172 `tramp-compat-temporary-file-directory' (which see). It may also be an
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1173 absolute file name; don't forget to include a prefix for the filename
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1174 part, though."
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1175 :group 'tramp
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1176 :type 'string)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1177
96941
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
1178 (defconst tramp-temp-buffer-name " *tramp temp*"
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
1179 "Buffer name for a temporary buffer.
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
1180 It shall be used in combination with `generate-new-buffer-name'.")
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
1181
105718
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
1182 (defvar tramp-temp-buffer-file-name nil
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
1183 "File name of a persistent local temporary file.
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
1184 Useful for \"rsync\" like methods.")
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
1185 (make-variable-buffer-local 'tramp-temp-buffer-file-name)
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
1186
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
1187 (defcustom tramp-sh-extra-args '(("/bash\\'" . "-norc -noprofile"))
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
1188 "*Alist specifying extra arguments to pass to the remote shell.
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
1189 Entries are (REGEXP . ARGS) where REGEXP is a regular expression
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
1190 matching the shell file name and ARGS is a string specifying the
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
1191 arguments.
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
1192
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
1193 This variable is only used when Tramp needs to start up another shell
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
1194 for tilde expansion. The extra arguments should typically prevent the
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
1195 shell from reading its init file."
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
1196 :group 'tramp
51968
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
1197 ;; This might be the wrong way to test whether the widget type
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
1198 ;; `alist' is available. Who knows the right way to test it?
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
1199 :type (if (get 'alist 'widget-type)
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
1200 '(alist :key-type string :value-type string)
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
1201 '(repeat (cons string string))))
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
1202
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1203 ;; XEmacs is distributed with few Lisp packages. Further packages are
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1204 ;; installed using EFS. If we use a unified filename format, then
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1205 ;; Tramp is required in addition to EFS. (But why can't Tramp just
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1206 ;; disable EFS when Tramp is loaded? Then XEmacs can ship with EFS
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1207 ;; just like before.) Another reason for using a separate filename
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1208 ;; syntax on XEmacs is that EFS hooks into XEmacs in many places, but
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1209 ;; Tramp only knows how to deal with `file-name-handler-alist', not
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1210 ;; the other places.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1211
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1212 ;; Currently, we have the choice between 'ftp, 'sep, and 'url.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1213 ;;;###autoload
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1214 (defcustom tramp-syntax
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1215 (if (featurep 'xemacs) 'sep 'ftp)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1216 "Tramp filename syntax to be used.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1217
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1218 It can have the following values:
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1219
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1220 'ftp -- Ange-FTP respective EFS like syntax (GNU Emacs default)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1221 'sep -- Syntax as defined for XEmacs (not available yet for GNU Emacs)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1222 'url -- URL-like syntax."
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1223 :group 'tramp
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1224 :type (if (featurep 'xemacs)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1225 '(choice (const :tag "EFS" ftp)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1226 (const :tag "XEmacs" sep)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1227 (const :tag "URL" url))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1228 '(choice (const :tag "Ange-FTP" ftp)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1229 (const :tag "URL" url))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1230
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1231 (defconst tramp-prefix-format
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1232 (cond ((equal tramp-syntax 'ftp) "/")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1233 ((equal tramp-syntax 'sep) "/[")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1234 ((equal tramp-syntax 'url) "/")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1235 (t (error "Wrong `tramp-syntax' defined")))
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
1236 "*String matching the very beginning of Tramp file names.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1237 Used in `tramp-make-tramp-file-name'.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1238
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1239 (defconst tramp-prefix-regexp
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1240 (concat "^" (regexp-quote tramp-prefix-format))
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
1241 "*Regexp matching the very beginning of Tramp file names.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1242 Should always start with \"^\". Derived from `tramp-prefix-format'.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1243
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1244 (defconst tramp-method-regexp
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1245 "[a-zA-Z_0-9-]+"
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1246 "*Regexp matching methods identifiers.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1247
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1248 (defconst tramp-postfix-method-format
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1249 (cond ((equal tramp-syntax 'ftp) ":")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1250 ((equal tramp-syntax 'sep) "/")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1251 ((equal tramp-syntax 'url) "://")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1252 (t (error "Wrong `tramp-syntax' defined")))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1253 "*String matching delimeter between method and user or host names.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1254 Used in `tramp-make-tramp-file-name'.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1255
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1256 (defconst tramp-postfix-method-regexp
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1257 (regexp-quote tramp-postfix-method-format)
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1258 "*Regexp matching delimeter between method and user or host names.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1259 Derived from `tramp-postfix-method-format'.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1260
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1261 (defconst tramp-user-regexp
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1262 "[^:/ \t]+"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1263 "*Regexp matching user names.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1264
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1265 (defconst tramp-prefix-domain-format "%"
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1266 "*String matching delimeter between user and domain names.")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1267
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1268 (defconst tramp-prefix-domain-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1269 (regexp-quote tramp-prefix-domain-format)
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1270 "*Regexp matching delimeter between user and domain names.
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1271 Derived from `tramp-prefix-domain-format'.")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1272
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1273 (defconst tramp-domain-regexp
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
1274 "[-a-zA-Z0-9_.]+"
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1275 "*Regexp matching domain names.")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1276
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1277 (defconst tramp-user-with-domain-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1278 (concat "\\(" tramp-user-regexp "\\)"
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1279 tramp-prefix-domain-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1280 "\\(" tramp-domain-regexp "\\)")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1281 "*Regexp matching user names with domain names.")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1282
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1283 (defconst tramp-postfix-user-format
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1284 "@"
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1285 "*String matching delimeter between user and host names.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1286 Used in `tramp-make-tramp-file-name'.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1287
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1288 (defconst tramp-postfix-user-regexp
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1289 (regexp-quote tramp-postfix-user-format)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1290 "*Regexp matching delimeter between user and host names.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1291 Derived from `tramp-postfix-user-format'.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1292
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1293 (defconst tramp-host-regexp
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1294 "[a-zA-Z0-9_.-]+"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1295 "*Regexp matching host names.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1296
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1297 (defconst tramp-prefix-ipv6-format
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1298 (cond ((equal tramp-syntax 'ftp) "[")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1299 ((equal tramp-syntax 'sep) "")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1300 ((equal tramp-syntax 'url) "[")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1301 (t (error "Wrong `tramp-syntax' defined")))
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1302 "*String matching left hand side of IPv6 addresses.
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1303 Used in `tramp-make-tramp-file-name'.")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1304
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1305 (defconst tramp-prefix-ipv6-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1306 (regexp-quote tramp-prefix-ipv6-format)
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1307 "*Regexp matching left hand side of IPv6 addresses.
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1308 Derived from `tramp-prefix-ipv6-format'.")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1309
101282
986acdda4aac * net/tramp.el (tramp-ipv6-regexp): The regexp shall cover also
Michael Albinus <michael.albinus@gmx.de>
parents: 101020
diff changeset
1310 ;; The following regexp is a bit sloppy. But it shall serve our
986acdda4aac * net/tramp.el (tramp-ipv6-regexp): The regexp shall cover also
Michael Albinus <michael.albinus@gmx.de>
parents: 101020
diff changeset
1311 ;; purposes. It covers also IPv4 mapped IPv6 addresses, like in
986acdda4aac * net/tramp.el (tramp-ipv6-regexp): The regexp shall cover also
Michael Albinus <michael.albinus@gmx.de>
parents: 101020
diff changeset
1312 ;; "::ffff:192.168.0.1".
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1313 (defconst tramp-ipv6-regexp
101282
986acdda4aac * net/tramp.el (tramp-ipv6-regexp): The regexp shall cover also
Michael Albinus <michael.albinus@gmx.de>
parents: 101020
diff changeset
1314 "\\(?:\\(?:[a-zA-Z0-9]+\\)?:\\)+[a-zA-Z0-9.]+"
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1315 "*Regexp matching IPv6 addresses.")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1316
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1317 (defconst tramp-postfix-ipv6-format
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1318 (cond ((equal tramp-syntax 'ftp) "]")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1319 ((equal tramp-syntax 'sep) "")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1320 ((equal tramp-syntax 'url) "]")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1321 (t (error "Wrong `tramp-syntax' defined")))
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1322 "*String matching right hand side of IPv6 addresses.
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1323 Used in `tramp-make-tramp-file-name'.")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1324
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1325 (defconst tramp-postfix-ipv6-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1326 (regexp-quote tramp-postfix-ipv6-format)
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1327 "*Regexp matching right hand side of IPv6 addresses.
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1328 Derived from `tramp-postfix-ipv6-format'.")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1329
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1330 (defconst tramp-prefix-port-format
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1331 (cond ((equal tramp-syntax 'ftp) "#")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1332 ((equal tramp-syntax 'sep) "#")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1333 ((equal tramp-syntax 'url) ":")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1334 (t (error "Wrong `tramp-syntax' defined")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1335 "*String matching delimeter between host names and port numbers.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1336
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1337 (defconst tramp-prefix-port-regexp
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1338 (regexp-quote tramp-prefix-port-format)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1339 "*Regexp matching delimeter between host names and port numbers.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1340 Derived from `tramp-prefix-port-format'.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1341
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1342 (defconst tramp-port-regexp
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1343 "[0-9]+"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1344 "*Regexp matching port numbers.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1345
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1346 (defconst tramp-host-with-port-regexp
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1347 (concat "\\(" tramp-host-regexp "\\)"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1348 tramp-prefix-port-regexp
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1349 "\\(" tramp-port-regexp "\\)")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1350 "*Regexp matching host names with port numbers.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1351
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1352 (defconst tramp-postfix-host-format
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1353 (cond ((equal tramp-syntax 'ftp) ":")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1354 ((equal tramp-syntax 'sep) "]")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1355 ((equal tramp-syntax 'url) "")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1356 (t (error "Wrong `tramp-syntax' defined")))
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1357 "*String matching delimeter between host names and localnames.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1358 Used in `tramp-make-tramp-file-name'.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1359
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1360 (defconst tramp-postfix-host-regexp
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1361 (regexp-quote tramp-postfix-host-format)
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1362 "*Regexp matching delimeter between host names and localnames.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1363 Derived from `tramp-postfix-host-format'.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1364
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1365 (defconst tramp-localname-regexp
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1366 ".*$"
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1367 "*Regexp matching localnames.")
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1368
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1369 ;; File name format.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1370
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1371 (defconst tramp-file-name-structure
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1372 (list
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1373 (concat
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1374 tramp-prefix-regexp
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1375 "\\(" "\\(" tramp-method-regexp "\\)" tramp-postfix-method-regexp "\\)?"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1376 "\\(" "\\(" tramp-user-regexp "\\)" tramp-postfix-user-regexp "\\)?"
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1377 "\\(" "\\(" tramp-host-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1378 "\\|"
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1379 tramp-prefix-ipv6-regexp tramp-ipv6-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1380 tramp-postfix-ipv6-regexp "\\)"
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1381 "\\(" tramp-prefix-port-regexp tramp-port-regexp "\\)?" "\\)?"
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1382 tramp-postfix-host-regexp
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1383 "\\(" tramp-localname-regexp "\\)")
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1384 2 4 5 8)
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1385
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1386 "*List of five elements (REGEXP METHOD USER HOST FILE), detailing \
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
1387 the Tramp file name structure.
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
1388
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
1389 The first element REGEXP is a regular expression matching a Tramp file
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1390 name. The regex should contain parentheses around the method name,
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1391 the user name, the host name, and the file name parts.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1392
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1393 The second element METHOD is a number, saying which pair of
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1394 parentheses matches the method name. The third element USER is
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1395 similar, but for the user name. The fourth element HOST is similar,
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1396 but for the host name. The fifth element FILE is for the file name.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1397 These numbers are passed directly to `match-string', which see. That
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1398 means the opening parentheses are counted to identify the pair.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1399
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1400 See also `tramp-file-name-regexp'.")
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1401
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1402 ;;;###autoload
46306
66cce4969490 (tramp-default-method): New default method "sm"
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46166
diff changeset
1403 (defconst tramp-file-name-regexp-unified
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
1404 "\\`/\\([^[/:]+\\|[^/]+]\\):"
46306
66cce4969490 (tramp-default-method): New default method "sm"
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46166
diff changeset
1405 "Value for `tramp-file-name-regexp' for unified remoting.
66cce4969490 (tramp-default-method): New default method "sm"
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46166
diff changeset
1406 Emacs (not XEmacs) uses a unified filename syntax for Ange-FTP and
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1407 Tramp. See `tramp-file-name-structure' for more explanations.")
46306
66cce4969490 (tramp-default-method): New default method "sm"
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46166
diff changeset
1408
66cce4969490 (tramp-default-method): New default method "sm"
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46166
diff changeset
1409 ;;;###autoload
66cce4969490 (tramp-default-method): New default method "sm"
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46166
diff changeset
1410 (defconst tramp-file-name-regexp-separate
66cce4969490 (tramp-default-method): New default method "sm"
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46166
diff changeset
1411 "\\`/\\[.*\\]"
66cce4969490 (tramp-default-method): New default method "sm"
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46166
diff changeset
1412 "Value for `tramp-file-name-regexp' for separate remoting.
66cce4969490 (tramp-default-method): New default method "sm"
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46166
diff changeset
1413 XEmacs uses a separate filename syntax for Tramp and EFS.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1414 See `tramp-file-name-structure' for more explanations.")
46306
66cce4969490 (tramp-default-method): New default method "sm"
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46166
diff changeset
1415
66cce4969490 (tramp-default-method): New default method "sm"
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46166
diff changeset
1416 ;;;###autoload
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1417 (defconst tramp-file-name-regexp-url
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1418 "\\`/[^/:]+://"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1419 "Value for `tramp-file-name-regexp' for URL-like remoting.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1420 See `tramp-file-name-structure' for more explanations.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1421
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1422 ;;;###autoload
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1423 (defconst tramp-file-name-regexp
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1424 (cond ((equal tramp-syntax 'ftp) tramp-file-name-regexp-unified)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1425 ((equal tramp-syntax 'sep) tramp-file-name-regexp-separate)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1426 ((equal tramp-syntax 'url) tramp-file-name-regexp-url)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1427 (t (error "Wrong `tramp-syntax' defined")))
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
1428 "*Regular expression matching file names handled by Tramp.
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
1429 This regexp should match Tramp file names but no other file names.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1430 \(When tramp.el is loaded, this regular expression is prepended to
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1431 `file-name-handler-alist', and that is searched sequentially. Thus,
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
1432 if the Tramp entry appears rather early in the `file-name-handler-alist'
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
1433 and is a bit too general, then some files might be considered Tramp
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1434 files which are not really Tramp files.
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1435
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1436 Please note that the entry in `file-name-handler-alist' is made when
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1437 this file (tramp.el) is loaded. This means that this variable must be set
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1438 before loading tramp.el. Alternatively, `file-name-handler-alist' can be
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1439 updated after changing this variable.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1440
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1441 Also see `tramp-file-name-structure'.")
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1442
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1443 ;;;###autoload
92982
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
1444 (defconst tramp-root-regexp
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1445 (if (memq system-type '(cygwin windows-nt))
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
1446 "\\`\\([a-zA-Z]:\\)?/"
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
1447 "\\`/")
92982
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
1448 "Beginning of an incomplete Tramp file name.
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
1449 Usually, it is just \"\\\\`/\". On W32 systems, there might be a
93040
ba82da0cb626 * net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents: 93036
diff changeset
1450 volume letter, which will be removed by `tramp-drop-volume-letter'.")
92982
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
1451
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
1452 ;;;###autoload
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
1453 (defconst tramp-completion-file-name-regexp-unified
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
1454 (concat tramp-root-regexp "[^/]*\\'")
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1455 "Value for `tramp-completion-file-name-regexp' for unified remoting.
92982
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
1456 GNU Emacs uses a unified filename syntax for Tramp and Ange-FTP.
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
1457 See `tramp-file-name-structure' for more explanations.")
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1458
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1459 ;;;###autoload
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1460 (defconst tramp-completion-file-name-regexp-separate
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
1461 (concat tramp-root-regexp "\\([[][^]]*\\)?\\'")
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1462 "Value for `tramp-completion-file-name-regexp' for separate remoting.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1463 XEmacs uses a separate filename syntax for Tramp and EFS.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1464 See `tramp-file-name-structure' for more explanations.")
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1465
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1466 ;;;###autoload
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1467 (defconst tramp-completion-file-name-regexp-url
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
1468 (concat tramp-root-regexp "[^/:]+\\(:\\(/\\(/[^/]*\\)?\\)?\\)?\\'")
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1469 "Value for `tramp-completion-file-name-regexp' for URL-like remoting.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1470 See `tramp-file-name-structure' for more explanations.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1471
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1472 ;;;###autoload
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1473 (defconst tramp-completion-file-name-regexp
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1474 (cond ((equal tramp-syntax 'ftp) tramp-completion-file-name-regexp-unified)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1475 ((equal tramp-syntax 'sep) tramp-completion-file-name-regexp-separate)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1476 ((equal tramp-syntax 'url) tramp-completion-file-name-regexp-url)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1477 (t (error "Wrong `tramp-syntax' defined")))
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
1478 "*Regular expression matching file names handled by Tramp completion.
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
1479 This regexp should match partial Tramp file names only.
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1480
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1481 Please note that the entry in `file-name-handler-alist' is made when
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1482 this file (tramp.el) is loaded. This means that this variable must be set
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1483 before loading tramp.el. Alternatively, `file-name-handler-alist' can be
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1484 updated after changing this variable.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1485
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1486 Also see `tramp-file-name-structure'.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1487
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1488 (defconst tramp-actions-before-shell
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1489 '((tramp-login-prompt-regexp tramp-action-login)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1490 (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
1491 (tramp-wrong-passwd-regexp tramp-action-permission-denied)
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1492 (shell-prompt-pattern tramp-action-succeed)
46998
9d6aef07c793 Version 2.0.14 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46992
diff changeset
1493 (tramp-shell-prompt-pattern tramp-action-succeed)
46992
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
1494 (tramp-yesno-prompt-regexp tramp-action-yesno)
47771
ac3dfc909b56 Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47683
diff changeset
1495 (tramp-yn-prompt-regexp tramp-action-yn)
55844
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
1496 (tramp-terminal-prompt-regexp tramp-action-terminal)
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
1497 (tramp-process-alive-regexp tramp-action-process-alive))
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1498 "List of pattern/action pairs.
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1499 Whenever a pattern matches, the corresponding action is performed.
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1500 Each item looks like (PATTERN ACTION).
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1501
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1502 The PATTERN should be a symbol, a variable. The value of this
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1503 variable gives the regular expression to search for. Note that the
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1504 regexp must match at the end of the buffer, \"\\'\" is implicitly
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1505 appended to it.
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1506
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1507 The ACTION should also be a symbol, but a function. When the
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1508 corresponding PATTERN matches, the ACTION function is called.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1509
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1510 (defconst tramp-actions-copy-out-of-band
55420
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
1511 '((tramp-password-prompt-regexp tramp-action-password)
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
1512 (tramp-wrong-passwd-regexp tramp-action-permission-denied)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1513 (tramp-copy-failed-regexp tramp-action-permission-denied)
55844
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
1514 (tramp-process-alive-regexp tramp-action-out-of-band))
55420
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
1515 "List of pattern/action pairs.
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
1516 This list is used for copying/renaming with out-of-band methods.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1517
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1518 See `tramp-actions-before-shell' for more info.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1519
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1520 ;; Chunked sending kludge. We set this to 500 for black-listed constellations
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1521 ;; known to have a bug in `process-send-string'; some ssh connections appear
62344
5a19ff64befb Sync with Tramp 2.0.49.
Michael Albinus <michael.albinus@gmx.de>
parents: 60763
diff changeset
1522 ;; to drop bytes when data is sent too quickly. There is also a connection
5a19ff64befb Sync with Tramp 2.0.49.
Michael Albinus <michael.albinus@gmx.de>
parents: 60763
diff changeset
1523 ;; buffer local variable, which is computed depending on remote host properties
5a19ff64befb Sync with Tramp 2.0.49.
Michael Albinus <michael.albinus@gmx.de>
parents: 60763
diff changeset
1524 ;; when `tramp-chunksize' is zero or nil.
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1525 (defcustom tramp-chunksize
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1526 (when (and (not (featurep 'xemacs))
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1527 (memq system-type '(hpux)))
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1528 500)
66561
742e40a6bf3c * net/tramp.el (tramp-chunksize): Escape parentheses in docstring
Michael Albinus <michael.albinus@gmx.de>
parents: 66496
diff changeset
1529 ;; Parentheses in docstring starting at beginning of line are escaped.
742e40a6bf3c * net/tramp.el (tramp-chunksize): Escape parentheses in docstring
Michael Albinus <michael.albinus@gmx.de>
parents: 66496
diff changeset
1530 ;; Fontification is messed up when
742e40a6bf3c * net/tramp.el (tramp-chunksize): Escape parentheses in docstring
Michael Albinus <michael.albinus@gmx.de>
parents: 66496
diff changeset
1531 ;; `open-paren-in-column-0-is-defun-start' set to t.
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1532 "*If non-nil, chunksize for sending input to local process.
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1533 It is necessary only on systems which have a buggy `process-send-string'
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1534 implementation. The necessity, whether this variable must be set, can be
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1535 checked via the following code:
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1536
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1537 (with-temp-buffer
65925
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1538 (let* ((user \"xxx\") (host \"yyy\")
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1539 (init 0) (step 50)
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1540 (sent init) (received init))
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1541 (while (= sent received)
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1542 (setq sent (+ sent step))
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1543 (erase-buffer)
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1544 (let ((proc (start-process (buffer-name) (current-buffer)
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1545 \"ssh\" \"-l\" user host \"wc\" \"-c\")))
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1546 (when (memq (process-status proc) '(run open))
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1547 (process-send-string proc (make-string sent ?\\ ))
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1548 (process-send-eof proc)
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1549 (process-send-eof proc))
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1550 (while (not (progn (goto-char (point-min))
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1551 (re-search-forward \"\\\\w+\" (point-max) t)))
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1552 (accept-process-output proc 1))
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1553 (when (memq (process-status proc) '(run open))
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1554 (setq received (string-to-number (match-string 0)))
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1555 (delete-process proc)
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1556 (message \"Bytes sent: %s\\tBytes received: %s\" sent received)
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1557 (sit-for 0))))
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1558 (if (> sent (+ init step))
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1559 (message \"You should set `tramp-chunksize' to a maximum of %s\"
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1560 (- sent step))
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1561 (message \"Test does not work\")
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1562 (display-buffer (current-buffer))
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1563 (sit-for 30))))
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1564
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1565 In the Emacs normally running Tramp, evaluate the above code
66561
742e40a6bf3c * net/tramp.el (tramp-chunksize): Escape parentheses in docstring
Michael Albinus <michael.albinus@gmx.de>
parents: 66496
diff changeset
1566 \(replace \"xxx\" and \"yyy\" by the remote user and host name,
65925
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1567 respectively). You can do this, for example, by pasting it into
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1568 the `*scratch*' buffer and then hitting C-j with the cursor after the
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1569 last closing parenthesis. Note that it works only if you have configured
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1570 \"ssh\" to run without password query, see ssh-agent(1).
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1571
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1572 You will see the number of bytes sent successfully to the remote host.
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1573 If that number exceeds 1000, you can stop the execution by hitting
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1574 C-g, because your Emacs is likely clean.
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1575
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1576 When it is necessary to set `tramp-chunksize', you might consider to
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1577 use an out-of-the-band method (like \"scp\") instead of an internal one
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1578 \(like \"ssh\"), because setting `tramp-chunksize' to non-nil decreases
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1579 performance.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1580
65925
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1581 If your Emacs is buggy, the code stops and gives you an indication
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1582 about the value `tramp-chunksize' should be set. Maybe you could just
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1583 experiment a bit, e.g. changing the values of `init' and `step'
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1584 in the third line of the code.
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
1585
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1586 Please raise a bug report via \"M-x tramp-bug\" if your system needs
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1587 this variable to be set as well."
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1588 :group 'tramp
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49995
diff changeset
1589 :type '(choice (const nil) integer))
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
1590
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
1591 ;; Logging in to a remote host normally requires obtaining a pty. But
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
1592 ;; Emacs on MacOS X has process-connection-type set to nil by default,
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
1593 ;; so on those systems Tramp doesn't obtain a pty. Here, we allow
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
1594 ;; for an override of the system default.
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
1595 (defcustom tramp-process-connection-type t
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
1596 "Overrides `process-connection-type' for connections from Tramp.
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
1597 Tramp binds process-connection-type to the value given here before
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
1598 opening a connection to a remote host."
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
1599 :group 'tramp
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
1600 :type '(choice (const nil) (const t) (const pty)))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
1601
86204
7d7472ea9c0a * net/tramp.el (tramp-completion-reread-directory-timeout): New
Michael Albinus <michael.albinus@gmx.de>
parents: 86048
diff changeset
1602 (defcustom tramp-completion-reread-directory-timeout 10
7d7472ea9c0a * net/tramp.el (tramp-completion-reread-directory-timeout): New
Michael Albinus <michael.albinus@gmx.de>
parents: 86048
diff changeset
1603 "Defines seconds since last remote command before rereading a directory.
7d7472ea9c0a * net/tramp.el (tramp-completion-reread-directory-timeout): New
Michael Albinus <michael.albinus@gmx.de>
parents: 86048
diff changeset
1604 A remote directory might have changed its contents. In order to
7d7472ea9c0a * net/tramp.el (tramp-completion-reread-directory-timeout): New
Michael Albinus <michael.albinus@gmx.de>
parents: 86048
diff changeset
1605 make it visible during file name completion in the minibuffer,
7d7472ea9c0a * net/tramp.el (tramp-completion-reread-directory-timeout): New
Michael Albinus <michael.albinus@gmx.de>
parents: 86048
diff changeset
1606 Tramp flushes its cache and rereads the directory contents when
7d7472ea9c0a * net/tramp.el (tramp-completion-reread-directory-timeout): New
Michael Albinus <michael.albinus@gmx.de>
parents: 86048
diff changeset
1607 more than `tramp-completion-reread-directory-timeout' seconds
7d7472ea9c0a * net/tramp.el (tramp-completion-reread-directory-timeout): New
Michael Albinus <michael.albinus@gmx.de>
parents: 86048
diff changeset
1608 have been gone since last remote command execution. A value of 0
7d7472ea9c0a * net/tramp.el (tramp-completion-reread-directory-timeout): New
Michael Albinus <michael.albinus@gmx.de>
parents: 86048
diff changeset
1609 would require an immediate reread during filename completion, nil
7d7472ea9c0a * net/tramp.el (tramp-completion-reread-directory-timeout): New
Michael Albinus <michael.albinus@gmx.de>
parents: 86048
diff changeset
1610 means to use always cached values for the directory contents."
7d7472ea9c0a * net/tramp.el (tramp-completion-reread-directory-timeout): New
Michael Albinus <michael.albinus@gmx.de>
parents: 86048
diff changeset
1611 :group 'tramp
7d7472ea9c0a * net/tramp.el (tramp-completion-reread-directory-timeout): New
Michael Albinus <michael.albinus@gmx.de>
parents: 86048
diff changeset
1612 :type '(choice (const nil) integer))
7d7472ea9c0a * net/tramp.el (tramp-completion-reread-directory-timeout): New
Michael Albinus <michael.albinus@gmx.de>
parents: 86048
diff changeset
1613
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1614 ;;; Internal Variables:
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1615
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1616 (defvar tramp-current-method nil
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1617 "Connection method for this *tramp* buffer.")
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1618
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1619 (defvar tramp-current-user nil
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1620 "Remote login name for this *tramp* buffer.")
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1621
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1622 (defvar tramp-current-host nil
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1623 "Remote host for this *tramp* buffer.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1624
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1625 (defconst tramp-uudecode
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1626 "(echo begin 600 /tmp/tramp.$$; tail +2) | uudecode
46802
10aa49b3d28a Version 2.0.10 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46801
diff changeset
1627 cat /tmp/tramp.$$
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1628 rm -f /tmp/tramp.$$"
46802
10aa49b3d28a Version 2.0.10 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46801
diff changeset
1629 "Shell function to implement `uudecode' to standard output.
59031
1fbbe0bcfaac Sync with Tramp 2.0.46.
Michael Albinus <michael.albinus@gmx.de>
parents: 58776
diff changeset
1630 Many systems support `uudecode -o /dev/stdout' or `uudecode -o -'
1fbbe0bcfaac Sync with Tramp 2.0.46.
Michael Albinus <michael.albinus@gmx.de>
parents: 58776
diff changeset
1631 for this or `uudecode -p', but some systems don't, and for them
1fbbe0bcfaac Sync with Tramp 2.0.46.
Michael Albinus <michael.albinus@gmx.de>
parents: 58776
diff changeset
1632 we have this shell function.")
46802
10aa49b3d28a Version 2.0.10 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46801
diff changeset
1633
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1634 (defconst tramp-perl-file-truename
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1635 "%s -e '
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1636 use File::Spec;
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1637 use Cwd \"realpath\";
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1638
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1639 sub recursive {
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1640 my ($volume, @dirs) = @_;
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1641 my $real = realpath(File::Spec->catpath(
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1642 $volume, File::Spec->catdir(@dirs), \"\"));
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1643 if ($real) {
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1644 my ($vol, $dir) = File::Spec->splitpath($real, 1);
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1645 return ($vol, File::Spec->splitdir($dir));
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1646 }
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1647 else {
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1648 my $last = pop(@dirs);
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1649 ($volume, @dirs) = recursive($volume, @dirs);
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1650 push(@dirs, $last);
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1651 return ($volume, @dirs);
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1652 }
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1653 }
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1654
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1655 $result = realpath($ARGV[0]);
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1656 if (!$result) {
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1657 my ($vol, $dir) = File::Spec->splitpath($ARGV[0], 1);
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1658 ($vol, @dirs) = recursive($vol, File::Spec->splitdir($dir));
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1659
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1660 $result = File::Spec->catpath($vol, File::Spec->catdir(@dirs), \"\");
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1661 }
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1662
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1663 if ($ARGV[0] =~ /\\/$/) {
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1664 $result = $result . \"/\";
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1665 }
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1666
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1667 print \"\\\"$result\\\"\\n\";
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1668 ' \"$1\" 2>/dev/null"
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1669 "Perl script to produce output suitable for use with `file-truename'
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1670 on the remote file system.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1671 Escape sequence %s is replaced with name of Perl binary.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1672 This string is passed to `format', so percent characters need to be doubled.")
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1673
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1674 (defconst tramp-perl-file-name-all-completions
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1675 "%s -e 'sub case {
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1676 my $str = shift;
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1677 if ($ARGV[2]) {
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1678 return lc($str);
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1679 }
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1680 else {
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1681 return $str;
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1682 }
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1683 }
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1684 opendir(d, $ARGV[0]) || die(\"$ARGV[0]: $!\\nfail\\n\");
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1685 @files = readdir(d); closedir(d);
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1686 foreach $f (@files) {
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1687 if (case(substr($f, 0, length($ARGV[1]))) eq case($ARGV[1])) {
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1688 if (-d \"$ARGV[0]/$f\") {
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1689 print \"$f/\\n\";
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1690 }
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1691 else {
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1692 print \"$f\\n\";
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1693 }
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1694 }
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1695 }
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1696 print \"ok\\n\"
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1697 ' \"$1\" \"$2\" \"$3\" 2>/dev/null"
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1698 "Perl script to produce output suitable for use with
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1699 `file-name-all-completions' on the remote file system. Escape
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1700 sequence %s is replaced with name of Perl binary. This string is
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1701 passed to `format', so percent characters need to be doubled.")
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
1702
46802
10aa49b3d28a Version 2.0.10 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46801
diff changeset
1703 ;; Perl script to implement `file-attributes' in a Lisp `read'able
10aa49b3d28a Version 2.0.10 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46801
diff changeset
1704 ;; output. If you are hacking on this, note that you get *no* output
10aa49b3d28a Version 2.0.10 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46801
diff changeset
1705 ;; unless this spits out a complete line, including the '\n' at the
10aa49b3d28a Version 2.0.10 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46801
diff changeset
1706 ;; end.
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
1707 ;; The device number is returned as "-1", because there will be a virtual
97052
bed318e44ebd * net/tramp.el (tramp-perl-directory-files-and-attributes)
Michael Albinus <michael.albinus@gmx.de>
parents: 97035
diff changeset
1708 ;; device number set in `tramp-handle-file-attributes'.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1709 (defconst tramp-perl-file-attributes
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1710 "%s -e '
58540
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1711 @stat = lstat($ARGV[0]);
104866
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
1712 if (!@stat) {
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
1713 print \"nil\\n\";
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
1714 exit 0;
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
1715 }
58540
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1716 if (($stat[2] & 0170000) == 0120000)
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1717 {
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1718 $type = readlink($ARGV[0]);
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1719 $type = \"\\\"$type\\\"\";
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1720 }
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1721 elsif (($stat[2] & 0170000) == 040000)
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1722 {
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1723 $type = \"t\";
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1724 }
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1725 else
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1726 {
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1727 $type = \"nil\"
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1728 };
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1729 $uid = ($ARGV[1] eq \"integer\") ? $stat[4] : \"\\\"\" . getpwuid($stat[4]) . \"\\\"\";
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1730 $gid = ($ARGV[1] eq \"integer\") ? $stat[5] : \"\\\"\" . getgrgid($stat[5]) . \"\\\"\";
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1731 printf(
82064
07bb0658401d * net/tramp.el (tramp-perl-file-attributes)
Michael Albinus <michael.albinus@gmx.de>
parents: 82025
diff changeset
1732 \"(%%s %%u %%s %%s (%%u %%u) (%%u %%u) (%%u %%u) %%u.0 %%u t (%%u . %%u) -1)\\n\",
58540
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1733 $type,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1734 $stat[3],
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1735 $uid,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1736 $gid,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1737 $stat[8] >> 16 & 0xffff,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1738 $stat[8] & 0xffff,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1739 $stat[9] >> 16 & 0xffff,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1740 $stat[9] & 0xffff,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1741 $stat[10] >> 16 & 0xffff,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1742 $stat[10] & 0xffff,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1743 $stat[7],
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1744 $stat[2],
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1745 $stat[1] >> 16 & 0xffff,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1746 $stat[1] & 0xffff
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1747 );' \"$1\" \"$2\" \"$3\" 2>/dev/null"
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1748 "Perl script to produce output suitable for use with `file-attributes'
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1749 on the remote file system.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1750 Escape sequence %s is replaced with name of Perl binary.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1751 This string is passed to `format', so percent characters need to be doubled.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1752
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1753 (defconst tramp-perl-directory-files-and-attributes
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1754 "%s -e '
65926
e465f3508fd5 (tramp-perl-directory-files-and-attributes): Add error handling.
Lars Hansen <larsh@soem.dk>
parents: 65925
diff changeset
1755 chdir($ARGV[0]) or printf(\"\\\"Cannot change to $ARGV[0]: $''!''\\\"\\n\"), exit();
e465f3508fd5 (tramp-perl-directory-files-and-attributes): Add error handling.
Lars Hansen <larsh@soem.dk>
parents: 65925
diff changeset
1756 opendir(DIR,\".\") or printf(\"\\\"Cannot open directory $ARGV[0]: $''!''\\\"\\n\"), exit();
58540
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1757 @list = readdir(DIR);
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1758 closedir(DIR);
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1759 $n = scalar(@list);
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1760 printf(\"(\\n\");
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1761 for($i = 0; $i < $n; $i++)
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1762 {
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1763 $filename = $list[$i];
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1764 @stat = lstat($filename);
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1765 if (($stat[2] & 0170000) == 0120000)
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1766 {
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1767 $type = readlink($filename);
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1768 $type = \"\\\"$type\\\"\";
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1769 }
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1770 elsif (($stat[2] & 0170000) == 040000)
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1771 {
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1772 $type = \"t\";
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1773 }
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1774 else
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1775 {
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1776 $type = \"nil\"
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1777 };
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1778 $uid = ($ARGV[1] eq \"integer\") ? $stat[4] : \"\\\"\" . getpwuid($stat[4]) . \"\\\"\";
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1779 $gid = ($ARGV[1] eq \"integer\") ? $stat[5] : \"\\\"\" . getgrgid($stat[5]) . \"\\\"\";
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1780 printf(
97052
bed318e44ebd * net/tramp.el (tramp-perl-directory-files-and-attributes)
Michael Albinus <michael.albinus@gmx.de>
parents: 97035
diff changeset
1781 \"(\\\"%%s\\\" %%s %%u %%s %%s (%%u %%u) (%%u %%u) (%%u %%u) %%u.0 %%u t (%%u . %%u) (%%u . %%u))\\n\",
58540
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1782 $filename,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1783 $type,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1784 $stat[3],
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1785 $uid,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1786 $gid,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1787 $stat[8] >> 16 & 0xffff,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1788 $stat[8] & 0xffff,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1789 $stat[9] >> 16 & 0xffff,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1790 $stat[9] & 0xffff,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1791 $stat[10] >> 16 & 0xffff,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1792 $stat[10] & 0xffff,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1793 $stat[7],
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1794 $stat[2],
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1795 $stat[1] >> 16 & 0xffff,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1796 $stat[1] & 0xffff,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1797 $stat[0] >> 16 & 0xffff,
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1798 $stat[0] & 0xffff);
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1799 }
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1800 printf(\")\\n\");' \"$1\" \"$2\" \"$3\" 2>/dev/null"
58540
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1801 "Perl script implementing `directory-files-attributes' as Lisp `read'able
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1802 output.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1803 Escape sequence %s is replaced with name of Perl binary.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1804 This string is passed to `format', so percent characters need to be doubled.")
58540
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1805
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1806 ;; ;; These two use uu encoding.
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1807 ;; (defvar tramp-perl-encode "%s -e'\
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1808 ;; print qq(begin 644 xxx\n);
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1809 ;; my $s = q();
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1810 ;; my $res = q();
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1811 ;; while (read(STDIN, $s, 45)) {
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1812 ;; print pack(q(u), $s);
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1813 ;; }
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1814 ;; print qq(`\n);
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1815 ;; print qq(end\n);
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1816 ;; '"
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1817 ;; "Perl program to use for encoding a file.
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1818 ;; Escape sequence %s is replaced with name of Perl binary.")
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1819
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1820 ;; (defvar tramp-perl-decode "%s -ne '
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1821 ;; print unpack q(u), $_;
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1822 ;; '"
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1823 ;; "Perl program to use for decoding a file.
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1824 ;; Escape sequence %s is replaced with name of Perl binary.")
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1825
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1826 ;; These two use base64 encoding.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1827 (defconst tramp-perl-encode-with-module
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1828 "%s -MMIME::Base64 -0777 -ne 'print encode_base64($_)' 2>/dev/null"
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1829 "Perl program to use for encoding a file.
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1830 Escape sequence %s is replaced with name of Perl binary.
46801
3fafc6fca8a8 Version 2.0.9 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46799
diff changeset
1831 This string is passed to `format', so percent characters need to be doubled.
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1832 This implementation requires the MIME::Base64 Perl module to be installed
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1833 on the remote host.")
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1834
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1835 (defconst tramp-perl-decode-with-module
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1836 "%s -MMIME::Base64 -0777 -ne 'print decode_base64($_)' 2>/dev/null"
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1837 "Perl program to use for decoding a file.
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1838 Escape sequence %s is replaced with name of Perl binary.
46801
3fafc6fca8a8 Version 2.0.9 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46799
diff changeset
1839 This string is passed to `format', so percent characters need to be doubled.
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1840 This implementation requires the MIME::Base64 Perl module to be installed
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1841 on the remote host.")
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1842
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1843 (defconst tramp-perl-encode
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1844 "%s -e '
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1845 # This script contributed by Juanma Barranquero <lektu@terra.es>.
100903
793052a5fdaf (tramp-perl-encode, tramp-perl-decode): Update copyrights for 2009.
Glenn Morris <rgm@gnu.org>
parents: 100856
diff changeset
1846 # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
75361
9cc44485654f (tramp-perl-encode, tramp-perl-decode): Update copyrights.
Glenn Morris <rgm@gnu.org>
parents: 75194
diff changeset
1847 # Free Software Foundation, Inc.
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1848 use strict;
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1849
46795
305403dc91a3 Version 2.0.7.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46790
diff changeset
1850 my %%trans = do {
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1851 my $i = 0;
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1852 map {(substr(unpack(q(B8), chr $i++), 2, 6), $_)}
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1853 split //, q(ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/);
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1854 };
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1855
46797
1c4af44cad8c Version 2.0.8.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46795
diff changeset
1856 binmode(\\*STDIN);
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1857
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1858 # We read in chunks of 54 bytes, to generate output lines
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1859 # of 72 chars (plus end of line)
46797
1c4af44cad8c Version 2.0.8.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46795
diff changeset
1860 $/ = \\54;
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1861
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1862 while (my $data = <STDIN>) {
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1863 my $pad = q();
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1864
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1865 # Only for the last chunk, and only if did not fill the last three-byte packet
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1866 if (eof) {
46795
305403dc91a3 Version 2.0.7.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46790
diff changeset
1867 my $mod = length($data) %% 3;
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1868 $pad = q(=) x (3 - $mod) if $mod;
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1869 }
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1870
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1871 # Not the fastest method, but it is simple: unpack to binary string, split
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1872 # by groups of 6 bits and convert back from binary to byte; then map into
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1873 # the translation table
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1874 print
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1875 join q(),
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1876 map($trans{$_},
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1877 (substr(unpack(q(B*), $data) . q(00000), 0, 432) =~ /....../g)),
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1878 $pad,
46797
1c4af44cad8c Version 2.0.8.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46795
diff changeset
1879 qq(\\n);
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1880 }' 2>/dev/null"
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1881 "Perl program to use for encoding a file.
46795
305403dc91a3 Version 2.0.7.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46790
diff changeset
1882 Escape sequence %s is replaced with name of Perl binary.
46799
c9fab7d532d1 (tramp-perl-encode, tramp-perl-decode): Doc fix.
Andreas Schwab <schwab@suse.de>
parents: 46797
diff changeset
1883 This string is passed to `format', so percent characters need to be doubled.")
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1884
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1885 (defconst tramp-perl-decode
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1886 "%s -e '
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1887 # This script contributed by Juanma Barranquero <lektu@terra.es>.
100903
793052a5fdaf (tramp-perl-encode, tramp-perl-decode): Update copyrights for 2009.
Glenn Morris <rgm@gnu.org>
parents: 100856
diff changeset
1888 # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
75361
9cc44485654f (tramp-perl-encode, tramp-perl-decode): Update copyrights.
Glenn Morris <rgm@gnu.org>
parents: 75194
diff changeset
1889 # Free Software Foundation, Inc.
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1890 use strict;
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1891
46795
305403dc91a3 Version 2.0.7.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46790
diff changeset
1892 my %%trans = do {
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1893 my $i = 0;
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1894 map {($_, substr(unpack(q(B8), chr $i++), 2, 6))}
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1895 split //, q(ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/)
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1896 };
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1897
46795
305403dc91a3 Version 2.0.7.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46790
diff changeset
1898 my %%bytes = map {(unpack(q(B8), chr $_), chr $_)} 0 .. 255;
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1899
46797
1c4af44cad8c Version 2.0.8.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46795
diff changeset
1900 binmode(\\*STDOUT);
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1901
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1902 # We are going to accumulate into $pending to accept any line length
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1903 # (we do not check they are <= 76 chars as the RFC says)
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1904 my $pending = q();
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1905
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1906 while (my $data = <STDIN>) {
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1907 chomp $data;
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1908
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1909 # If we find one or two =, we have reached the end and
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1910 # any following data is to be discarded
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1911 my $finished = $data =~ s/(==?).*/$1/;
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1912 $pending .= $data;
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1913
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1914 my $len = length($pending);
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
1915 my $chunk = substr($pending, 0, $len & ~3);
57463
40298ea4d83f Sync with Tramp 2.0.45.
Michael Albinus <michael.albinus@gmx.de>
parents: 56644
diff changeset
1916 $pending = substr($pending, $len & ~3 + 1);
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1917
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1918 # Easy method: translate from chars to (pregenerated) six-bit packets, join,
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1919 # split in 8-bit chunks and convert back to char.
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1920 print join q(),
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1921 map $bytes{$_},
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1922 ((join q(), map {$trans{$_} || q()} split //, $chunk) =~ /......../g);
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1923
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
1924 last if $finished;
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1925 }' 2>/dev/null"
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
1926 "Perl program to use for decoding a file.
46795
305403dc91a3 Version 2.0.7.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46790
diff changeset
1927 Escape sequence %s is replaced with name of Perl binary.
46799
c9fab7d532d1 (tramp-perl-encode, tramp-perl-decode): Doc fix.
Andreas Schwab <schwab@suse.de>
parents: 46797
diff changeset
1928 This string is passed to `format', so percent characters need to be doubled.")
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1929
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
1930 (defconst tramp-vc-registered-read-file-names
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
1931 "echo \"(\"
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
1932 for file in \"$@\"; do
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
1933 if %s $file; then
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
1934 echo \"(\\\"$file\\\" \\\"file-exists-p\\\" t)\"
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
1935 else
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
1936 echo \"(\\\"$file\\\" \\\"file-exists-p\\\" nil)\"
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
1937 fi
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
1938 if %s $file; then
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
1939 echo \"(\\\"$file\\\" \\\"file-readable-p\\\" t)\"
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
1940 else
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
1941 echo \"(\\\"$file\\\" \\\"file-readable-p\\\" nil)\"
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
1942 fi
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
1943 done
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
1944 echo \")\""
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
1945 "Script to check existence of VC related files.
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
1946 It must be send formatted with two strings; the tests for file
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
1947 existence, and file readability.")
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
1948
84966
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
1949 (defconst tramp-file-mode-type-map
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
1950 '((0 . "-") ; Normal file (SVID-v2 and XPG2)
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
1951 (1 . "p") ; fifo
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
1952 (2 . "c") ; character device
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
1953 (3 . "m") ; multiplexed character device (v7)
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
1954 (4 . "d") ; directory
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
1955 (5 . "?") ; Named special file (XENIX)
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
1956 (6 . "b") ; block device
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
1957 (7 . "?") ; multiplexed block device (v7)
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
1958 (8 . "-") ; regular file
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
1959 (9 . "n") ; network special file (HP-UX)
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
1960 (10 . "l") ; symlink
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
1961 (11 . "?") ; ACL shadow inode (Solaris, not userspace)
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
1962 (12 . "s") ; socket
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
1963 (13 . "D") ; door special (Solaris)
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
1964 (14 . "w")) ; whiteout (BSD)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1965 "A list of file types returned from the `stat' system call.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1966 This is used to map a mode number to a permission string.")
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1967
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1968 ;; New handlers should be added here. The following operations can be
99615
6808df5428f7 * net/tramp.el (tramp-handle-file-name-as-directory): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 99540
diff changeset
1969 ;; handled using the normal primitives: file-name-sans-versions,
6808df5428f7 * net/tramp.el (tramp-handle-file-name-as-directory): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 99540
diff changeset
1970 ;; get-file-buffer.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1971 (defconst tramp-file-name-handler-alist
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
1972 '((load . tramp-handle-load)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1973 (make-symbolic-link . tramp-handle-make-symbolic-link)
99615
6808df5428f7 * net/tramp.el (tramp-handle-file-name-as-directory): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 99540
diff changeset
1974 (file-name-as-directory . tramp-handle-file-name-as-directory)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1975 (file-name-directory . tramp-handle-file-name-directory)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1976 (file-name-nondirectory . tramp-handle-file-name-nondirectory)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1977 (file-truename . tramp-handle-file-truename)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1978 (file-exists-p . tramp-handle-file-exists-p)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1979 (file-directory-p . tramp-handle-file-directory-p)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1980 (file-executable-p . tramp-handle-file-executable-p)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1981 (file-readable-p . tramp-handle-file-readable-p)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1982 (file-regular-p . tramp-handle-file-regular-p)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1983 (file-symlink-p . tramp-handle-file-symlink-p)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1984 (file-writable-p . tramp-handle-file-writable-p)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1985 (file-ownership-preserved-p . tramp-handle-file-ownership-preserved-p)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1986 (file-newer-than-file-p . tramp-handle-file-newer-than-file-p)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1987 (file-attributes . tramp-handle-file-attributes)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1988 (file-modes . tramp-handle-file-modes)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1989 (directory-files . tramp-handle-directory-files)
58540
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
1990 (directory-files-and-attributes . tramp-handle-directory-files-and-attributes)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1991 (file-name-all-completions . tramp-handle-file-name-all-completions)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1992 (file-name-completion . tramp-handle-file-name-completion)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1993 (add-name-to-file . tramp-handle-add-name-to-file)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1994 (copy-file . tramp-handle-copy-file)
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
1995 (copy-directory . tramp-handle-copy-directory)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1996 (rename-file . tramp-handle-rename-file)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1997 (set-file-modes . tramp-handle-set-file-modes)
81938
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
1998 (set-file-times . tramp-handle-set-file-times)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1999 (make-directory . tramp-handle-make-directory)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2000 (delete-directory . tramp-handle-delete-directory)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2001 (delete-file . tramp-handle-delete-file)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2002 (directory-file-name . tramp-handle-directory-file-name)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2003 ;; `executable-find' is not official yet.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2004 (executable-find . tramp-handle-executable-find)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2005 (start-file-process . tramp-handle-start-file-process)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2006 (process-file . tramp-handle-process-file)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2007 (shell-command . tramp-handle-shell-command)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2008 (insert-directory . tramp-handle-insert-directory)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2009 (expand-file-name . tramp-handle-expand-file-name)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2010 (substitute-in-file-name . tramp-handle-substitute-in-file-name)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2011 (file-local-copy . tramp-handle-file-local-copy)
55844
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
2012 (file-remote-p . tramp-handle-file-remote-p)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2013 (insert-file-contents . tramp-handle-insert-file-contents)
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
2014 (insert-file-contents-literally
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
2015 . tramp-handle-insert-file-contents-literally)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2016 (write-region . tramp-handle-write-region)
55420
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
2017 (find-backup-file-name . tramp-handle-find-backup-file-name)
65248
0f994edbec5e Make `make-auto-save-file-name' a magic operation.
Michael Albinus <michael.albinus@gmx.de>
parents: 64772
diff changeset
2018 (make-auto-save-file-name . tramp-handle-make-auto-save-file-name)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2019 (unhandled-file-name-directory . tramp-handle-unhandled-file-name-directory)
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
2020 (dired-compress-file . tramp-handle-dired-compress-file)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2021 (dired-recursive-delete-directory
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2022 . tramp-handle-dired-recursive-delete-directory)
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2023 (dired-uncache . tramp-handle-dired-uncache)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2024 (set-visited-file-modtime . tramp-handle-set-visited-file-modtime)
102907
5055f4ba592b * net/tramp.el (tramp-file-name-handler-alist): Add
Michael Albinus <michael.albinus@gmx.de>
parents: 102851
diff changeset
2025 (verify-visited-file-modtime . tramp-handle-verify-visited-file-modtime)
5055f4ba592b * net/tramp.el (tramp-file-name-handler-alist): Add
Michael Albinus <michael.albinus@gmx.de>
parents: 102851
diff changeset
2026 (vc-registered . tramp-handle-vc-registered))
65248
0f994edbec5e Make `make-auto-save-file-name' a magic operation.
Michael Albinus <michael.albinus@gmx.de>
parents: 64772
diff changeset
2027 "Alist of handler functions.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2028 Operations not mentioned here will be handled by the normal Emacs functions.")
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2029
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
2030 ;; Handlers for partial Tramp file names. For Emacs just
70276
32b384911b4f tramp-file-name-handler-alist): Delete expand-file-name and other
Richard M. Stallman <rms@gnu.org>
parents: 70255
diff changeset
2031 ;; `file-name-all-completions' is needed.
70318
77201b466c80 * net/tramp.el (tramp-completion-file-name-handler-alist)
Michael Albinus <michael.albinus@gmx.de>
parents: 70276
diff changeset
2032 ;;;###autoload
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2033 (defconst tramp-completion-file-name-handler-alist
70318
77201b466c80 * net/tramp.el (tramp-completion-file-name-handler-alist)
Michael Albinus <michael.albinus@gmx.de>
parents: 70276
diff changeset
2034 '((file-name-all-completions . tramp-completion-handle-file-name-all-completions)
70276
32b384911b4f tramp-file-name-handler-alist): Delete expand-file-name and other
Richard M. Stallman <rms@gnu.org>
parents: 70255
diff changeset
2035 (file-name-completion . tramp-completion-handle-file-name-completion))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2036 "Alist of completion handler functions.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2037 Used for file names matching `tramp-file-name-regexp'. Operations not
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2038 mentioned here will be handled by `tramp-file-name-handler-alist' or the
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2039 normal Emacs functions.")
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2040
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
2041 ;; Handlers for foreign methods, like FTP or SMB, shall be plugged here.
51603
978e262c8f3a Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51177
diff changeset
2042 (defvar tramp-foreign-file-name-handler-alist
978e262c8f3a Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51177
diff changeset
2043 ;; (identity . tramp-sh-file-name-handler) should always be the last
105718
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
2044 ;; entry, because `identity' always matches.
51603
978e262c8f3a Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51177
diff changeset
2045 '((identity . tramp-sh-file-name-handler))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
2046 "Alist of elements (FUNCTION . HANDLER) for foreign methods handled specially.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
2047 If (FUNCTION FILENAME) returns non-nil, then all I/O on that file is done by
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
2048 calling HANDLER.")
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
2049
87648
7ae99e295dfd * vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents: 87368
diff changeset
2050 ;;; Internal functions which must come first:
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2051
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2052 (defsubst tramp-debug-message (vec fmt-string &rest args)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2053 "Append message to debug buffer.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2054 Message is formatted with FMT-STRING as control string and the remaining
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2055 ARGS to actually emit the message (if applicable)."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2056 (when (get-buffer (tramp-buffer-name vec))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2057 (with-current-buffer (tramp-get-debug-buffer vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2058 (goto-char (point-max))
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2059 ;; Headline.
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2060 (when (bobp)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2061 (insert
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2062 (format
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2063 ";; %sEmacs: %s Tramp: %s -*- mode: outline; -*-"
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2064 (if (featurep 'sxemacs) "SX" (if (featurep 'xemacs) "X" "GNU "))
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2065 emacs-version tramp-version)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2066 (unless (bolp)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2067 (insert "\n"))
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2068 ;; Timestamp.
104125
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
2069 (let ((now (current-time)))
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
2070 (insert (format-time-string "%T." now))
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
2071 (insert (format "%06d " (nth 2 now))))
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2072 ;; Calling function.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2073 (let ((btn 1) btf fn)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2074 (while (not fn)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2075 (setq btf (nth 1 (backtrace-frame btn)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2076 (if (not btf)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2077 (setq fn "")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2078 (when (symbolp btf)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2079 (setq fn (symbol-name btf))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2080 (unless (and (string-match "^tramp" fn)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2081 (not (string-match
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2082 "^tramp\\(-debug\\)?\\(-message\\|-error\\)$"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2083 fn)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2084 (setq fn nil)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2085 (setq btn (1+ btn))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2086 ;; The following code inserts filename and line number.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2087 ;; Should be deactivated by default, because it is time
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2088 ;; consuming.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2089 ; (let ((ffn (find-function-noselect (intern fn))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2090 ; (insert
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2091 ; (format
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2092 ; "%s:%d: "
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2093 ; (file-name-nondirectory (buffer-file-name (car ffn)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2094 ; (with-current-buffer (car ffn)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2095 ; (1+ (count-lines (point-min) (cdr ffn)))))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2096 (insert (format "%s " fn)))
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2097 ;; The message.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2098 (insert (apply 'format fmt-string args)))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2099
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
2100 (defvar tramp-message-show-message t
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
2101 "Show Tramp message in the minibuffer.
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
2102 This variable is used to disable messages from `tramp-error'.
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
2103 The messages are visible anyway, because an error is raised.")
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
2104
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2105 (defsubst tramp-message (vec-or-proc level fmt-string &rest args)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2106 "Emit a message depending on verbosity level.
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
2107 VEC-OR-PROC identifies the Tramp buffer to use. It can be either a
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2108 vector or a process. LEVEL says to be quiet if `tramp-verbose' is
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2109 less than LEVEL. The message is emitted only if `tramp-verbose' is
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2110 greater than or equal to LEVEL.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2111
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2112 The message is also logged into the debug buffer when `tramp-verbose'
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2113 is greater than or equal 4.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2114
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2115 Calls functions `message' and `tramp-debug-message' with FMT-STRING as
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2116 control string and the remaining ARGS to actually emit the message (if
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2117 applicable)."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2118 (condition-case nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2119 (when (<= level tramp-verbose)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2120 ;; Match data must be preserved!
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2121 (save-match-data
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2122 ;; Display only when there is a minimum level.
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
2123 (when (and tramp-message-show-message (<= level 3))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2124 (apply 'message
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2125 (concat
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2126 (cond
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2127 ((= level 0) "")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2128 ((= level 1) "")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2129 ((= level 2) "Warning: ")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2130 (t "Tramp: "))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2131 fmt-string)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2132 args))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2133 ;; Log only when there is a minimum level.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2134 (when (>= tramp-verbose 4)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2135 (when (and vec-or-proc
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2136 (processp vec-or-proc)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2137 (buffer-name (process-buffer vec-or-proc)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2138 (with-current-buffer (process-buffer vec-or-proc)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2139 ;; Translate proc to vec.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2140 (setq vec-or-proc (tramp-dissect-file-name default-directory))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2141 (when (and vec-or-proc (vectorp vec-or-proc))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2142 (apply 'tramp-debug-message
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2143 vec-or-proc
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2144 (concat (format "(%d) # " level) fmt-string)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2145 args)))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2146 ;; Suppress all errors.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2147 (error nil)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2148
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2149 (defsubst tramp-error (vec-or-proc signal fmt-string &rest args)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2150 "Emit an error.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2151 VEC-OR-PROC identifies the connection to use, SIGNAL is the
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2152 signal identifier to be raised, remaining args passed to
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2153 `tramp-message'. Finally, signal SIGNAL is raised."
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
2154 (let (tramp-message-show-message)
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
2155 (tramp-message
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
2156 vec-or-proc 1 "%s"
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
2157 (error-message-string
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
2158 (list signal
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
2159 (get signal 'error-message)
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
2160 (apply 'format fmt-string args))))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
2161 (signal signal (list (apply 'format fmt-string args)))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2162
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2163 (defsubst tramp-error-with-buffer
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2164 (buffer vec-or-proc signal fmt-string &rest args)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2165 "Emit an error, and show BUFFER.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2166 If BUFFER is nil, show the connection buffer. Wait for 30\", or until
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2167 an input event arrives. The other arguments are passed to `tramp-error'."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2168 (save-window-excursion
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2169 (unwind-protect
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2170 (apply 'tramp-error vec-or-proc signal fmt-string args)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2171 (when (and vec-or-proc (not (zerop tramp-verbose)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2172 (let ((enable-recursive-minibuffers t))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2173 (pop-to-buffer
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2174 (or (and (bufferp buffer) buffer)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2175 (and (processp vec-or-proc) (process-buffer vec-or-proc))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2176 (tramp-get-buffer vec-or-proc)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2177 (sit-for 30))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2178
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2179 (defmacro with-parsed-tramp-file-name (filename var &rest body)
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2180 "Parse a Tramp filename and make components available in the body.
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2181
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2182 First arg FILENAME is evaluated and dissected into its components.
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2183 Second arg VAR is a symbol. It is used as a variable name to hold
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2184 the filename structure. It is also used as a prefix for the variables
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2185 holding the components. For example, if VAR is the symbol `foo', then
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2186 `foo' will be bound to the whole structure, `foo-method' will be bound to
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2187 the method component, and so on for `foo-user', `foo-host', `foo-localname'.
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2188
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2189 Remaining args are Lisp expressions to be evaluated (inside an implicit
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2190 `progn').
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2191
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2192 If VAR is nil, then we bind `v' to the structure and `method', `user',
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2193 `host', `localname' to the components."
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2194 `(let* ((,(or var 'v) (tramp-dissect-file-name ,filename))
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2195 (,(if var (intern (concat (symbol-name var) "-method")) 'method)
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2196 (tramp-file-name-method ,(or var 'v)))
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2197 (,(if var (intern (concat (symbol-name var) "-user")) 'user)
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2198 (tramp-file-name-user ,(or var 'v)))
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2199 (,(if var (intern (concat (symbol-name var) "-host")) 'host)
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2200 (tramp-file-name-host ,(or var 'v)))
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
2201 (,(if var (intern (concat (symbol-name var) "-localname")) 'localname)
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
2202 (tramp-file-name-localname ,(or var 'v))))
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2203 ,@body))
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2204
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2205 (put 'with-parsed-tramp-file-name 'lisp-indent-function 2)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2206 (put 'with-parsed-tramp-file-name 'edebug-form-spec '(form symbolp body))
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
2207 (font-lock-add-keywords 'emacs-lisp-mode '("\\<with-parsed-tramp-file-name\\>"))
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2208
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2209 (defmacro with-file-property (vec file property &rest body)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2210 "Check in Tramp cache for PROPERTY, otherwise execute BODY and set cache.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2211 FILE must be a local file name on a connection identified via VEC."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2212 `(if (file-name-absolute-p ,file)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2213 (let ((value (tramp-get-file-property ,vec ,file ,property 'undef)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2214 (when (eq value 'undef)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2215 ;; We cannot pass @body as parameter to
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2216 ;; `tramp-set-file-property' because it mangles our
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2217 ;; debug messages.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2218 (setq value (progn ,@body))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2219 (tramp-set-file-property ,vec ,file ,property value))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2220 value)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2221 ,@body))
84966
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
2222
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2223 (put 'with-file-property 'lisp-indent-function 3)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2224 (put 'with-file-property 'edebug-form-spec t)
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
2225 (font-lock-add-keywords 'emacs-lisp-mode '("\\<with-file-property\\>"))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2226
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2227 (defmacro with-connection-property (key property &rest body)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2228 "Checks in Tramp for property PROPERTY, otherwise executes BODY and set."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2229 `(let ((value (tramp-get-connection-property ,key ,property 'undef)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2230 (when (eq value 'undef)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2231 ;; We cannot pass ,@body as parameter to
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2232 ;; `tramp-set-connection-property' because it mangles our debug
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2233 ;; messages.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2234 (setq value (progn ,@body))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2235 (tramp-set-connection-property ,key ,property value))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2236 value))
84966
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
2237
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2238 (put 'with-connection-property 'lisp-indent-function 2)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2239 (put 'with-connection-property 'edebug-form-spec t)
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
2240 (font-lock-add-keywords 'emacs-lisp-mode '("\\<with-connection-property\\>"))
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2241
93566
61bf6b37b78d (tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents: 93539
diff changeset
2242 (eval-and-compile ; silence compiler
61bf6b37b78d (tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents: 93539
diff changeset
2243 (if (memq system-type '(cygwin windows-nt))
61bf6b37b78d (tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents: 93539
diff changeset
2244 (defun tramp-drop-volume-letter (name)
61bf6b37b78d (tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents: 93539
diff changeset
2245 "Cut off unnecessary drive letter from file NAME.
61bf6b37b78d (tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents: 93539
diff changeset
2246 The function `tramp-handle-expand-file-name' calls `expand-file-name'
61bf6b37b78d (tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents: 93539
diff changeset
2247 locally on a remote file name. When the local system is a W32 system
61bf6b37b78d (tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents: 93539
diff changeset
2248 but the remote system is Unix, this introduces a superfluous drive
61bf6b37b78d (tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents: 93539
diff changeset
2249 letter into the file name. This function removes it."
61bf6b37b78d (tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents: 93539
diff changeset
2250 (save-match-data
61bf6b37b78d (tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents: 93539
diff changeset
2251 (if (string-match tramp-root-regexp name)
61bf6b37b78d (tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents: 93539
diff changeset
2252 (replace-match "/" nil t name)
61bf6b37b78d (tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents: 93539
diff changeset
2253 name)))
61bf6b37b78d (tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents: 93539
diff changeset
2254
61bf6b37b78d (tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents: 93539
diff changeset
2255 (defalias 'tramp-drop-volume-letter 'identity)))
61bf6b37b78d (tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents: 93539
diff changeset
2256
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2257 (defsubst tramp-make-tramp-temp-file (vec)
85067
4636000015c5 * net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
2258 "Create a temporary file on the remote host identified by VEC.
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2259 Return the local name of the temporary file."
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2260 (let ((prefix
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2261 (tramp-make-tramp-file-name
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2262 (tramp-file-name-method vec)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2263 (tramp-file-name-user vec)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2264 (tramp-file-name-host vec)
93539
7fd0d929f732 * net/tramp.el (tramp-make-tramp-temp-file): Use
Michael Albinus <michael.albinus@gmx.de>
parents: 93430
diff changeset
2265 (tramp-drop-volume-letter
7fd0d929f732 * net/tramp.el (tramp-make-tramp-temp-file): Use
Michael Albinus <michael.albinus@gmx.de>
parents: 93430
diff changeset
2266 (expand-file-name
7fd0d929f732 * net/tramp.el (tramp-make-tramp-temp-file): Use
Michael Albinus <michael.albinus@gmx.de>
parents: 93430
diff changeset
2267 tramp-temp-name-prefix (tramp-get-remote-tmpdir vec)))))
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2268 result)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2269 (while (not result)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2270 ;; `make-temp-file' would be the natural choice for
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2271 ;; implementation. But it calls `write-region' internally,
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2272 ;; which also needs a temporary file - we would end in an
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2273 ;; infinite loop.
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2274 (setq result (make-temp-name prefix))
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2275 (if (file-exists-p result)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2276 (setq result nil)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2277 ;; This creates the file by side effect.
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2278 (set-file-times result)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2279 (set-file-modes result (tramp-octal-to-decimal "0700"))))
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2280
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2281 ;; Return the local part.
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
2282 (with-parsed-tramp-file-name result nil localname)))
84406
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
2283
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
2284
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2285 ;;; Config Manipulation Functions:
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2286
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2287 (defun tramp-set-completion-function (method function-list)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2288 "Sets the list of completion functions for METHOD.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2289 FUNCTION-LIST is a list of entries of the form (FUNCTION FILE).
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2290 The FUNCTION is intended to parse FILE according its syntax.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2291 It might be a predefined FUNCTION, or a user defined FUNCTION.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2292 Predefined FUNCTIONs are `tramp-parse-rhosts', `tramp-parse-shosts',
99540
c5c8f07bc47c * w32-fns.el (w32-shell-dos-semantics):
Juanma Barranquero <lekktu@gmail.com>
parents: 98699
diff changeset
2293 `tramp-parse-sconfig', `tramp-parse-hosts', `tramp-parse-passwd',
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
2294 and `tramp-parse-netrc'.
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
2295
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2296 Example:
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2297
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2298 (tramp-set-completion-function
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2299 \"ssh\"
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
2300 '((tramp-parse-sconfig \"/etc/ssh_config\")
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
2301 (tramp-parse-sconfig \"~/.ssh/config\")))"
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2302
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
2303 (let ((r function-list)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
2304 (v function-list))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
2305 (setq tramp-completion-function-alist
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
2306 (delete (assoc method tramp-completion-function-alist)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
2307 tramp-completion-function-alist))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
2308
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
2309 (while v
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2310 ;; Remove double entries.
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
2311 (when (member (car v) (cdr v))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
2312 (setcdr v (delete (car v) (cdr v))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2313 ;; Check for function and file or registry key.
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
2314 (unless (and (functionp (nth 0 (car v)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2315 (if (string-match "^HKEY_CURRENT_USER" (nth 1 (car v)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2316 ;; Windows registry.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2317 (and (memq system-type '(cygwin windows-nt))
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
2318 (zerop
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
2319 (tramp-local-call-process
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
2320 "reg" nil nil nil "query" (nth 1 (car v)))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2321 ;; Configuration file.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2322 (file-exists-p (nth 1 (car v)))))
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
2323 (setq r (delete (car v) r)))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
2324 (setq v (cdr v)))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
2325
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
2326 (when r
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
2327 (add-to-list 'tramp-completion-function-alist
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
2328 (cons method r)))))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2329
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2330 (defun tramp-get-completion-function (method)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2331 "Returns a list of completion functions for METHOD.
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2332 For definition of that list see `tramp-set-completion-function'."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2333 (cons
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2334 ;; Hosts visited once shall be remembered.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2335 `(tramp-parse-connection-properties ,method)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2336 ;; The method related defaults.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2337 (cdr (assoc method tramp-completion-function-alist))))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2338
84739
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2339
87648
7ae99e295dfd * vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents: 87368
diff changeset
2340 ;;; Fontification of `read-file-name':
7ae99e295dfd * vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents: 87368
diff changeset
2341
7ae99e295dfd * vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents: 87368
diff changeset
2342 ;; rfn-eshadow.el is part of Emacs 22. It is autoloaded.
84739
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2343 (defvar tramp-rfn-eshadow-overlay)
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2344 (make-variable-buffer-local 'tramp-rfn-eshadow-overlay)
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2345
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2346 (defun tramp-rfn-eshadow-setup-minibuffer ()
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2347 "Set up a minibuffer for `file-name-shadow-mode'.
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2348 Adds another overlay hiding filename parts according to Tramp's
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2349 special handling of `substitute-in-file-name'."
84966
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
2350 (when (symbol-value 'minibuffer-completing-file-name)
84739
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2351 (setq tramp-rfn-eshadow-overlay
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
2352 (funcall (symbol-function 'make-overlay)
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
2353 (funcall (symbol-function 'minibuffer-prompt-end))
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
2354 (funcall (symbol-function 'minibuffer-prompt-end))))
84739
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2355 ;; Copy rfn-eshadow-overlay properties.
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
2356 (let ((props (funcall (symbol-function 'overlay-properties)
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
2357 (symbol-value 'rfn-eshadow-overlay))))
84739
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2358 (while props
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
2359 (funcall (symbol-function 'overlay-put)
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
2360 tramp-rfn-eshadow-overlay (pop props) (pop props))))))
84739
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2361
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2362 (when (boundp 'rfn-eshadow-setup-minibuffer-hook)
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2363 (add-hook 'rfn-eshadow-setup-minibuffer-hook
95659
926453fe3d68 * net/tramp.el (top): Quote feature names. Remove
Michael Albinus <michael.albinus@gmx.de>
parents: 95067
diff changeset
2364 'tramp-rfn-eshadow-setup-minibuffer)
926453fe3d68 * net/tramp.el (top): Quote feature names. Remove
Michael Albinus <michael.albinus@gmx.de>
parents: 95067
diff changeset
2365 (add-hook 'tramp-unload-hook
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2366 (lambda ()
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2367 (remove-hook 'rfn-eshadow-setup-minibuffer-hook
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2368 'tramp-rfn-eshadow-setup-minibuffer))))
84739
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2369
104137
974fca280203 * net/tramp.el (tramp-rfn-eshadow-update-overlay-regexp) New
Michael Albinus <michael.albinus@gmx.de>
parents: 104125
diff changeset
2370 (defconst tramp-rfn-eshadow-update-overlay-regexp
974fca280203 * net/tramp.el (tramp-rfn-eshadow-update-overlay-regexp) New
Michael Albinus <michael.albinus@gmx.de>
parents: 104125
diff changeset
2371 (format "[^%s/~]*\\(/\\|~\\)" tramp-postfix-host-format))
974fca280203 * net/tramp.el (tramp-rfn-eshadow-update-overlay-regexp) New
Michael Albinus <michael.albinus@gmx.de>
parents: 104125
diff changeset
2372
84739
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2373 (defun tramp-rfn-eshadow-update-overlay ()
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2374 "Update `rfn-eshadow-overlay' to cover shadowed part of minibuffer input.
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2375 This is intended to be used as a minibuffer `post-command-hook' for
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2376 `file-name-shadow-mode'; the minibuffer should have already
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2377 been set up by `rfn-eshadow-setup-minibuffer'."
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2378 ;; In remote files name, there is a shadowing just for the local part.
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
2379 (let ((end (or (funcall (symbol-function 'overlay-end)
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
2380 (symbol-value 'rfn-eshadow-overlay))
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
2381 (funcall (symbol-function 'minibuffer-prompt-end)))))
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
2382 (when (file-remote-p (buffer-substring-no-properties end (point-max)))
85428
ad84adc0e027 From_ Johan Bockgrd, <http://article.gmane.org/gmane.emacs.devel/81056>
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 85126
diff changeset
2383 (save-excursion
ad84adc0e027 From_ Johan Bockgrd, <http://article.gmane.org/gmane.emacs.devel/81056>
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 85126
diff changeset
2384 (save-restriction
ad84adc0e027 From_ Johan Bockgrd, <http://article.gmane.org/gmane.emacs.devel/81056>
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 85126
diff changeset
2385 (narrow-to-region
104137
974fca280203 * net/tramp.el (tramp-rfn-eshadow-update-overlay-regexp) New
Michael Albinus <michael.albinus@gmx.de>
parents: 104125
diff changeset
2386 (1+ (or (string-match
974fca280203 * net/tramp.el (tramp-rfn-eshadow-update-overlay-regexp) New
Michael Albinus <michael.albinus@gmx.de>
parents: 104125
diff changeset
2387 tramp-rfn-eshadow-update-overlay-regexp (buffer-string) end)
974fca280203 * net/tramp.el (tramp-rfn-eshadow-update-overlay-regexp) New
Michael Albinus <michael.albinus@gmx.de>
parents: 104125
diff changeset
2388 end))
974fca280203 * net/tramp.el (tramp-rfn-eshadow-update-overlay-regexp) New
Michael Albinus <michael.albinus@gmx.de>
parents: 104125
diff changeset
2389 (point-max))
85428
ad84adc0e027 From_ Johan Bockgrd, <http://article.gmane.org/gmane.emacs.devel/81056>
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 85126
diff changeset
2390 (let ((rfn-eshadow-overlay tramp-rfn-eshadow-overlay)
ad84adc0e027 From_ Johan Bockgrd, <http://article.gmane.org/gmane.emacs.devel/81056>
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 85126
diff changeset
2391 (rfn-eshadow-update-overlay-hook nil))
100634
2af636c8c9d2 * net/tramp.el (tramp-rfn-eshadow-update-overlay): Move overlay to
Michael Albinus <michael.albinus@gmx.de>
parents: 100316
diff changeset
2392 (move-overlay rfn-eshadow-overlay (point-max) (point-max))
85428
ad84adc0e027 From_ Johan Bockgrd, <http://article.gmane.org/gmane.emacs.devel/81056>
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 85126
diff changeset
2393 (funcall (symbol-function 'rfn-eshadow-update-overlay))))))))
84739
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2394
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2395 (when (boundp 'rfn-eshadow-update-overlay-hook)
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2396 (add-hook 'rfn-eshadow-update-overlay-hook
105718
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
2397 'tramp-rfn-eshadow-update-overlay)
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
2398 (add-hook 'tramp-unload-hook
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
2399 (lambda ()
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
2400 (remove-hook 'rfn-eshadow-update-overlay-hook
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
2401 'tramp-rfn-eshadow-update-overlay))))
84739
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
2402
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
2403
106219
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2404 ;;; Integration of eshell.el:
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2405
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2406 (eval-when-compile
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2407 (defvar eshell-path-env))
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2408
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2409 ;; eshell.el keeps the path in `eshell-path-env'. We must change it
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2410 ;; when `default-directory' points to another host.
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2411 (defun tramp-eshell-directory-change ()
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2412 "Set `eshell-path-env' to $PATH of the host related to `default-directory'."
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2413 (setq eshell-path-env
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2414 (if (file-remote-p default-directory)
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2415 (with-parsed-tramp-file-name default-directory nil
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2416 (mapconcat
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2417 'identity
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2418 (tramp-get-remote-path v)
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2419 ":"))
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2420 (getenv "PATH"))))
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2421
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2422 (eval-after-load "esh-util"
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2423 '(progn
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2424 (tramp-eshell-directory-change)
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2425 (add-hook 'eshell-directory-change-hook
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2426 'tramp-eshell-directory-change)
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2427 (add-hook 'tramp-unload-hook
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2428 (lambda ()
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2429 (remove-hook 'eshell-directory-change-hook
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2430 'tramp-eshell-directory-change)))))
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2431
16b061d2742d Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents: 106204
diff changeset
2432
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2433 ;;; File Name Handler Functions:
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2434
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2435 (defun tramp-handle-make-symbolic-link
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2436 (filename linkname &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
2437 "Like `make-symbolic-link' for Tramp files.
46307
a2d047d50fb9 (tramp-handle-make-symbolic-link): Implement.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46306
diff changeset
2438 If LINKNAME is a non-Tramp file, it is used verbatim as the target of
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
2439 the symlink. If LINKNAME is a Tramp file, only the localname component is
46307
a2d047d50fb9 (tramp-handle-make-symbolic-link): Implement.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46306
diff changeset
2440 used as the target of the symlink.
a2d047d50fb9 (tramp-handle-make-symbolic-link): Implement.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46306
diff changeset
2441
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
2442 If LINKNAME is a Tramp file and the localname component is relative, then
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
2443 it is expanded first, before the localname component is taken. Note that
46307
a2d047d50fb9 (tramp-handle-make-symbolic-link): Implement.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46306
diff changeset
2444 this can give surprising results if the user/host for the source and
a2d047d50fb9 (tramp-handle-make-symbolic-link): Implement.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46306
diff changeset
2445 target of the symlink differ."
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2446 (with-parsed-tramp-file-name linkname l
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2447 (let ((ln (tramp-get-remote-ln l))
94401
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
2448 (cwd (tramp-run-real-handler
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
2449 'file-name-directory (list l-localname))))
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2450 (unless ln
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2451 (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2452 l 'file-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2453 "Making a symbolic link. ln(1) does not exist on the remote host."))
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2454
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2455 ;; Do the 'confirm if exists' thing.
46307
a2d047d50fb9 (tramp-handle-make-symbolic-link): Implement.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46306
diff changeset
2456 (when (file-exists-p linkname)
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2457 ;; What to do?
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2458 (if (or (null ok-if-already-exists) ; not allowed to exist
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2459 (and (numberp ok-if-already-exists)
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2460 (not (yes-or-no-p
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2461 (format
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2462 "File %s already exists; make it a link anyway? "
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
2463 l-localname)))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2464 (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2465 l 'file-already-exists "File %s already exists" l-localname)
46307
a2d047d50fb9 (tramp-handle-make-symbolic-link): Implement.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46306
diff changeset
2466 (delete-file linkname)))
a2d047d50fb9 (tramp-handle-make-symbolic-link): Implement.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46306
diff changeset
2467
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
2468 ;; If FILENAME is a Tramp name, use just the localname component.
46307
a2d047d50fb9 (tramp-handle-make-symbolic-link): Implement.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46306
diff changeset
2469 (when (tramp-tramp-file-p filename)
85089
8fb95bcda144 * net/tramp.el (tramp-find-foreign-file-name-handler): Check also
Michael Albinus <michael.albinus@gmx.de>
parents: 85067
diff changeset
2470 (setq filename
8fb95bcda144 * net/tramp.el (tramp-find-foreign-file-name-handler): Check also
Michael Albinus <michael.albinus@gmx.de>
parents: 85067
diff changeset
2471 (tramp-file-name-localname
8fb95bcda144 * net/tramp.el (tramp-find-foreign-file-name-handler): Check also
Michael Albinus <michael.albinus@gmx.de>
parents: 85067
diff changeset
2472 (tramp-dissect-file-name (expand-file-name filename)))))
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59582
diff changeset
2473
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2474 ;; Right, they are on the same host, regardless of user, method, etc.
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2475 ;; We now make the link on the remote machine. This will occur as the user
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2476 ;; that FILENAME belongs to.
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2477 (zerop
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2478 (tramp-send-command-and-check
106204
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
2479 l
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
2480 (format
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
2481 "cd %s && %s -sf %s %s"
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
2482 (tramp-shell-quote-argument cwd)
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
2483 ln
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
2484 (tramp-shell-quote-argument filename)
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
2485 (tramp-shell-quote-argument l-localname))
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
2486 t)))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2487
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2488 (defun tramp-handle-load (file &optional noerror nomessage nosuffix must-suffix)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2489 "Like `load' for Tramp files."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2490 (with-parsed-tramp-file-name (expand-file-name file) nil
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2491 (unless nosuffix
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2492 (cond ((file-exists-p (concat file ".elc"))
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2493 (setq file (concat file ".elc")))
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2494 ((file-exists-p (concat file ".el"))
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2495 (setq file (concat file ".el")))))
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2496 (when must-suffix
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2497 ;; The first condition is always true for absolute file names.
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2498 ;; Included for safety's sake.
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2499 (unless (or (file-name-directory file)
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2500 (string-match "\\.elc?\\'" file))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2501 (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2502 v 'file-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2503 "File `%s' does not include a `.el' or `.elc' suffix" file)))
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2504 (unless noerror
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2505 (when (not (file-exists-p file))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2506 (tramp-error v 'file-error "Cannot load nonexistent file `%s'" file)))
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2507 (if (not (file-exists-p file))
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2508 nil
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2509 (unless nomessage (tramp-message v 0 "Loading %s..." file))
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2510 (let ((local-copy (file-local-copy file)))
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2511 ;; MUST-SUFFIX doesn't exist on XEmacs, so let it default to nil.
100922
2b84620022aa * net/tramp.el (tramp-handle-load)
Michael Albinus <michael.albinus@gmx.de>
parents: 100903
diff changeset
2512 (unwind-protect
2b84620022aa * net/tramp.el (tramp-handle-load)
Michael Albinus <michael.albinus@gmx.de>
parents: 100903
diff changeset
2513 (load local-copy noerror t t)
2b84620022aa * net/tramp.el (tramp-handle-load)
Michael Albinus <michael.albinus@gmx.de>
parents: 100903
diff changeset
2514 (delete-file local-copy)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2515 (unless nomessage (tramp-message v 0 "Loading %s...done" file))
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2516 t)))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2517
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
2518 ;; Localname manipulation functions that grok Tramp localnames...
99615
6808df5428f7 * net/tramp.el (tramp-handle-file-name-as-directory): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 99540
diff changeset
2519 (defun tramp-handle-file-name-as-directory (file)
6808df5428f7 * net/tramp.el (tramp-handle-file-name-as-directory): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 99540
diff changeset
2520 "Like `file-name-as-directory' but aware of Tramp files."
6808df5428f7 * net/tramp.el (tramp-handle-file-name-as-directory): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 99540
diff changeset
2521 ;; `file-name-as-directory' would be sufficient except localname is
6808df5428f7 * net/tramp.el (tramp-handle-file-name-as-directory): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 99540
diff changeset
2522 ;; the empty string.
6808df5428f7 * net/tramp.el (tramp-handle-file-name-as-directory): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 99540
diff changeset
2523 (let ((v (tramp-dissect-file-name file t)))
6808df5428f7 * net/tramp.el (tramp-handle-file-name-as-directory): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 99540
diff changeset
2524 ;; Run the command on the localname portion only.
6808df5428f7 * net/tramp.el (tramp-handle-file-name-as-directory): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 99540
diff changeset
2525 (tramp-make-tramp-file-name
6808df5428f7 * net/tramp.el (tramp-handle-file-name-as-directory): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 99540
diff changeset
2526 (tramp-file-name-method v)
6808df5428f7 * net/tramp.el (tramp-handle-file-name-as-directory): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 99540
diff changeset
2527 (tramp-file-name-user v)
6808df5428f7 * net/tramp.el (tramp-handle-file-name-as-directory): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 99540
diff changeset
2528 (tramp-file-name-host v)
6808df5428f7 * net/tramp.el (tramp-handle-file-name-as-directory): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 99540
diff changeset
2529 (tramp-run-real-handler
6808df5428f7 * net/tramp.el (tramp-handle-file-name-as-directory): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 99540
diff changeset
2530 'file-name-as-directory (list (or (tramp-file-name-localname v) ""))))))
6808df5428f7 * net/tramp.el (tramp-handle-file-name-as-directory): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 99540
diff changeset
2531
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2532 (defun tramp-handle-file-name-directory (file)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2533 "Like `file-name-directory' but aware of Tramp files."
84966
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
2534 ;; Everything except the last filename thing is the directory. We
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
2535 ;; cannot apply `with-parsed-tramp-file-name', because this expands
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
2536 ;; the remote file name parts. This is a problem when we are in
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
2537 ;; file name completion.
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
2538 (let ((v (tramp-dissect-file-name file t)))
70318
77201b466c80 * net/tramp.el (tramp-completion-file-name-handler-alist)
Michael Albinus <michael.albinus@gmx.de>
parents: 70276
diff changeset
2539 ;; Run the command on the localname portion only.
77201b466c80 * net/tramp.el (tramp-completion-file-name-handler-alist)
Michael Albinus <michael.albinus@gmx.de>
parents: 70276
diff changeset
2540 (tramp-make-tramp-file-name
84966
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
2541 (tramp-file-name-method v)
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
2542 (tramp-file-name-user v)
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
2543 (tramp-file-name-host v)
94401
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
2544 (tramp-run-real-handler
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
2545 'file-name-directory (list (or (tramp-file-name-localname v) ""))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2546
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2547 (defun tramp-handle-file-name-nondirectory (file)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2548 "Like `file-name-nondirectory' but aware of Tramp files."
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2549 (with-parsed-tramp-file-name file nil
94401
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
2550 (tramp-run-real-handler 'file-name-nondirectory (list localname))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2551
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2552 (defun tramp-handle-file-truename (filename &optional counter prev-dirs)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2553 "Like `file-truename' for Tramp files."
56644
0cee455027ed Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents: 56465
diff changeset
2554 (with-parsed-tramp-file-name (expand-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
2555 (with-file-property v localname "file-truename"
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2556 (let ((result nil)) ; result steps in reverse order
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2557 (tramp-message v 4 "Finding true name for `%s'" filename)
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2558 (cond
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2559 ;; Use GNU readlink --canonicalize-missing where available.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2560 ((tramp-get-remote-readlink v)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2561 (setq result
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2562 (tramp-send-command-and-read
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2563 v
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2564 (format "echo \"\\\"`%s --canonicalize-missing %s`\\\"\""
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2565 (tramp-get-remote-readlink v)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2566 (tramp-shell-quote-argument localname)))))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2567
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2568 ;; Use Perl implementation.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2569 ((and (tramp-get-remote-perl v)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2570 (tramp-get-connection-property v "perl-file-spec" nil)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2571 (tramp-get-connection-property v "perl-cwd-realpath" nil))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2572 (tramp-maybe-send-script
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2573 v tramp-perl-file-truename "tramp_perl_file_truename")
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2574 (setq result
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2575 (tramp-send-command-and-read
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2576 v
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2577 (format "tramp_perl_file_truename %s"
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2578 (tramp-shell-quote-argument localname)))))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2579
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2580 ;; Do it yourself. We bind `directory-sep-char' here for
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2581 ;; XEmacs on Windows, which would otherwise use backslash.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2582 (t (let* ((directory-sep-char ?/)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2583 (steps (tramp-compat-split-string localname "/"))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2584 (localnamedir (tramp-run-real-handler
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2585 'file-name-as-directory (list localname)))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2586 (is-dir (string= localname localnamedir))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2587 (thisstep nil)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2588 (numchase 0)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2589 ;; Don't make the following value larger than
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2590 ;; necessary. People expect an error message in a
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2591 ;; timely fashion when something is wrong;
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2592 ;; otherwise they might think that Emacs is hung.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2593 ;; Of course, correctness has to come first.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2594 (numchase-limit 20)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2595 symlink-target)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2596 (while (and steps (< numchase numchase-limit))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2597 (setq thisstep (pop steps))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2598 (tramp-message
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2599 v 5 "Check %s"
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2600 (mapconcat 'identity
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2601 (append '("") (reverse result) (list thisstep))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2602 "/"))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2603 (setq symlink-target
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2604 (nth 0 (file-attributes
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2605 (tramp-make-tramp-file-name
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2606 method user host
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2607 (mapconcat 'identity
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2608 (append '("")
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2609 (reverse result)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2610 (list thisstep))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2611 "/")))))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2612 (cond ((string= "." thisstep)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2613 (tramp-message v 5 "Ignoring step `.'"))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2614 ((string= ".." thisstep)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2615 (tramp-message v 5 "Processing step `..'")
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2616 (pop result))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2617 ((stringp symlink-target)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2618 ;; It's a symlink, follow it.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2619 (tramp-message v 5 "Follow symlink to %s" symlink-target)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2620 (setq numchase (1+ numchase))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2621 (when (file-name-absolute-p symlink-target)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2622 (setq result nil))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2623 ;; If the symlink was absolute, we'll get a string like
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2624 ;; "/user@host:/some/target"; extract the
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2625 ;; "/some/target" part from it.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2626 (when (tramp-tramp-file-p symlink-target)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2627 (unless (tramp-equal-remote filename symlink-target)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2628 (tramp-error
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2629 v 'file-error
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2630 "Symlink target `%s' on wrong host" symlink-target))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2631 (setq symlink-target localname))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2632 (setq steps
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2633 (append (tramp-compat-split-string
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2634 symlink-target "/")
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2635 steps)))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2636 (t
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2637 ;; It's a file.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2638 (setq result (cons thisstep result)))))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2639 (when (>= numchase numchase-limit)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2640 (tramp-error
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2641 v 'file-error
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2642 "Maximum number (%d) of symlinks exceeded" numchase-limit))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2643 (setq result (reverse result))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2644 ;; Combine list to form string.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2645 (setq result
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2646 (if result
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2647 (mapconcat 'identity (cons "" result) "/")
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2648 "/"))
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2649 (when (and is-dir (or (string= "" result)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2650 (not (string= (substring result -1) "/"))))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2651 (setq result (concat result "/"))))))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2652
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2653 (tramp-message v 4 "True name of `%s' is `%s'" filename result)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2654 (tramp-make-tramp-file-name method user host result)))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2655
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2656 ;; Basic functions.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2657
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2658 (defun tramp-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
2659 "Like `file-exists-p' for Tramp files."
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2660 (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
2661 (with-file-property v localname "file-exists-p"
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2662 (or (not (null (tramp-get-file-property
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2663 v localname "file-attributes-integer" nil)))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2664 (not (null (tramp-get-file-property
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2665 v localname "file-attributes-string" nil)))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2666 (zerop (tramp-send-command-and-check
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2667 v
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2668 (format
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2669 "%s %s"
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2670 (tramp-get-file-exists-command v)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
2671 (tramp-shell-quote-argument localname))))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2672
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2673 ;; Inodes don't exist for some file systems. Therefore we must
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2674 ;; generate virtual ones. Used in `find-buffer-visiting'. The method
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2675 ;; applied might be not so efficient (Ange-FTP uses hashes). But
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2676 ;; performance isn't the major issue given that file transfer will
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2677 ;; take time.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2678 (defvar tramp-inodes nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2679 "Keeps virtual inodes numbers.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2680
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
2681 ;; Devices must distinguish physical file systems. The device numbers
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
2682 ;; provided by "lstat" aren't unique, because we operate on different hosts.
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
2683 ;; So we use virtual device numbers, generated by Tramp. Both Ange-FTP and
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
2684 ;; EFS use device number "-1". In order to be different, we use device number
97052
bed318e44ebd * net/tramp.el (tramp-perl-directory-files-and-attributes)
Michael Albinus <michael.albinus@gmx.de>
parents: 97035
diff changeset
2685 ;; (-1 . x), whereby "x" is unique for a given (method user host).
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
2686 (defvar tramp-devices nil
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
2687 "Keeps virtual device numbers.")
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
2688
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2689 ;; CCC: This should check for an error condition and signal failure
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2690 ;; when something goes wrong.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2691 ;; Daniel Pittman <daniel@danann.net>
53206
0c19f1a19b2b (tramp-chunksize): Extend docstring. Suggested by
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 52401
diff changeset
2692 (defun tramp-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
2693 "Like `file-attributes' for Tramp files."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2694 (unless id-format (setq id-format 'integer))
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2695 ;; Don't modify `last-coding-system-used' by accident.
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2696 (let ((last-coding-system-used last-coding-system-used))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2697 (with-parsed-tramp-file-name (expand-file-name filename) nil
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2698 (with-file-property v localname (format "file-attributes-%s" id-format)
104807
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
2699 (save-excursion
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
2700 (tramp-convert-file-attributes
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
2701 v
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
2702 (cond
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
2703 ((tramp-get-remote-stat v)
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
2704 (tramp-do-file-attributes-with-stat v localname id-format))
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
2705 ((tramp-get-remote-perl v)
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
2706 (tramp-do-file-attributes-with-perl v localname id-format))
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
2707 (t
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
2708 (tramp-do-file-attributes-with-ls v localname id-format)))))))))
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
2709
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
2710 (defun tramp-do-file-attributes-with-ls (vec localname &optional id-format)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2711 "Implement `file-attributes' for Tramp files using the ls(1) command."
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2712 (let (symlinkp dirp
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2713 res-inode res-filemodes res-numlinks
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2714 res-uid res-gid res-size res-symlink-target)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2715 (tramp-message vec 5 "file attributes with ls: %s" localname)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2716 (tramp-send-command
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2717 vec
104866
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2718 (format "(%s %s || %s -h %s) && %s %s %s"
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2719 (tramp-get-file-exists-command vec)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2720 (tramp-shell-quote-argument localname)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2721 (tramp-get-test-command vec)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2722 (tramp-shell-quote-argument localname)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2723 (tramp-get-ls-command vec)
58540
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
2724 (if (eq id-format 'integer) "-ildn" "-ild")
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
2725 (tramp-shell-quote-argument localname)))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2726 ;; parse `ls -l' output ...
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2727 (with-current-buffer (tramp-get-buffer vec)
104866
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2728 (when (> (buffer-size) 0)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2729 (goto-char (point-min))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2730 ;; ... inode
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2731 (setq res-inode
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2732 (condition-case err
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2733 (read (current-buffer))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2734 (invalid-read-syntax
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2735 (when (and (equal (cadr err)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2736 "Integer constant overflow in reader")
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2737 (string-match
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2738 "^[0-9]+\\([0-9][0-9][0-9][0-9][0-9]\\)\\'"
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2739 (car (cddr err))))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2740 (let* ((big (read (substring (car (cddr err)) 0
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2741 (match-beginning 1))))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2742 (small (read (match-string 1 (car (cddr err)))))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2743 (twiddle (/ small 65536)))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2744 (cons (+ big twiddle)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2745 (- small (* twiddle 65536))))))))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2746 ;; ... file mode flags
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2747 (setq res-filemodes (symbol-name (read (current-buffer))))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2748 ;; ... number links
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2749 (setq res-numlinks (read (current-buffer)))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2750 ;; ... uid and gid
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2751 (setq res-uid (read (current-buffer)))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2752 (setq res-gid (read (current-buffer)))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2753 (if (eq id-format 'integer)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2754 (progn
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2755 (unless (numberp res-uid) (setq res-uid -1))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2756 (unless (numberp res-gid) (setq res-gid -1)))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2757 (progn
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2758 (unless (stringp res-uid) (setq res-uid (symbol-name res-uid)))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2759 (unless (stringp res-gid) (setq res-gid (symbol-name res-gid)))))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2760 ;; ... size
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2761 (setq res-size (read (current-buffer)))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2762 ;; From the file modes, figure out other stuff.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2763 (setq symlinkp (eq ?l (aref res-filemodes 0)))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2764 (setq dirp (eq ?d (aref res-filemodes 0)))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2765 ;; if symlink, find out file name pointed to
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2766 (when symlinkp
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2767 (search-forward "-> ")
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2768 (setq res-symlink-target
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2769 (buffer-substring (point) (tramp-compat-line-end-position))))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2770 ;; return data gathered
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2771 (list
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2772 ;; 0. t for directory, string (name linked to) for symbolic
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2773 ;; link, or nil.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2774 (or dirp res-symlink-target)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2775 ;; 1. Number of links to file.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2776 res-numlinks
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2777 ;; 2. File uid.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2778 res-uid
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2779 ;; 3. File gid.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2780 res-gid
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2781 ;; 4. Last access time, as a list of two integers. First
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2782 ;; integer has high-order 16 bits of time, second has low 16
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2783 ;; bits.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2784 ;; 5. Last modification time, likewise.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2785 ;; 6. Last status change time, likewise.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2786 '(0 0) '(0 0) '(0 0) ;CCC how to find out?
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2787 ;; 7. Size in bytes (-1, if number is out of range).
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2788 res-size
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2789 ;; 8. File modes, as a string of ten letters or dashes as in ls -l.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2790 res-filemodes
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2791 ;; 9. t if file's gid would change if file were deleted and
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2792 ;; recreated. Will be set in `tramp-convert-file-attributes'
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2793 t
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2794 ;; 10. inode number.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2795 res-inode
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2796 ;; 11. Device number. Will be replaced by a virtual device number.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2797 -1
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2798 )))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2799
104807
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
2800 (defun tramp-do-file-attributes-with-perl
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2801 (vec localname &optional id-format)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2802 "Implement `file-attributes' for Tramp files using a Perl script."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2803 (tramp-message vec 5 "file attributes with perl: %s" localname)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2804 (tramp-maybe-send-script
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2805 vec tramp-perl-file-attributes "tramp_perl_file_attributes")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2806 (tramp-send-command-and-read
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2807 vec
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2808 (format "tramp_perl_file_attributes %s %s"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2809 (tramp-shell-quote-argument localname) id-format)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2810
104807
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
2811 (defun tramp-do-file-attributes-with-stat
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2812 (vec localname &optional id-format)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2813 "Implement `file-attributes' for Tramp files using stat(1) command."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2814 (tramp-message vec 5 "file attributes with stat: %s" localname)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2815 (tramp-send-command-and-read
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2816 vec
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2817 (format
104866
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2818 "((%s %s || %s -h %s) && %s -c '((\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s.0 \"%%A\" t %%i.0 -1)' %s || echo nil)"
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2819 (tramp-get-file-exists-command vec)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2820 (tramp-shell-quote-argument localname)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2821 (tramp-get-test-command vec)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
2822 (tramp-shell-quote-argument localname)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2823 (tramp-get-remote-stat vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2824 (if (eq id-format 'integer) "%u" "\"%U\"")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2825 (if (eq id-format 'integer) "%g" "\"%G\"")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2826 (tramp-shell-quote-argument localname))))
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
2827
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2828 (defun tramp-handle-set-visited-file-modtime (&optional time-list)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2829 "Like `set-visited-file-modtime' for Tramp files."
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2830 (unless (buffer-file-name)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2831 (error "Can't set-visited-file-modtime: buffer `%s' not visiting a file"
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2832 (buffer-name)))
56644
0cee455027ed Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents: 56465
diff changeset
2833 (if time-list
0cee455027ed Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents: 56465
diff changeset
2834 (tramp-run-real-handler 'set-visited-file-modtime (list time-list))
65925
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
2835 (let ((f (buffer-file-name))
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
2836 coding-system-used)
56644
0cee455027ed Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents: 56465
diff changeset
2837 (with-parsed-tramp-file-name f nil
0cee455027ed Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents: 56465
diff changeset
2838 (let* ((attr (file-attributes f))
0cee455027ed Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents: 56465
diff changeset
2839 ;; '(-1 65535) means file doesn't exists yet.
0cee455027ed Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents: 56465
diff changeset
2840 (modtime (or (nth 5 attr) '(-1 65535))))
65925
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
2841 (when (boundp 'last-coding-system-used)
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
2842 (setq coding-system-used (symbol-value 'last-coding-system-used)))
56644
0cee455027ed Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents: 56465
diff changeset
2843 ;; We use '(0 0) as a don't-know value. See also
104807
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
2844 ;; `tramp-do-file-attributes-with-ls'.
56644
0cee455027ed Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents: 56465
diff changeset
2845 (if (not (equal modtime '(0 0)))
0cee455027ed Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents: 56465
diff changeset
2846 (tramp-run-real-handler 'set-visited-file-modtime (list modtime))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2847 (progn
56644
0cee455027ed Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents: 56465
diff changeset
2848 (tramp-send-command
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2849 v
56644
0cee455027ed Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents: 56465
diff changeset
2850 (format "%s -ild %s"
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2851 (tramp-get-ls-command v)
56644
0cee455027ed Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents: 56465
diff changeset
2852 (tramp-shell-quote-argument localname)))
0cee455027ed Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents: 56465
diff changeset
2853 (setq attr (buffer-substring (point)
0cee455027ed Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents: 56465
diff changeset
2854 (progn (end-of-line) (point)))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2855 (tramp-set-file-property
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2856 v localname "visited-file-modtime-ild" attr))
65925
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
2857 (when (boundp 'last-coding-system-used)
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
2858 (set 'last-coding-system-used coding-system-used))
64772
060177e931f8 Sync with Tramp 2.0.50.
Michael Albinus <michael.albinus@gmx.de>
parents: 64701
diff changeset
2859 nil)))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2860
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2861 ;; This function makes the same assumption as
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2862 ;; `tramp-handle-set-visited-file-modtime'.
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2863 (defun tramp-handle-verify-visited-file-modtime (buf)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2864 "Like `verify-visited-file-modtime' for Tramp files.
59031
1fbbe0bcfaac Sync with Tramp 2.0.46.
Michael Albinus <michael.albinus@gmx.de>
parents: 58776
diff changeset
2865 At the time `verify-visited-file-modtime' calls this function, we
1fbbe0bcfaac Sync with Tramp 2.0.46.
Michael Albinus <michael.albinus@gmx.de>
parents: 58776
diff changeset
2866 already know that the buffer is visiting a file and that
1fbbe0bcfaac Sync with Tramp 2.0.46.
Michael Albinus <michael.albinus@gmx.de>
parents: 58776
diff changeset
2867 `visited-file-modtime' does not return 0. Do not call this
1fbbe0bcfaac Sync with Tramp 2.0.46.
Michael Albinus <michael.albinus@gmx.de>
parents: 58776
diff changeset
2868 function directly, unless those two cases are already taken care
1fbbe0bcfaac Sync with Tramp 2.0.46.
Michael Albinus <michael.albinus@gmx.de>
parents: 58776
diff changeset
2869 of."
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2870 (with-current-buffer buf
57559
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2871 ;; There is no file visiting the buffer, or the buffer has no
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2872 ;; recorded last modification time.
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2873 (if (or (not (buffer-file-name))
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2874 (eq (visited-file-modtime) 0))
64772
060177e931f8 Sync with Tramp 2.0.50.
Michael Albinus <michael.albinus@gmx.de>
parents: 64701
diff changeset
2875 t
57559
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2876 (let ((f (buffer-file-name)))
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2877 (with-parsed-tramp-file-name f nil
82201
b3182f0c969c * net/tramp.el:
Michael Albinus <michael.albinus@gmx.de>
parents: 82140
diff changeset
2878 (tramp-flush-file-property v localname)
57559
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2879 (let* ((attr (file-attributes f))
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2880 (modtime (nth 5 attr))
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2881 (mt (visited-file-modtime)))
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59582
diff changeset
2882
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2883 (cond
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2884 ;; File exists, and has a known modtime.
57559
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2885 ((and attr (not (equal modtime '(0 0))))
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2886 (< (abs (tramp-time-diff
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2887 modtime
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2888 ;; For compatibility, deal with both the old
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2889 ;; (HIGH . LOW) and the new (HIGH LOW) return
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2890 ;; values of `visited-file-modtime'.
57559
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2891 (if (atom (cdr mt))
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2892 (list (car mt) (cdr mt))
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2893 mt)))
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2894 2))
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2895 ;; Modtime has the don't know value.
57559
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2896 (attr
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2897 (tramp-send-command
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2898 v
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2899 (format "%s -ild %s"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2900 (tramp-get-ls-command v)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2901 (tramp-shell-quote-argument localname)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2902 (with-current-buffer (tramp-get-buffer v)
57559
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2903 (setq attr (buffer-substring
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2904 (point) (progn (end-of-line) (point)))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2905 (equal
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2906 attr
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2907 (tramp-get-file-property
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2908 v localname "visited-file-modtime-ild" "")))
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2909 ;; If file does not exist, say it is not modified if and
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2910 ;; only if that agrees with the buffer's record.
57559
07791c7d465b * net/tramp.el: Redo sync with Tramp 2.0.45. Last commit did not
Michael Albinus <michael.albinus@gmx.de>
parents: 57463
diff changeset
2911 (t (equal mt '(-1 65535))))))))))
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2912
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2913 (defun tramp-handle-set-file-modes (filename mode)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2914 "Like `set-file-modes' for Tramp files."
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2915 (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
2916 (tramp-flush-file-property v localname)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2917 (unless (zerop (tramp-send-command-and-check
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2918 v
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2919 (format "chmod %s %s"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2920 (tramp-decimal-to-octal mode)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2921 (tramp-shell-quote-argument localname))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2922 ;; FIXME: extract the proper text from chmod's stderr.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2923 (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2924 v 'file-error "Error while changing file's mode %s" filename))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2925
81938
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2926 (defun tramp-handle-set-file-times (filename &optional time)
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2927 "Like `set-file-times' for Tramp files."
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2928 (zerop
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
2929 (if (file-remote-p filename)
81938
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2930 (with-parsed-tramp-file-name filename nil
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
2931 (tramp-flush-file-property v localname)
81938
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2932 (let ((time (if (or (null time) (equal time '(0 0)))
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2933 (current-time)
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2934 time))
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2935 (utc
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2936 ;; With GNU Emacs, `format-time-string' has an
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2937 ;; optional parameter UNIVERSAL. This is preferred,
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2938 ;; because we could handle the case when the remote
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2939 ;; host is located in a different time zone as the
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2940 ;; local host.
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2941 (and (functionp 'subr-arity)
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2942 (subrp (symbol-function 'format-time-string))
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2943 (= 3 (cdr (funcall (symbol-function 'subr-arity)
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2944 (symbol-function
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2945 'format-time-string)))))))
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2946 (tramp-send-command-and-check
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2947 v (format "%s touch -t %s %s"
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2948 (if utc "TZ=UTC; export TZ;" "")
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2949 (if utc
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2950 (format-time-string "%Y%m%d%H%M.%S" time t)
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2951 (format-time-string "%Y%m%d%H%M.%S" time))
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2952 (tramp-shell-quote-argument localname)))))
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
2953
81938
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2954 ;; We handle also the local part, because in older Emacsen,
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2955 ;; without `set-file-times', this function is an alias for this.
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2956 ;; We are local, so we don't need the UTC settings.
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
2957 (tramp-local-call-process
81938
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2958 "touch" nil nil nil "-t"
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2959 (format-time-string "%Y%m%d%H%M.%S" time)
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
2960 (tramp-shell-quote-argument filename)))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2961
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
2962 (defun tramp-set-file-uid-gid (filename &optional uid gid)
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
2963 "Set the ownership for FILENAME.
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
2964 If UID and GID are provided, these values are used; otherwise uid
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
2965 and gid of the corresponding user is taken. Both parameters must be integers."
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2966 ;; Modern Unices allow chown only for root. So we might need
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2967 ;; another implementation, see `dired-do-chown'. OTOH, it is mostly
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2968 ;; working with su(do)? when it is needed, so it shall succeed in
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
2969 ;; the majority of cases.
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2970 ;; Don't modify `last-coding-system-used' by accident.
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2971 (let ((last-coding-system-used last-coding-system-used))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2972 (if (file-remote-p filename)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2973 (with-parsed-tramp-file-name filename nil
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2974 (if (and (zerop (user-uid)) (tramp-local-host-p v))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2975 ;; If we are root on the local host, we can do it directly.
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2976 (tramp-set-file-uid-gid localname uid gid)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2977 (let ((uid (or (and (integerp uid) uid)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2978 (tramp-get-remote-uid v 'integer)))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2979 (gid (or (and (integerp gid) gid)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2980 (tramp-get-remote-gid v 'integer))))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2981 (tramp-send-command
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2982 v (format
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2983 "chown %d:%d %s" uid gid
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2984 (tramp-shell-quote-argument localname))))))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2985
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2986 ;; We handle also the local part, because there doesn't exist
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2987 ;; `set-file-uid-gid'. On W32 "chown" might not work.
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2988 (let ((uid (or (and (integerp uid) uid) (tramp-get-local-uid 'integer)))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2989 (gid (or (and (integerp gid) gid) (tramp-get-local-gid 'integer))))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2990 (tramp-local-call-process
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2991 "chown" nil nil nil
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
2992 (format "%d:%d" uid gid) (tramp-shell-quote-argument filename))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2993
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2994 ;; Simple functions using the `test' command.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2995
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2996 (defun tramp-handle-file-executable-p (filename)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
2997 "Like `file-executable-p' for Tramp files."
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
2998 (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
2999 (with-file-property v localname "file-executable-p"
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3000 ;; Examine `file-attributes' cache to see if request can be
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3001 ;; satisfied without remote operation.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3002 (or (tramp-check-cached-permissions v ?x)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3003 (zerop (tramp-run-test "-x" filename))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3004
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3005 (defun tramp-handle-file-readable-p (filename)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3006 "Like `file-readable-p' for Tramp files."
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3007 (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
3008 (with-file-property v localname "file-readable-p"
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3009 ;; Examine `file-attributes' cache to see if request can be
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3010 ;; satisfied without remote operation.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3011 (or (tramp-check-cached-permissions v ?r)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3012 (zerop (tramp-run-test "-r" filename))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3013
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3014 ;; When the remote shell is started, it looks for a shell which groks
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3015 ;; tilde expansion. Here, we assume that all shells which grok tilde
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3016 ;; expansion will also provide a `test' command which groks `-nt' (for
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3017 ;; newer than). If this breaks, tell me about it and I'll try to do
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3018 ;; something smarter about it.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3019 (defun tramp-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
3020 "Like `file-newer-than-file-p' for Tramp files."
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3021 (cond ((not (file-exists-p file1))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3022 nil)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3023 ((not (file-exists-p file2))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3024 t)
47577
20336ef6b20a Version 2.0.21 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47576
diff changeset
3025 ;; We are sure both files exist at this point.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3026 (t
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3027 (save-excursion
47577
20336ef6b20a Version 2.0.21 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47576
diff changeset
3028 ;; We try to get the mtime of both files. If they are not
20336ef6b20a Version 2.0.21 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47576
diff changeset
3029 ;; equal to the "dont-know" value, then we subtract the times
20336ef6b20a Version 2.0.21 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47576
diff changeset
3030 ;; and obtain the result.
20336ef6b20a Version 2.0.21 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47576
diff changeset
3031 (let ((fa1 (file-attributes file1))
20336ef6b20a Version 2.0.21 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47576
diff changeset
3032 (fa2 (file-attributes file2)))
20336ef6b20a Version 2.0.21 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47576
diff changeset
3033 (if (and (not (equal (nth 5 fa1) '(0 0)))
20336ef6b20a Version 2.0.21 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47576
diff changeset
3034 (not (equal (nth 5 fa2) '(0 0))))
59582
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
3035 (> 0 (tramp-time-diff (nth 5 fa2) (nth 5 fa1)))
47577
20336ef6b20a Version 2.0.21 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47576
diff changeset
3036 ;; If one of them is the dont-know value, then we can
20336ef6b20a Version 2.0.21 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47576
diff changeset
3037 ;; still try to run a shell command on the remote host.
20336ef6b20a Version 2.0.21 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47576
diff changeset
3038 ;; However, this only works if both files are Tramp
20336ef6b20a Version 2.0.21 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47576
diff changeset
3039 ;; files and both have the same method, same user, same
20336ef6b20a Version 2.0.21 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47576
diff changeset
3040 ;; host.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3041 (unless (tramp-equal-remote file1 file2)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3042 (with-parsed-tramp-file-name
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3043 (if (tramp-tramp-file-p file1) file1 file2) nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3044 (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3045 v 'file-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3046 "Files %s and %s must have same method, user, host"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3047 file1 file2)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3048 (with-parsed-tramp-file-name file1 nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3049 (zerop (tramp-run-test2
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3050 (tramp-get-test-nt-command v) file1 file2)))))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3051
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3052 ;; Functions implemented using the basic functions above.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3053
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3054 (defun tramp-handle-file-modes (filename)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3055 "Like `file-modes' for Tramp files."
96392
61ba354c1338 * net/tramp.el (tramp-handle-file-modes): Handle symlinks.
Michael Albinus <michael.albinus@gmx.de>
parents: 96361
diff changeset
3056 (let ((truename (or (file-truename filename) filename)))
61ba354c1338 * net/tramp.el (tramp-handle-file-modes): Handle symlinks.
Michael Albinus <michael.albinus@gmx.de>
parents: 96361
diff changeset
3057 (when (file-exists-p truename)
61ba354c1338 * net/tramp.el (tramp-handle-file-modes): Handle symlinks.
Michael Albinus <michael.albinus@gmx.de>
parents: 96361
diff changeset
3058 (tramp-mode-string-to-int (nth 8 (file-attributes truename))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3059
102851
5cc9a4c776e8 * net/tramp.el (tramp-default-file-modes) New defun. Replace all
Michael Albinus <michael.albinus@gmx.de>
parents: 102287
diff changeset
3060 (defun tramp-default-file-modes (filename)
5cc9a4c776e8 * net/tramp.el (tramp-default-file-modes) New defun. Replace all
Michael Albinus <michael.albinus@gmx.de>
parents: 102287
diff changeset
3061 "Return file modes of FILENAME as integer.
5cc9a4c776e8 * net/tramp.el (tramp-default-file-modes) New defun. Replace all
Michael Albinus <michael.albinus@gmx.de>
parents: 102287
diff changeset
3062 If the file modes of FILENAME cannot be determined, return the
103639
6be9692e90bf * net/tramp.el (tramp-default-file-modes) Remove execute permissions.
Michael Albinus <michael.albinus@gmx.de>
parents: 103635
diff changeset
3063 value of `default-file-modes', without execute permissions."
6be9692e90bf * net/tramp.el (tramp-default-file-modes) Remove execute permissions.
Michael Albinus <michael.albinus@gmx.de>
parents: 103635
diff changeset
3064 (or (file-modes filename)
6be9692e90bf * net/tramp.el (tramp-default-file-modes) Remove execute permissions.
Michael Albinus <michael.albinus@gmx.de>
parents: 103635
diff changeset
3065 (logand (default-file-modes) (tramp-octal-to-decimal "0666"))))
102851
5cc9a4c776e8 * net/tramp.el (tramp-default-file-modes) New defun. Replace all
Michael Albinus <michael.albinus@gmx.de>
parents: 102287
diff changeset
3066
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3067 (defun tramp-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
3068 "Like `file-directory-p' for Tramp files."
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3069 ;; Care must be taken that this function returns `t' for symlinks
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3070 ;; pointing to directories. Surely the most obvious implementation
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3071 ;; would be `test -d', but that returns false for such symlinks.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3072 ;; CCC: Stefan Monnier says that `test -d' follows symlinks. And
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3073 ;; I now think he's right. So we could be using `test -d', couldn't
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3074 ;; we?
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3075 ;;
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3076 ;; Alternatives: `cd %s', `test -d %s'
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3077 (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
3078 (with-file-property v localname "file-directory-p"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3079 (zerop (tramp-run-test "-d" filename)))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3080
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3081 (defun tramp-handle-file-regular-p (filename)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3082 "Like `file-regular-p' for Tramp files."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3083 (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
3084 (eq ?- (aref (nth 8 (file-attributes filename)) 0))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3085
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3086 (defun tramp-handle-file-symlink-p (filename)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3087 "Like `file-symlink-p' for Tramp files."
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3088 (with-parsed-tramp-file-name filename nil
53206
0c19f1a19b2b (tramp-chunksize): Extend docstring. Suggested by
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 52401
diff changeset
3089 (let ((x (car (file-attributes filename))))
51177
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
3090 (when (stringp x)
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
3091 ;; When Tramp is running on VMS, then `file-name-absolute-p'
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
3092 ;; might do weird things.
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
3093 (if (file-name-absolute-p x)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3094 (tramp-make-tramp-file-name method user host x)
51177
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
3095 x)))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3096
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3097 (defun tramp-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
3098 "Like `file-writable-p' for Tramp files."
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3099 (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
3100 (with-file-property v localname "file-writable-p"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3101 (if (file-exists-p filename)
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3102 ;; Examine `file-attributes' cache to see if request can be
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3103 ;; satisfied without remote operation.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3104 (or (tramp-check-cached-permissions v ?w)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3105 (zerop (tramp-run-test "-w" filename)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3106 ;; If file doesn't exist, check if directory is writable.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3107 (and (zerop (tramp-run-test
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3108 "-d" (file-name-directory filename)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3109 (zerop (tramp-run-test
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3110 "-w" (file-name-directory filename))))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3111
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3112 (defun tramp-handle-file-ownership-preserved-p (filename)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3113 "Like `file-ownership-preserved-p' for Tramp files."
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3114 (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
3115 (with-file-property v localname "file-ownership-preserved-p"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3116 (let ((attributes (file-attributes filename)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3117 ;; Return t if the file doesn't exist, since it's true that no
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3118 ;; information would be lost by an (attempted) delete and create.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3119 (or (null attributes)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3120 (= (nth 2 attributes) (tramp-get-remote-uid v 'integer)))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3121
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3122 ;; Other file name ops.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3123
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3124 (defun tramp-handle-directory-file-name (directory)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3125 "Like `directory-file-name' for Tramp files."
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
3126 ;; If localname component of filename is "/", leave it unchanged.
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
3127 ;; Otherwise, remove any trailing slash from localname component.
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
3128 ;; Method, host, etc, are unchanged. Does it make sense to try
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
3129 ;; to avoid parsing the filename?
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3130 (with-parsed-tramp-file-name directory nil
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
3131 (if (and (not (zerop (length localname)))
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
3132 (eq (aref localname (1- (length localname))) ?/)
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
3133 (not (string= localname "/")))
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
3134 (substring directory 0 -1)
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
3135 directory)))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3136
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3137 ;; Directory listings.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3138
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3139 (defun tramp-handle-directory-files
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3140 (directory &optional full match nosort files-only)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3141 "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
3142 ;; FILES-ONLY is valid for XEmacs only.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3143 (when (file-directory-p directory)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3144 (setq directory (expand-file-name directory))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3145 (let ((temp (nreverse (file-name-all-completions "" directory)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3146 result item)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3147
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3148 (while temp
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3149 (setq item (directory-file-name (pop temp)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3150 (when (and (or (null match) (string-match match item))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3151 (or (null files-only)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3152 ;; files only
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3153 (and (equal files-only t) (file-regular-p item))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3154 ;; directories only
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3155 (file-directory-p item)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3156 (push (if full (expand-file-name item directory) item)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3157 result)))
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3158 result)))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3159
58540
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
3160 (defun tramp-handle-directory-files-and-attributes
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
3161 (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
3162 "Like `directory-files-and-attributes' for Tramp files."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3163 (unless id-format (setq id-format 'integer))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3164 (when (file-directory-p directory)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3165 (setq directory (expand-file-name directory))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3166 (let* ((temp
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
3167 (tramp-compat-copy-tree
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3168 (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
3169 (with-file-property
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3170 v localname
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3171 (format "directory-files-and-attributes-%s" id-format)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3172 (save-excursion
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3173 (mapcar
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
3174 (lambda (x)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
3175 (cons (car x)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
3176 (tramp-convert-file-attributes v (cdr x))))
104807
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
3177 (cond
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
3178 ((tramp-get-remote-stat v)
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
3179 (tramp-do-directory-files-and-attributes-with-stat
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
3180 v localname id-format))
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
3181 ((tramp-get-remote-perl v)
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
3182 (tramp-do-directory-files-and-attributes-with-perl
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
3183 v localname id-format)))))))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3184 result item)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3185
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3186 (while temp
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3187 (setq item (pop temp))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3188 (when (or (null match) (string-match match (car item)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3189 (when full
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3190 (setcar item (expand-file-name (car item) directory)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3191 (push item result)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3192
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3193 (if nosort
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3194 result
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3195 (sort result (lambda (x y) (string< (car x) (car y))))))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3196
104807
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
3197 (defun tramp-do-directory-files-and-attributes-with-perl
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3198 (vec localname &optional id-format)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3199 "Implement `directory-files-and-attributes' for Tramp files using a Perl script."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3200 (tramp-message vec 5 "directory-files-and-attributes with perl: %s" localname)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3201 (tramp-maybe-send-script
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3202 vec tramp-perl-directory-files-and-attributes
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3203 "tramp_perl_directory_files_and_attributes")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3204 (let ((object
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3205 (tramp-send-command-and-read
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3206 vec
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3207 (format "tramp_perl_directory_files_and_attributes %s %s"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3208 (tramp-shell-quote-argument localname) id-format))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3209 (when (stringp object) (tramp-error vec 'file-error object))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3210 object))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3211
104807
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
3212 (defun tramp-do-directory-files-and-attributes-with-stat
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3213 (vec localname &optional id-format)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3214 "Implement `directory-files-and-attributes' for Tramp files using stat(1) command."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3215 (tramp-message vec 5 "directory-files-and-attributes with stat: %s" localname)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3216 (tramp-send-command-and-read
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3217 vec
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3218 (format
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3219 (concat
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
3220 ;; We must care about filenames with spaces, or starting with
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
3221 ;; "-"; this would confuse xargs. "ls -aQ" might be a solution,
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
3222 ;; but it does not work on all remote systems. Therefore, we
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
3223 ;; quote the filenames via sed.
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
3224 "cd %s; echo \"(\"; (%s -a | sed -e s/\\$/\\\"/g -e s/^/\\\"/g | xargs "
82064
07bb0658401d * net/tramp.el (tramp-perl-file-attributes)
Michael Albinus <michael.albinus@gmx.de>
parents: 82025
diff changeset
3225 "%s -c '(\"%%n\" (\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s.0 \"%%A\" t %%i.0 -1)'); "
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3226 "echo \")\"")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3227 (tramp-shell-quote-argument localname)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3228 (tramp-get-ls-command vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3229 (tramp-get-remote-stat vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3230 (if (eq id-format 'integer) "%u" "\"%U\"")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3231 (if (eq id-format 'integer) "%g" "\"%G\""))))
58540
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
3232
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3233 ;; This function should return "foo/" for directories and "bar" for
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3234 ;; files.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3235 (defun tramp-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
3236 "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
3237 (unless (save-match-data (string-match "/" filename))
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
3238 (with-parsed-tramp-file-name (expand-file-name directory) nil
86204
7d7472ea9c0a * net/tramp.el (tramp-completion-reread-directory-timeout): New
Michael Albinus <michael.albinus@gmx.de>
parents: 86048
diff changeset
3239
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3240 (all-completions
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3241 filename
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3242 (mapcar
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3243 'list
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3244 (or
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3245 ;; Try cache first
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3246 (and
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3247 ;; Ignore if expired
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3248 (or (not (integerp tramp-completion-reread-directory-timeout))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3249 (<= (tramp-time-diff
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3250 (current-time)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3251 (tramp-get-file-property
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3252 v localname "last-completion" '(0 0 0)))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3253 tramp-completion-reread-directory-timeout))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3254
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3255 ;; Try cache entries for filename, filename with last
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3256 ;; character removed, filename with last two characters
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3257 ;; removed, ..., and finally the empty string - all
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3258 ;; concatenated to the local directory name
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3259
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3260 ;; This is inefficient for very long filenames, pity
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3261 ;; `reduce' is not available...
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3262 (car
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3263 (apply
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3264 'append
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3265 (mapcar
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3266 (lambda (x)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3267 (let ((cache-hit
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3268 (tramp-get-file-property
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3269 v
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3270 (concat localname (substring filename 0 x))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3271 "file-name-all-completions"
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3272 nil)))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3273 (when cache-hit (list cache-hit))))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3274 (tramp-compat-number-sequence (length filename) 0 -1)))))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3275
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3276 ;; Cache expired or no matching cache entry found so we need
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3277 ;; to perform a remote operation
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3278 (let (result)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3279 ;; Get a list of directories and files, including reliably
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3280 ;; tagging the directories with a trailing '/'. Because I
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3281 ;; rock. --daniel@danann.net
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3282
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3283 ;; Changed to perform `cd' in the same remote op and only
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3284 ;; get entries starting with `filename'. Capture any `cd'
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3285 ;; error messages. Ensure any `cd' and `echo' aliases are
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3286 ;; ignored.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3287 (tramp-send-command
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3288 v
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3289 (if (tramp-get-remote-perl v)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3290 (progn
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3291 (tramp-maybe-send-script
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3292 v tramp-perl-file-name-all-completions
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3293 "tramp_perl_file_name_all_completions")
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3294 (format "tramp_perl_file_name_all_completions %s %s %d"
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3295 (tramp-shell-quote-argument localname)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3296 (tramp-shell-quote-argument filename)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3297 (if (symbol-value
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3298 'read-file-name-completion-ignore-case)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3299 1 0)))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3300
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3301 (format (concat
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3302 "(\\cd %s 2>&1 && (%s %s -a 2>/dev/null"
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3303 ;; `ls' with wildcard might fail with `Argument
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3304 ;; list too long' error in some corner cases; if
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3305 ;; `ls' fails after `cd' succeeded, chances are
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3306 ;; that's the case, so let's retry without
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3307 ;; wildcard. This will return "too many" entries
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3308 ;; but that isn't harmful.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3309 " || %s -a 2>/dev/null)"
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3310 " | while read f; do"
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3311 " if %s -d \"$f\" 2>/dev/null;"
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3312 " then \\echo \"$f/\"; else \\echo \"$f\"; fi; done"
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3313 " && \\echo ok) || \\echo fail")
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3314 (tramp-shell-quote-argument localname)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3315 (tramp-get-ls-command v)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3316 ;; When `filename' is empty, just `ls' without
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3317 ;; filename argument is more efficient than `ls *'
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3318 ;; for very large directories and might avoid the
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3319 ;; `Argument list too long' error.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3320 ;;
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3321 ;; With and only with wildcard, we need to add
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3322 ;; `-d' to prevent `ls' from descending into
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3323 ;; sub-directories.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3324 (if (zerop (length filename))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3325 "."
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3326 (concat (tramp-shell-quote-argument filename) "* -d"))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3327 (tramp-get-ls-command v)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3328 (tramp-get-test-command v))))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3329
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3330 ;; Now grab the output.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3331 (with-current-buffer (tramp-get-buffer v)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3332 (goto-char (point-max))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3333
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3334 ;; Check result code, found in last line of output
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3335 (forward-line -1)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3336 (if (looking-at "^fail$")
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3337 (progn
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3338 ;; Grab error message from line before last line
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3339 ;; (it was put there by `cd 2>&1')
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3340 (forward-line -1)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3341 (tramp-error
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3342 v 'file-error
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3343 "tramp-handle-file-name-all-completions: %s"
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3344 (buffer-substring
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3345 (point) (tramp-compat-line-end-position))))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3346 ;; For peace of mind, if buffer doesn't end in `fail'
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3347 ;; then it should end in `ok'. If neither are in the
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3348 ;; buffer something went seriously wrong on the remote
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3349 ;; side.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3350 (unless (looking-at "^ok$")
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3351 (tramp-error
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3352 v 'file-error
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3353 "\
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3354 tramp-handle-file-name-all-completions: internal error accessing `%s': `%s'"
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3355 (tramp-shell-quote-argument localname) (buffer-string))))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3356
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3357 (while (zerop (forward-line -1))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3358 (push (buffer-substring
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3359 (point) (tramp-compat-line-end-position))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3360 result)))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3361
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3362 ;; Because the remote op went through OK we know the
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3363 ;; directory we `cd'-ed to exists
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3364 (tramp-set-file-property
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3365 v localname "file-exists-p" t)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3366
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3367 ;; Because the remote op went through OK we know every
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3368 ;; file listed by `ls' exists.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3369 (mapc (lambda (entry)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3370 (tramp-set-file-property
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3371 v (concat localname entry) "file-exists-p" t))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3372 result)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3373
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3374 (tramp-set-file-property
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3375 v localname "last-completion" (current-time))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3376
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3377 ;; Store result in the cache
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3378 (tramp-set-file-property
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3379 v (concat localname filename)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3380 "file-name-all-completions"
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3381 result))))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3382
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3383 ;; The following isn't needed for Emacs 20 but for 19.34?
74766
ca4412906dbd * net/ange-ftp.el (ange-ftp-file-name-completion): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 74739
diff changeset
3384 (defun tramp-handle-file-name-completion
ca4412906dbd * net/ange-ftp.el (ange-ftp-file-name-completion): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 74739
diff changeset
3385 (filename directory &optional predicate)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3386 "Like `file-name-completion' for Tramp files."
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3387 (unless (tramp-tramp-file-p directory)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3388 (error
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3389 "tramp-handle-file-name-completion invoked on non-tramp directory `%s'"
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3390 directory))
74777
948c86bf6396 * net/tramp.el (tramp-default-method): We still need to check for
Michael Albinus <michael.albinus@gmx.de>
parents: 74766
diff changeset
3391 (try-completion
948c86bf6396 * net/tramp.el (tramp-default-method): We still need to check for
Michael Albinus <michael.albinus@gmx.de>
parents: 74766
diff changeset
3392 filename
948c86bf6396 * net/tramp.el (tramp-default-method): We still need to check for
Michael Albinus <michael.albinus@gmx.de>
parents: 74766
diff changeset
3393 (mapcar 'list (file-name-all-completions filename directory))
948c86bf6396 * net/tramp.el (tramp-default-method): We still need to check for
Michael Albinus <michael.albinus@gmx.de>
parents: 74766
diff changeset
3394 (when predicate
948c86bf6396 * net/tramp.el (tramp-default-method): We still need to check for
Michael Albinus <michael.albinus@gmx.de>
parents: 74766
diff changeset
3395 (lambda (x) (funcall predicate (expand-file-name (car x) directory))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3396
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3397 ;; cp, mv and ln
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3398
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3399 (defun tramp-handle-add-name-to-file
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3400 (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
3401 "Like `add-name-to-file' for Tramp files."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3402 (unless (tramp-equal-remote filename newname)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3403 (with-parsed-tramp-file-name
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3404 (if (tramp-tramp-file-p filename) filename newname) nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3405 (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3406 v 'file-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3407 "add-name-to-file: %s"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3408 "only implemented for same method, same user, same host")))
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3409 (with-parsed-tramp-file-name filename v1
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3410 (with-parsed-tramp-file-name newname v2
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3411 (let ((ln (when v1 (tramp-get-remote-ln v1))))
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3412 (when (and (not ok-if-already-exists)
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3413 (file-exists-p newname)
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3414 (not (numberp ok-if-already-exists))
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3415 (y-or-n-p
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3416 (format
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3417 "File %s already exists; make it a new name anyway? "
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3418 newname)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3419 (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3420 v2 'file-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3421 "add-name-to-file: file %s already exists" newname))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3422 (tramp-flush-file-property v2 v2-localname)
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3423 (tramp-barf-unless-okay
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3424 v1
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
3425 (format "%s %s %s" ln (tramp-shell-quote-argument v1-localname)
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
3426 (tramp-shell-quote-argument v2-localname))
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3427 "error with add-name-to-file, see buffer `%s' for details"
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3428 (buffer-name))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3429
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3430 (defun tramp-handle-copy-file
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3431 (filename newname &optional ok-if-already-exists keep-date preserve-uid-gid)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3432 "Like `copy-file' for Tramp files."
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3433 ;; Check if both files are local -- invoke normal copy-file.
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
3434 ;; Otherwise, use Tramp from local system.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3435 (setq filename (expand-file-name filename))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3436 (setq newname (expand-file-name newname))
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
3437 (cond
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
3438 ;; At least one file a Tramp file?
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
3439 ((or (tramp-tramp-file-p filename)
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
3440 (tramp-tramp-file-p newname))
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
3441 (tramp-do-copy-or-rename-file
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
3442 'copy filename newname ok-if-already-exists keep-date preserve-uid-gid))
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
3443 ;; Compat section.
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
3444 (preserve-uid-gid
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3445 (tramp-run-real-handler
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3446 'copy-file
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
3447 (list filename newname ok-if-already-exists keep-date preserve-uid-gid)))
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
3448 (t
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
3449 (tramp-run-real-handler
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
3450 'copy-file (list filename newname ok-if-already-exists keep-date)))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3451
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3452 (defun tramp-handle-copy-directory (dirname newname &optional keep-date parents)
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3453 "Like `copy-directory' for Tramp files."
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3454 (let ((t1 (tramp-tramp-file-p dirname))
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3455 (t2 (tramp-tramp-file-p newname)))
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3456 (with-parsed-tramp-file-name (if t1 dirname newname) nil
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3457 (if (and (tramp-get-method-parameter method 'tramp-copy-recursive)
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3458 ;; When DIRNAME and NEWNAME are remote, they must have
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3459 ;; the same method.
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3460 (or (null t1) (null t2)
105893
535ef0fe1689 * net/tramp.el (tramp-handle-copy-directory): Don't use
Michael Albinus <michael.albinus@gmx.de>
parents: 105767
diff changeset
3461 (string-equal
535ef0fe1689 * net/tramp.el (tramp-handle-copy-directory): Don't use
Michael Albinus <michael.albinus@gmx.de>
parents: 105767
diff changeset
3462 (tramp-file-name-method (tramp-dissect-file-name dirname))
535ef0fe1689 * net/tramp.el (tramp-handle-copy-directory): Don't use
Michael Albinus <michael.albinus@gmx.de>
parents: 105767
diff changeset
3463 (tramp-file-name-method (tramp-dissect-file-name newname)))))
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3464 ;; scp or rsync DTRT.
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3465 (progn
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3466 (setq dirname (directory-file-name (expand-file-name dirname))
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3467 newname (directory-file-name (expand-file-name newname)))
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3468 (if (and (file-directory-p newname)
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3469 (not (string-equal (file-name-nondirectory dirname)
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3470 (file-name-nondirectory newname))))
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3471 (setq newname
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3472 (expand-file-name
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3473 (file-name-nondirectory dirname) newname)))
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3474 (if (not (file-directory-p (file-name-directory newname)))
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3475 (make-directory (file-name-directory newname) parents))
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3476 (tramp-do-copy-or-rename-file-out-of-band
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3477 'copy dirname newname keep-date))
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3478 ;; We must do it file-wise.
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3479 (tramp-run-real-handler
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3480 'copy-directory (list dirname newname keep-date parents))))))
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3481
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3482 (defun tramp-handle-rename-file
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3483 (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
3484 "Like `rename-file' for Tramp files."
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3485 ;; Check if both files are local -- invoke normal rename-file.
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
3486 ;; Otherwise, use Tramp from local system.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3487 (setq filename (expand-file-name filename))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3488 (setq newname (expand-file-name newname))
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
3489 ;; At least one file a Tramp file?
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3490 (if (or (tramp-tramp-file-p filename)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3491 (tramp-tramp-file-p newname))
59582
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
3492 (tramp-do-copy-or-rename-file
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3493 'rename filename newname ok-if-already-exists t t)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3494 (tramp-run-real-handler
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3495 'rename-file (list filename newname ok-if-already-exists))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3496
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3497 (defun tramp-do-copy-or-rename-file
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3498 (op filename newname &optional ok-if-already-exists keep-date preserve-uid-gid)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3499 "Copy or rename a remote file.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3500 OP must be `copy' or `rename' and indicates the operation to perform.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3501 FILENAME specifies the file to copy or rename, NEWNAME is the name of
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3502 the new file (for copy) or the new name of the file (for rename).
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3503 OK-IF-ALREADY-EXISTS means don't barf if NEWNAME exists already.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3504 KEEP-DATE means to make sure that NEWNAME has the same timestamp
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3505 as FILENAME. PRESERVE-UID-GID, when non-nil, instructs to keep
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3506 the uid and gid if both files are on the same host.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3507
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3508 This function is invoked by `tramp-handle-copy-file' and
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3509 `tramp-handle-rename-file'. It is an error if OP is neither of `copy'
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3510 and `rename'. FILENAME and NEWNAME must be absolute file names."
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3511 (unless (memq op '(copy rename))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3512 (error "Unknown operation `%s', must be `copy' or `rename'" op))
46584
f548d7d0c651 Bump version to 2.0.2.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46347
diff changeset
3513 (let ((t1 (tramp-tramp-file-p filename))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3514 (t2 (tramp-tramp-file-p newname)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3515
93430
45fdb0c49e2f * net/tramp.el (tramp-do-copy-or-rename-file): Fix check for
Michael Albinus <michael.albinus@gmx.de>
parents: 93127
diff changeset
3516 (when (and (not ok-if-already-exists) (file-exists-p newname))
45fdb0c49e2f * net/tramp.el (tramp-do-copy-or-rename-file): Fix check for
Michael Albinus <michael.albinus@gmx.de>
parents: 93127
diff changeset
3517 (with-parsed-tramp-file-name (if t1 filename newname) nil
45fdb0c49e2f * net/tramp.el (tramp-do-copy-or-rename-file): Fix check for
Michael Albinus <michael.albinus@gmx.de>
parents: 93127
diff changeset
3518 (tramp-error
45fdb0c49e2f * net/tramp.el (tramp-do-copy-or-rename-file): Fix check for
Michael Albinus <michael.albinus@gmx.de>
parents: 93127
diff changeset
3519 v 'file-already-exists "File %s already exists" newname)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3520
104097
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3521 (with-parsed-tramp-file-name (if t1 filename newname) nil
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3522 (tramp-message v 0 "Transferring %s to %s..." filename newname))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3523
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3524 (prog1
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3525 (cond
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3526 ;; Both are Tramp files.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3527 ((and t1 t2)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3528 (with-parsed-tramp-file-name filename v1
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3529 (with-parsed-tramp-file-name newname v2
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3530 (cond
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3531 ;; Shortcut: if method, host, user are the same for both
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3532 ;; files, we invoke `cp' or `mv' on the remote host
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3533 ;; directly.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3534 ((tramp-equal-remote filename newname)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3535 (tramp-do-copy-or-rename-file-directly
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3536 op filename newname
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3537 ok-if-already-exists keep-date preserve-uid-gid))
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3538
104097
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3539 ;; Try out-of-band operation.
104807
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
3540 ((tramp-method-out-of-band-p
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
3541 v1 (nth 7 (file-attributes filename)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3542 (tramp-do-copy-or-rename-file-out-of-band
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3543 op filename newname keep-date))
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3544
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3545 ;; No shortcut was possible. So we copy the
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3546 ;; file first. If the operation was `rename', we go
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3547 ;; back and delete the original file (if the copy was
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3548 ;; successful). The approach is simple-minded: we
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3549 ;; create a new buffer, insert the contents of the
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3550 ;; source file into it, then write out the buffer to
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3551 ;; the target file. The advantage is that it doesn't
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3552 ;; matter which filename handlers are used for the
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3553 ;; source and target file.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3554 (t
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3555 (tramp-do-copy-or-rename-file-via-buffer
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3556 op filename newname keep-date))))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3557
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3558 ;; One file is a Tramp file, the other one is local.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3559 ((or t1 t2)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3560 (with-parsed-tramp-file-name (if t1 filename newname) nil
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3561 (cond
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3562 ;; Fast track on local machine.
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3563 ((tramp-local-host-p v)
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3564 (tramp-do-copy-or-rename-file-directly
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3565 op filename newname
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3566 ok-if-already-exists keep-date preserve-uid-gid))
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3567
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3568 ;; If the Tramp file has an out-of-band method, the corresponding
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3569 ;; copy-program can be invoked.
104807
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
3570 ((tramp-method-out-of-band-p v (nth 7 (file-attributes filename)))
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3571 (tramp-do-copy-or-rename-file-out-of-band
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3572 op filename newname keep-date))
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3573
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3574 ;; Use the inline method via a Tramp buffer.
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3575 (t (tramp-do-copy-or-rename-file-via-buffer
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3576 op filename newname keep-date)))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3577
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3578 (t
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3579 ;; One of them must be a Tramp file.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3580 (error "Tramp implementation says this cannot happen")))
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3581
87947
16643a585a09 * net/tramp.el (tramp-do-copy-or-rename-file): Flush the cache of
Michael Albinus <michael.albinus@gmx.de>
parents: 87921
diff changeset
3582 ;; In case of `rename', we must flush the cache of the source file.
16643a585a09 * net/tramp.el (tramp-do-copy-or-rename-file): Flush the cache of
Michael Albinus <michael.albinus@gmx.de>
parents: 87921
diff changeset
3583 (when (and t1 (eq op 'rename))
16643a585a09 * net/tramp.el (tramp-do-copy-or-rename-file): Flush the cache of
Michael Albinus <michael.albinus@gmx.de>
parents: 87921
diff changeset
3584 (with-parsed-tramp-file-name filename nil
16643a585a09 * net/tramp.el (tramp-do-copy-or-rename-file): Flush the cache of
Michael Albinus <michael.albinus@gmx.de>
parents: 87921
diff changeset
3585 (tramp-flush-file-property v localname)))
16643a585a09 * net/tramp.el (tramp-do-copy-or-rename-file): Flush the cache of
Michael Albinus <michael.albinus@gmx.de>
parents: 87921
diff changeset
3586
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3587 ;; When newname did exist, we have wrong cached values.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3588 (when t2
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3589 (with-parsed-tramp-file-name newname nil
104097
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3590 (tramp-flush-file-property v localname)))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3591
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3592 (with-parsed-tramp-file-name (if t1 filename newname) nil
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3593 (tramp-message v 0 "Transferring %s to %s...done" filename newname)))))
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
3594
55420
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
3595 (defun tramp-do-copy-or-rename-file-via-buffer (op filename newname keep-date)
46584
f548d7d0c651 Bump version to 2.0.2.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46347
diff changeset
3596 "Use an Emacs buffer to copy or rename a file.
f548d7d0c651 Bump version to 2.0.2.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46347
diff changeset
3597 First arg OP is either `copy' or `rename' and indicates the operation.
f548d7d0c651 Bump version to 2.0.2.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46347
diff changeset
3598 FILENAME is the source file, NEWNAME the target file.
f548d7d0c651 Bump version to 2.0.2.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46347
diff changeset
3599 KEEP-DATE is non-nil if NEWNAME should have the same timestamp as FILENAME."
92982
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
3600 (with-temp-buffer
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
3601 ;; We must disable multibyte, because binary data shall not be
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
3602 ;; converted.
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
3603 (set-buffer-multibyte nil)
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
3604 (let ((coding-system-for-read 'binary)
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
3605 (jka-compr-inhibit t))
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
3606 (insert-file-contents-literally filename))
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
3607 ;; We don't want the target file to be compressed, so we let-bind
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
3608 ;; `jka-compr-inhibit' to t.
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
3609 (let ((coding-system-for-write 'binary)
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
3610 (jka-compr-inhibit t))
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
3611 (write-region (point-min) (point-max) newname)))
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
3612 ;; KEEP-DATE handling.
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
3613 (when keep-date (set-file-times newname (nth 5 (file-attributes filename))))
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
3614 ;; Set the mode.
102851
5cc9a4c776e8 * net/tramp.el (tramp-default-file-modes) New defun. Replace all
Michael Albinus <michael.albinus@gmx.de>
parents: 102287
diff changeset
3615 (set-file-modes newname (tramp-default-file-modes filename))
92982
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
3616 ;; If the operation was `rename', delete the original file.
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
3617 (unless (eq op 'copy) (delete-file filename)))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3618
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3619 (defun tramp-do-copy-or-rename-file-directly
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3620 (op filename newname ok-if-already-exists keep-date preserve-uid-gid)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3621 "Invokes `cp' or `mv' on the remote system.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3622 OP must be one of `copy' or `rename', indicating `cp' or `mv',
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3623 respectively. FILENAME specifies the file to copy or rename,
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3624 NEWNAME is the name of the new file (for copy) or the new name of
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3625 the file (for rename). Both files must reside on the same host.
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3626 KEEP-DATE means to make sure that NEWNAME has the same timestamp
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3627 as FILENAME. PRESERVE-UID-GID, when non-nil, instructs to keep
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3628 the uid and gid from FILENAME."
84406
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3629 (let ((t1 (tramp-tramp-file-p filename))
103635
11f316dfa4b5 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Handle
Michael Albinus <michael.albinus@gmx.de>
parents: 103627
diff changeset
3630 (t2 (tramp-tramp-file-p newname))
11f316dfa4b5 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Handle
Michael Albinus <michael.albinus@gmx.de>
parents: 103627
diff changeset
3631 (file-times (nth 5 (file-attributes filename)))
11f316dfa4b5 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Handle
Michael Albinus <michael.albinus@gmx.de>
parents: 103627
diff changeset
3632 (file-modes (tramp-default-file-modes filename)))
84406
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3633 (with-parsed-tramp-file-name (if t1 filename newname) nil
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3634 (let* ((cmd (cond ((and (eq op 'copy) preserve-uid-gid) "cp -f -p")
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3635 ((eq op 'copy) "cp -f")
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3636 ((eq op 'rename) "mv -f")
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3637 (t (tramp-error
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3638 v 'file-error
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3639 "Unknown operation `%s', must be `copy' or `rename'"
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3640 op))))
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3641 (localname1
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3642 (if t1 (tramp-handle-file-remote-p filename 'localname) filename))
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3643 (localname2
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3644 (if t2 (tramp-handle-file-remote-p newname 'localname) newname))
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3645 (prefix (file-remote-p (if t1 filename newname)))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3646 cmd-result)
84406
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3647
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3648 (cond
84406
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3649 ;; Both files are on a remote host, with same user.
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3650 ((and t1 t2)
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3651 (setq cmd-result
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3652 (tramp-send-command-and-check
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3653 v
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3654 (format "%s %s %s" cmd
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3655 (tramp-shell-quote-argument localname1)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3656 (tramp-shell-quote-argument localname2))))
84406
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3657 (with-current-buffer (tramp-get-buffer v)
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3658 (goto-char (point-min))
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3659 (unless
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3660 (or
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3661 (and keep-date
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3662 ;; Mask cp -f error.
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3663 (re-search-forward
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3664 tramp-operation-not-permitted-regexp nil t))
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
3665 (zerop cmd-result))
84406
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3666 (tramp-error-with-buffer
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3667 nil v 'file-error
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3668 "Copying directly failed, see buffer `%s' for details."
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3669 (buffer-name)))))
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3670
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3671 ;; We are on the local host.
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3672 ((or t1 t2)
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3673 (cond
84406
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3674 ;; We can do it directly.
94401
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
3675 ((let (file-name-handler-alist)
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
3676 (and (file-readable-p localname1)
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
3677 (file-writable-p (file-name-directory localname2))
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
3678 (or (file-directory-p localname2)
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
3679 (file-writable-p localname2))))
84406
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3680 (if (eq op 'copy)
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
3681 (tramp-compat-copy-file
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
3682 localname1 localname2 ok-if-already-exists
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
3683 keep-date preserve-uid-gid)
94401
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
3684 (tramp-run-real-handler
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
3685 'rename-file (list localname1 localname2 ok-if-already-exists))))
84406
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3686
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3687 ;; We can do it directly with `tramp-send-command'
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
3688 ((and (file-readable-p (concat prefix localname1))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
3689 (file-writable-p
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
3690 (file-name-directory (concat prefix localname2)))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
3691 (or (file-directory-p (concat prefix localname2))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
3692 (file-writable-p (concat prefix localname2))))
84406
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3693 (tramp-do-copy-or-rename-file-directly
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3694 op (concat prefix localname1) (concat prefix localname2)
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3695 ok-if-already-exists keep-date t)
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3696 ;; We must change the ownership to the local user.
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3697 (tramp-set-file-uid-gid
84406
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3698 (concat prefix localname2)
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3699 (tramp-get-local-uid 'integer)
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3700 (tramp-get-local-gid 'integer)))
84406
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3701
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3702 ;; We need a temporary file in between.
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
3703 (t
100933
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3704 ;; Create the temporary file.
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3705 (let ((tmpfile (tramp-compat-make-temp-file localname1)))
103333
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3706 (unwind-protect
100933
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3707 (progn
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3708 (cond
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3709 (t1
103333
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3710 (or
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3711 (zerop
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3712 (tramp-send-command-and-check
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3713 v (format
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3714 "%s %s %s" cmd
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3715 (tramp-shell-quote-argument localname1)
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3716 (tramp-shell-quote-argument tmpfile))))
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3717 (tramp-error-with-buffer
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3718 nil v 'file-error
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3719 "Copying directly failed, see buffer `%s' for details."
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3720 (tramp-get-buffer v)))
100933
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3721 ;; We must change the ownership as remote user.
103333
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3722 ;; Since this does not work reliable, we also
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3723 ;; give read permissions.
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3724 (set-file-modes
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3725 (concat prefix tmpfile) (tramp-octal-to-decimal "0777"))
100933
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3726 (tramp-set-file-uid-gid
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3727 (concat prefix tmpfile)
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3728 (tramp-get-local-uid 'integer)
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3729 (tramp-get-local-gid 'integer)))
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3730 (t2
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3731 (if (eq op 'copy)
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3732 (tramp-compat-copy-file
102940
c9dbbc9ce416 * tramp.el (tramp-do-copy-or-rename-file-directly): Overwrite
Michael Albinus <michael.albinus@gmx.de>
parents: 102907
diff changeset
3733 localname1 tmpfile t
100933
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3734 keep-date preserve-uid-gid)
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3735 (tramp-run-real-handler
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3736 'rename-file
102940
c9dbbc9ce416 * tramp.el (tramp-do-copy-or-rename-file-directly): Overwrite
Michael Albinus <michael.albinus@gmx.de>
parents: 102907
diff changeset
3737 (list localname1 tmpfile t)))
100933
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3738 ;; We must change the ownership as local user.
103333
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3739 ;; Since this does not work reliable, we also
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3740 ;; give read permissions.
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3741 (set-file-modes tmpfile (tramp-octal-to-decimal "0777"))
100933
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3742 (tramp-set-file-uid-gid
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3743 tmpfile
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3744 (tramp-get-remote-uid v 'integer)
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3745 (tramp-get-remote-gid v 'integer))))
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3746
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3747 ;; Move the temporary file to its destination.
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3748 (cond
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3749 (t2
103333
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3750 (or
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3751 (zerop
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3752 (tramp-send-command-and-check
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3753 v (format
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3754 "cp -f -p %s %s"
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3755 (tramp-shell-quote-argument tmpfile)
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3756 (tramp-shell-quote-argument localname2))))
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3757 (tramp-error-with-buffer
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3758 nil v 'file-error
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3759 "Copying directly failed, see buffer `%s' for details."
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3760 (tramp-get-buffer v))))
100933
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3761 (t1
100922
2b84620022aa * net/tramp.el (tramp-handle-load)
Michael Albinus <michael.albinus@gmx.de>
parents: 100903
diff changeset
3762 (tramp-run-real-handler
2b84620022aa * net/tramp.el (tramp-handle-load)
Michael Albinus <michael.albinus@gmx.de>
parents: 100903
diff changeset
3763 'rename-file
100933
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3764 (list tmpfile localname2 ok-if-already-exists)))))
cdbc9da35459 *** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents: 100930
diff changeset
3765
103333
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3766 ;; Save exit.
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3767 (condition-case nil
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3768 (delete-file tmpfile)
01d7b6369496 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents: 103328
diff changeset
3769 (error)))))))))
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3770
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3771 ;; Set the time and mode. Mask possible errors.
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3772 (condition-case nil
103627
2cc306c7ad91 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Set file
Michael Albinus <michael.albinus@gmx.de>
parents: 103527
diff changeset
3773 (when keep-date
103635
11f316dfa4b5 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Handle
Michael Albinus <michael.albinus@gmx.de>
parents: 103627
diff changeset
3774 (set-file-times newname file-times)
11f316dfa4b5 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Handle
Michael Albinus <michael.albinus@gmx.de>
parents: 103627
diff changeset
3775 (set-file-modes newname file-modes))
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3776 (error)))))
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
3777
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
3778 (defun tramp-do-copy-or-rename-file-out-of-band (op filename newname keep-date)
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
3779 "Invoke rcp program to copy.
104097
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3780 The method used must be an out-of-band method."
55420
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
3781 (let ((t1 (tramp-tramp-file-p filename))
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
3782 (t2 (tramp-tramp-file-p newname))
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
3783 copy-program copy-args copy-env copy-keep-date port spec
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3784 source target)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3785
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3786 (with-parsed-tramp-file-name (if t1 filename newname) nil
104097
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3787 (if (and t1 t2)
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3788
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3789 ;; Both are Tramp files. We shall optimize it, when the
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3790 ;; methods for filename and newname are the same.
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3791 (let ((tmpfile (tramp-compat-make-temp-file localname)))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3792 (unwind-protect
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3793 (progn
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3794 (tramp-do-copy-or-rename-file-out-of-band
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3795 op filename tmpfile keep-date)
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3796 (tramp-do-copy-or-rename-file-out-of-band
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3797 'rename tmpfile newname keep-date))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3798 ;; Save exit.
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3799 (condition-case nil
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3800 (delete-file tmpfile)
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3801 (error))))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3802
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3803 ;; Expand hops. Might be necessary for gateway methods.
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3804 (setq v (car (tramp-compute-multi-hops v)))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3805 (aset v 3 localname)
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3806
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3807 ;; Check which ones of source and target are Tramp files.
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3808 (setq source (if t1 (tramp-make-copy-program-file-name v) filename)
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3809 target (funcall
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3810 (if (and (file-directory-p filename)
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3811 (string-equal
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3812 (file-name-nondirectory filename)
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3813 (file-name-nondirectory newname)))
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3814 'file-name-directory
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3815 'identity)
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
3816 (if t2 (tramp-make-copy-program-file-name v) newname)))
104097
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3817
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3818 ;; Check for port number. Until now, there's no need for handling
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3819 ;; like method, user, host.
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3820 (setq host (tramp-file-name-real-host v)
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3821 port (tramp-file-name-port v)
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3822 port (or (and port (number-to-string port)) ""))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3823
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3824 ;; Compose copy command.
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3825 (setq spec `((?h . ,host) (?u . ,user) (?p . ,port)
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3826 (?t . ,(tramp-get-connection-property
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3827 (tramp-get-connection-process v) "temp-file" ""))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3828 (?k . ,(if keep-date " " "")))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3829 copy-program (tramp-get-method-parameter
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3830 method 'tramp-copy-program)
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3831 copy-keep-date (tramp-get-method-parameter
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3832 method 'tramp-copy-keep-date)
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3833 copy-args
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3834 (delq
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3835 nil
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3836 (mapcar
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
3837 (lambda (x)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
3838 (setq
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
3839 x
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
3840 ;; " " is indication for keep-date argument.
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
3841 (delete " " (mapcar (lambda (y) (format-spec y spec)) x)))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
3842 (unless (member "" x) (mapconcat 'identity x " ")))
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
3843 (tramp-get-method-parameter method 'tramp-copy-args)))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
3844 copy-env
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
3845 (delq
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
3846 nil
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
3847 (mapcar
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
3848 (lambda (x)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
3849 (setq x (mapcar (lambda (y) (format-spec y spec)) x))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
3850 (unless (member "" x) (mapconcat 'identity x " ")))
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
3851 (tramp-get-method-parameter method 'tramp-copy-env))))
104097
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3852
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3853 ;; Check for program.
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3854 (when (and (fboundp 'executable-find)
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3855 (not (let ((default-directory
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3856 (tramp-compat-temporary-file-directory)))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3857 (executable-find copy-program))))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3858 (tramp-error
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3859 v 'file-error "Cannot find copy program: %s" copy-program))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3860
106115
94327931be14 * net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Set
Michael Albinus <michael.albinus@gmx.de>
parents: 106090
diff changeset
3861 ;; Set variables for computing the prompt for reading
94327931be14 * net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Set
Michael Albinus <michael.albinus@gmx.de>
parents: 106090
diff changeset
3862 ;; password.
94327931be14 * net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Set
Michael Albinus <michael.albinus@gmx.de>
parents: 106090
diff changeset
3863 (setq tramp-current-method (tramp-file-name-method v)
94327931be14 * net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Set
Michael Albinus <michael.albinus@gmx.de>
parents: 106090
diff changeset
3864 tramp-current-user (tramp-file-name-user v)
94327931be14 * net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Set
Michael Albinus <michael.albinus@gmx.de>
parents: 106090
diff changeset
3865 tramp-current-host (tramp-file-name-host v))
94327931be14 * net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Set
Michael Albinus <michael.albinus@gmx.de>
parents: 106090
diff changeset
3866
104097
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3867 (unwind-protect
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3868 (with-temp-buffer
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3869 ;; The default directory must be remote.
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3870 (let ((default-directory
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
3871 (file-name-directory (if t1 filename newname)))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
3872 (process-environment (copy-sequence process-environment)))
104097
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3873 ;; Set the transfer process properties.
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3874 (tramp-set-connection-property
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3875 v "process-name" (buffer-name (current-buffer)))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3876 (tramp-set-connection-property
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3877 v "process-buffer" (current-buffer))
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
3878 (while copy-env
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
3879 (tramp-message v 5 "%s=\"%s\"" (car copy-env) (cadr copy-env))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
3880 (setenv (pop copy-env) (pop copy-env)))
104097
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3881
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3882 ;; Use an asynchronous process. By this, password can
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3883 ;; be handled. The default directory must be local, in
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3884 ;; order to apply the correct `copy-program'. We don't
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3885 ;; set a timeout, because the copying of large files can
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3886 ;; last longer than 60 secs.
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3887 (let ((p (let ((default-directory
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3888 (tramp-compat-temporary-file-directory)))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3889 (apply 'start-process
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3890 (tramp-get-connection-property
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3891 v "process-name" nil)
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3892 (tramp-get-connection-property
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3893 v "process-buffer" nil)
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3894 copy-program
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3895 (append copy-args (list source target))))))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3896 (tramp-message
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3897 v 6 "%s" (mapconcat 'identity (process-command p) " "))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3898 (tramp-set-process-query-on-exit-flag p nil)
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3899 (tramp-process-actions p v tramp-actions-copy-out-of-band))))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3900
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3901 ;; Reset the transfer process properties.
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3902 (tramp-set-connection-property v "process-name" nil)
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3903 (tramp-set-connection-property v "process-buffer" nil))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3904
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3905 ;; Handle KEEP-DATE argument.
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3906 (when (and keep-date (not copy-keep-date))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3907 (set-file-times newname (nth 5 (file-attributes filename))))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3908
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3909 ;; Set the mode.
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3910 (unless (and keep-date copy-keep-date)
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3911 (set-file-modes newname (tramp-default-file-modes filename))))
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3912
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3913 ;; If the operation was `rename', delete the original file.
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3914 (unless (eq op 'copy)
0e24538056bf * net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 103934
diff changeset
3915 (delete-file filename)))))
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
3916
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3917 (defun tramp-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
3918 "Like `make-directory' for Tramp files."
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
3919 (setq dir (expand-file-name dir))
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3920 (with-parsed-tramp-file-name dir nil
105351
4eaec3ddca1c * net/tramp.el (tramp-handle-make-directory): Flush upper
Michael Albinus <michael.albinus@gmx.de>
parents: 105248
diff changeset
3921 (tramp-flush-directory-property v (file-name-directory localname))
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
3922 (save-excursion
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
3923 (tramp-barf-unless-okay
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3924 v
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
3925 (format "%s %s"
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
3926 (if parents "mkdir -p" "mkdir")
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
3927 (tramp-shell-quote-argument localname))
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
3928 "Couldn't make directory %s" dir))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3929
105351
4eaec3ddca1c * net/tramp.el (tramp-handle-make-directory): Flush upper
Michael Albinus <michael.albinus@gmx.de>
parents: 105248
diff changeset
3930 (defun tramp-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
3931 "Like `delete-directory' for Tramp files."
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
3932 (setq directory (expand-file-name directory))
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3933 (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
3934 (tramp-flush-directory-property v localname)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3935 (unless (zerop (tramp-send-command-and-check
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3936 v
105351
4eaec3ddca1c * net/tramp.el (tramp-handle-make-directory): Flush upper
Michael Albinus <michael.albinus@gmx.de>
parents: 105248
diff changeset
3937 (format
4eaec3ddca1c * net/tramp.el (tramp-handle-make-directory): Flush upper
Michael Albinus <michael.albinus@gmx.de>
parents: 105248
diff changeset
3938 "%s %s"
4eaec3ddca1c * net/tramp.el (tramp-handle-make-directory): Flush upper
Michael Albinus <michael.albinus@gmx.de>
parents: 105248
diff changeset
3939 (if recursive "rm -rf" "rmdir")
4eaec3ddca1c * net/tramp.el (tramp-handle-make-directory): Flush upper
Michael Albinus <michael.albinus@gmx.de>
parents: 105248
diff changeset
3940 (tramp-shell-quote-argument localname))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3941 (tramp-error v 'file-error "Couldn't delete %s" directory))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3942
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3943 (defun tramp-handle-delete-file (filename)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3944 "Like `delete-file' for Tramp files."
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
3945 (setq filename (expand-file-name filename))
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3946 (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
3947 (tramp-flush-file-property v localname)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3948 (unless (zerop (tramp-send-command-and-check
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3949 v
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3950 (format "rm -f %s"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3951 (tramp-shell-quote-argument localname))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3952 (tramp-error v 'file-error "Couldn't delete %s" filename))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3953
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3954 ;; Dired.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3955
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3956 ;; CCC: This does not seem to be enough. Something dies when
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
3957 ;; we try and delete two directories under Tramp :/
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3958 (defun tramp-handle-dired-recursive-delete-directory (filename)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3959 "Recursively delete the directory given.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3960 This is like `dired-recursive-delete-directory' for Tramp files."
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
3961 (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
3962 ;; Run a shell command 'rm -r <localname>'
102968
3f05108a52f1 * net/tramp.el (tramp-handle-dired-recursive-delete-directory):
Michael Albinus <michael.albinus@gmx.de>
parents: 102940
diff changeset
3963 ;; Code shamelessly stolen from the dired implementation and, um, hacked :)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3964 (unless (file-exists-p filename)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3965 (tramp-error v 'file-error "No such directory: %s" filename))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3966 ;; Which is better, -r or -R? (-r works for me <daniel@danann.net>)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3967 (tramp-send-command
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3968 v
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
3969 (format "rm -rf %s" (tramp-shell-quote-argument localname))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3970 ;; Don't read the output, do it explicitely.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3971 nil t)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3972 ;; Wait for the remote system to return to us...
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3973 ;; This might take a while, allow it plenty of time.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3974 (tramp-wait-for-output (tramp-get-connection-process v) 120)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3975 ;; Make sure that it worked...
105351
4eaec3ddca1c * net/tramp.el (tramp-handle-make-directory): Flush upper
Michael Albinus <michael.albinus@gmx.de>
parents: 105248
diff changeset
3976 (tramp-flush-directory-property v localname)
56460
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
3977 (and (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
3978 (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3979 v 'file-error "Failed to recursively delete %s" filename))))
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59582
diff changeset
3980
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
3981 (defun tramp-handle-dired-compress-file (file &rest ok-flag)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3982 "Like `dired-compress-file' for Tramp files."
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
3983 ;; OK-FLAG is valid for XEmacs only, but not implemented.
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
3984 ;; Code stolen mainly from dired-aux.el.
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
3985 (with-parsed-tramp-file-name file nil
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
3986 (tramp-flush-file-property v localname)
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
3987 (save-excursion
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
3988 (let ((suffixes
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
3989 (if (not (featurep 'xemacs))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
3990 ;; Emacs case
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
3991 (symbol-value 'dired-compress-file-suffixes)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
3992 ;; XEmacs has `dired-compression-method-alist', which is
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
3993 ;; transformed into `dired-compress-file-suffixes' structure.
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
3994 (mapcar
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
3995 (lambda (x)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
3996 (list (concat (regexp-quote (nth 1 x)) "\\'")
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
3997 nil
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
3998 (mapconcat 'identity (nth 3 x) " ")))
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
3999 (symbol-value 'dired-compression-method-alist))))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4000 suffix)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4001 ;; See if any suffix rule matches this file name.
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4002 (while suffixes
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4003 (let (case-fold-search)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4004 (if (string-match (car (car suffixes)) localname)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4005 (setq suffix (car suffixes) suffixes nil))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4006 (setq suffixes (cdr suffixes))))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4007
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4008 (cond ((file-symlink-p file)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4009 nil)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4010 ((and suffix (nth 2 suffix))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4011 ;; We found an uncompression rule.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4012 (tramp-message v 0 "Uncompressing %s..." file)
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4013 (when (zerop (tramp-send-command-and-check
106204
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
4014 v (concat (nth 2 suffix) " "
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
4015 (tramp-shell-quote-argument localname))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4016 (tramp-message v 0 "Uncompressing %s...done" file)
55420
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
4017 ;; `dired-remove-file' is not defined in XEmacs
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
4018 (funcall (symbol-function 'dired-remove-file) file)
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4019 (string-match (car suffix) file)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4020 (concat (substring file 0 (match-beginning 0)))))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4021 (t
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4022 ;; We don't recognize the file as compressed, so compress it.
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4023 ;; Try gzip.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4024 (tramp-message v 0 "Compressing %s..." file)
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4025 (when (zerop (tramp-send-command-and-check
106204
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
4026 v (concat "gzip -f "
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
4027 (tramp-shell-quote-argument localname))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4028 (tramp-message v 0 "Compressing %s...done" file)
55420
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
4029 ;; `dired-remove-file' is not defined in XEmacs
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
4030 (funcall (symbol-function 'dired-remove-file) file)
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4031 (cond ((file-exists-p (concat file ".gz"))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4032 (concat file ".gz"))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4033 ((file-exists-p (concat file ".z"))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4034 (concat file ".z"))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
4035 (t nil)))))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4036
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4037 (defun tramp-handle-dired-uncache (dir)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4038 "Like `dired-uncache' for Tramp files."
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4039 (with-parsed-tramp-file-name dir nil
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4040 (tramp-flush-file-property v localname)))
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4041
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4042 ;; Pacify byte-compiler. The function is needed on XEmacs only. I'm
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4043 ;; not sure at all that this is the right way to do it, but let's hope
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4044 ;; it works for now, and wait for a guru to point out the Right Way to
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4045 ;; achieve this.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4046 ;;(eval-when-compile
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4047 ;; (unless (fboundp 'dired-insert-set-properties)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4048 ;; (fset 'dired-insert-set-properties 'ignore)))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4049 ;; Gerd suggests this:
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4050 (eval-when-compile (require 'dired))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4051 ;; Note that dired is required at run-time, too, when it is needed.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4052 ;; It is only needed on XEmacs for the function
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4053 ;; `dired-insert-set-properties'.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4054
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4055 (defun tramp-handle-insert-directory
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4056 (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
4057 "Like `insert-directory' for Tramp files."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4058 (setq filename (expand-file-name filename))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4059 (with-parsed-tramp-file-name filename nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4060 (if (and (featurep 'ls-lisp)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4061 (not (symbol-value 'ls-lisp-use-insert-directory-program)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4062 (tramp-run-real-handler
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4063 'insert-directory (list filename switches wildcard full-directory-p))
104216
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4064 (when (and (string-match "^--dired\\s-+" switches)
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4065 (not (tramp-get-ls-command-with-dired v)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4066 (setq switches (replace-match "" nil t switches)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4067 (tramp-message
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4068 v 4 "Inserting directory `ls %s %s', wildcard %s, fulldir %s"
58540
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
4069 switches filename (if wildcard "yes" "no")
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
4070 (if full-directory-p "yes" "no"))
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
4071 (when wildcard
94401
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4072 (setq wildcard (tramp-run-real-handler
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4073 'file-name-nondirectory (list localname)))
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4074 (setq localname (tramp-run-real-handler
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4075 'file-name-directory (list localname))))
58540
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
4076 (when (listp switches)
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
4077 (setq switches (mapconcat 'identity switches " ")))
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
4078 (unless full-directory-p
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
4079 (setq switches (concat "-d " switches)))
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
4080 (when wildcard
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
4081 (setq switches (concat switches " " wildcard)))
106643
9e3bbd77797c * net/tramp.el (tramp-handle-insert-directory): Quote "'" in the
Michael Albinus <michael.albinus@gmx.de>
parents: 106613
diff changeset
4082 (when (string-match "'" switches)
9e3bbd77797c * net/tramp.el (tramp-handle-insert-directory): Quote "'" in the
Michael Albinus <michael.albinus@gmx.de>
parents: 106613
diff changeset
4083 (setq switches (replace-match "\\\\'" nil nil switches)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4084 ;; If `full-directory-p', we just say `ls -l FILENAME'.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4085 ;; Else we chdir to the parent directory, then say `ls -ld BASENAME'.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4086 (if full-directory-p
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4087 (tramp-send-command
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4088 v
106508
8c836ea59444 * net/tramp.el (tramp-handle-insert-directory): Suppress error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 106470
diff changeset
4089 (format "%s %s %s 2>/dev/null"
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4090 (tramp-get-ls-command v)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4091 switches
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4092 (if wildcard
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4093 localname
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4094 (tramp-shell-quote-argument (concat localname ".")))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4095 (tramp-barf-unless-okay
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4096 v
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4097 (format "cd %s" (tramp-shell-quote-argument
94401
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4098 (tramp-run-real-handler
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4099 'file-name-directory (list localname))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4100 "Couldn't `cd %s'"
94401
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4101 (tramp-shell-quote-argument
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4102 (tramp-run-real-handler 'file-name-directory (list localname))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4103 (tramp-send-command
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4104 v
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4105 (format "%s %s %s"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4106 (tramp-get-ls-command v)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4107 switches
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4108 (if (or wildcard
94401
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4109 (zerop (length
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4110 (tramp-run-real-handler
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4111 'file-name-nondirectory (list localname)))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4112 ""
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4113 (tramp-shell-quote-argument
94401
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4114 (tramp-run-real-handler
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4115 'file-name-nondirectory (list localname)))))))
104216
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4116 (let ((beg (point)))
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4117 ;; We cannot use `insert-buffer-substring' because the Tramp
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4118 ;; buffer changes its contents before insertion due to calling
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4119 ;; `expand-file' and alike.
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4120 (insert
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4121 (with-current-buffer (tramp-get-buffer v)
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4122 (buffer-string)))
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4123
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4124 ;; Check for "--dired" output.
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4125 (forward-line -2)
106643
9e3bbd77797c * net/tramp.el (tramp-handle-insert-directory): Quote "'" in the
Michael Albinus <michael.albinus@gmx.de>
parents: 106613
diff changeset
4126 (when (looking-at "//SUBDIRED//")
9e3bbd77797c * net/tramp.el (tramp-handle-insert-directory): Quote "'" in the
Michael Albinus <michael.albinus@gmx.de>
parents: 106613
diff changeset
4127 (forward-line -1))
104216
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4128 (when (looking-at "//DIRED//")
104850
5d5bbec3b1c8 * net/tramp.el (tramp-handle-insert-directory): Handle "--dired"
Michael Albinus <michael.albinus@gmx.de>
parents: 104807
diff changeset
4129 (let ((end (tramp-compat-line-end-position))
104216
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4130 (linebeg (point)))
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4131 ;; Now read the numeric positions of file names.
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4132 (goto-char linebeg)
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4133 (forward-word 1)
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4134 (forward-char 3)
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4135 (while (< (point) end)
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4136 (let ((start (+ beg (read (current-buffer))))
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4137 (end (+ beg (read (current-buffer)))))
104807
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
4138 (if (memq (char-after end) '(?\n ?\ ))
104216
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
4139 ;; End is followed by \n or by " -> ".
106508
8c836ea59444 * net/tramp.el (tramp-handle-insert-directory): Suppress error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 106470
diff changeset
4140 (put-text-property start end 'dired-filename t))))))
8c836ea59444 * net/tramp.el (tramp-handle-insert-directory): Suppress error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 106470
diff changeset
4141 ;; Remove trailing lines.
8c836ea59444 * net/tramp.el (tramp-handle-insert-directory): Suppress error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 106470
diff changeset
4142 (goto-char (tramp-compat-line-beginning-position))
8c836ea59444 * net/tramp.el (tramp-handle-insert-directory): Suppress error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 106470
diff changeset
4143 (while (looking-at "//")
8c836ea59444 * net/tramp.el (tramp-handle-insert-directory): Suppress error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 106470
diff changeset
4144 (forward-line 1)
8c836ea59444 * net/tramp.el (tramp-handle-insert-directory): Suppress error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 106470
diff changeset
4145 (delete-region (match-beginning 0) (point)))
8c836ea59444 * net/tramp.el (tramp-handle-insert-directory): Suppress error messages.
Michael Albinus <michael.albinus@gmx.de>
parents: 106470
diff changeset
4146 (goto-char (point-max))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4147
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4148 (defun tramp-handle-unhandled-file-name-directory (filename)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4149 "Like `unhandled-file-name-directory' for Tramp files."
92982
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
4150 ;; With Emacs 23, we could simply return `nil'. But we must keep it
afa7a7913261 * tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 91689
diff changeset
4151 ;; for backward compatibility.
81938
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
4152 (expand-file-name "~/"))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4153
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4154 ;; Canonicalization of file names.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4155
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4156 (defun tramp-handle-expand-file-name (name &optional dir)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4157 "Like `expand-file-name' for Tramp files.
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
4158 If the localname part of the given filename starts with \"/../\" then
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
4159 the result will be a local, non-Tramp, filename."
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4160 ;; If DIR is not given, use DEFAULT-DIRECTORY or "/".
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4161 (setq dir (or dir default-directory "/"))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4162 ;; Unless NAME is absolute, concat DIR and NAME.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4163 (unless (file-name-absolute-p name)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4164 (setq name (concat (file-name-as-directory dir) name)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4165 ;; If NAME is not a Tramp file, run the real handler.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4166 (if (not (tramp-tramp-file-p name))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4167 (tramp-run-real-handler 'expand-file-name (list name nil))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4168 ;; Dissect NAME.
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
4169 (with-parsed-tramp-file-name name nil
94401
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4170 (unless (tramp-run-real-handler 'file-name-absolute-p (list localname))
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
4171 (setq localname (concat "~/" localname)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4172 ;; Tilde expansion if necessary. This needs a shell which
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4173 ;; groks tilde expansion! The function `tramp-find-shell' is
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4174 ;; supposed to find such a shell on the remote host. Please
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4175 ;; tell me about it when this doesn't work on your system.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4176 (when (string-match "\\`\\(~[^/]*\\)\\(.*\\)\\'" localname)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4177 (let ((uname (match-string 1 localname))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4178 (fname (match-string 2 localname)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4179 ;; We cannot simply apply "~/", because under sudo "~/" is
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4180 ;; expanded to the local user home directory but to the
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4181 ;; root home directory. On the other hand, using always
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4182 ;; the default user name for tilde expansion is not
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4183 ;; appropriate either, because ssh and companions might
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4184 ;; use a user name from the config file.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4185 (when (and (string-equal uname "~")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4186 (string-match "\\`su\\(do\\)?\\'" method))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4187 (setq uname (concat uname user)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4188 (setq uname
106204
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
4189 (with-connection-property v uname
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
4190 (tramp-send-command
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
4191 v (format "cd %s; pwd" (tramp-shell-quote-argument uname)))
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
4192 (with-current-buffer (tramp-get-buffer v)
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
4193 (goto-char (point-min))
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
4194 (buffer-substring
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
4195 (point) (tramp-compat-line-end-position)))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4196 (setq localname (concat uname fname))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4197 ;; There might be a double slash, for example when "~/"
101729
adfc49512fc6 * net/tramp.el (tramp-read-passwd): Cached passwords shall still be used.
Michael Albinus <michael.albinus@gmx.de>
parents: 101656
diff changeset
4198 ;; expands to "/". Remove this.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4199 (while (string-match "//" localname)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4200 (setq localname (replace-match "/" t t localname)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4201 ;; No tilde characters in file name, do normal
105523
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
4202 ;; `expand-file-name' (this does "/./" and "/../"). We bind
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
4203 ;; `directory-sep-char' here for XEmacs on Windows, which would
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
4204 ;; otherwise use backslash. `default-directory' is bound,
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
4205 ;; because on Windows there would be problems with UNC shares or
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
4206 ;; Cygwin mounts.
93082
7e079018403b * net/tramp.el (tramp-let-maybe): Removed.
Michael Albinus <michael.albinus@gmx.de>
parents: 93062
diff changeset
4207 (let ((directory-sep-char ?/)
7e079018403b * net/tramp.el (tramp-let-maybe): Removed.
Michael Albinus <michael.albinus@gmx.de>
parents: 93062
diff changeset
4208 (default-directory (tramp-compat-temporary-file-directory)))
7e079018403b * net/tramp.el (tramp-let-maybe): Removed.
Michael Albinus <michael.albinus@gmx.de>
parents: 93062
diff changeset
4209 (tramp-make-tramp-file-name
7e079018403b * net/tramp.el (tramp-let-maybe): Removed.
Michael Albinus <michael.albinus@gmx.de>
parents: 93062
diff changeset
4210 method user host
7e079018403b * net/tramp.el (tramp-let-maybe): Removed.
Michael Albinus <michael.albinus@gmx.de>
parents: 93062
diff changeset
4211 (tramp-drop-volume-letter
94401
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4212 (tramp-run-real-handler
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4213 'expand-file-name (list localname))))))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4214
94395
f020c9568544 * net/tramp.el (tramp-replace-environment-variables): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 94333
diff changeset
4215 (defun tramp-replace-environment-variables (filename)
f020c9568544 * net/tramp.el (tramp-replace-environment-variables): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 94333
diff changeset
4216 "Replace environment variables in FILENAME.
f020c9568544 * net/tramp.el (tramp-replace-environment-variables): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 94333
diff changeset
4217 Return the string with the replaced variables."
94436
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
4218 (save-match-data
105615
33df72cf19f1 * net/tramp.el (tramp-replace-environment-variables): Do not fail
Michael Albinus <michael.albinus@gmx.de>
parents: 105549
diff changeset
4219 (let ((idx (string-match "$\\(\\w+\\)" filename)))
94436
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
4220 ;; `$' is coded as `$$'.
105615
33df72cf19f1 * net/tramp.el (tramp-replace-environment-variables): Do not fail
Michael Albinus <michael.albinus@gmx.de>
parents: 105549
diff changeset
4221 (when (and idx
33df72cf19f1 * net/tramp.el (tramp-replace-environment-variables): Do not fail
Michael Albinus <michael.albinus@gmx.de>
parents: 105549
diff changeset
4222 (or (zerop idx) (not (eq ?$ (aref filename (1- idx)))))
33df72cf19f1 * net/tramp.el (tramp-replace-environment-variables): Do not fail
Michael Albinus <michael.albinus@gmx.de>
parents: 105549
diff changeset
4223 (getenv (match-string 1 filename)))
94436
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
4224 (setq filename
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
4225 (replace-match
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
4226 (substitute-in-file-name (match-string 0 filename))
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
4227 t nil filename)))
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
4228 filename)))
94395
f020c9568544 * net/tramp.el (tramp-replace-environment-variables): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 94333
diff changeset
4229
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4230 (defun tramp-handle-substitute-in-file-name (filename)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4231 "Like `substitute-in-file-name' for Tramp files.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4232 \"//\" and \"/~\" substitute only in the local filename part.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4233 If the URL Tramp syntax is chosen, \"//\" as method delimeter and \"/~\" at
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4234 beginning of local filename are not substituted."
94395
f020c9568544 * net/tramp.el (tramp-replace-environment-variables): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 94333
diff changeset
4235 ;; First, we must replace environment variables.
f020c9568544 * net/tramp.el (tramp-replace-environment-variables): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 94333
diff changeset
4236 (setq filename (tramp-replace-environment-variables filename))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4237 (with-parsed-tramp-file-name filename nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4238 (if (equal tramp-syntax 'url)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4239 ;; We need to check localname only. The other parts cannot contain
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4240 ;; "//" or "/~".
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4241 (if (and (> (length localname) 1)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4242 (or (string-match "//" localname)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4243 (string-match "/~" localname 1)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4244 (tramp-run-real-handler 'substitute-in-file-name (list filename))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4245 (tramp-make-tramp-file-name
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4246 (when method (substitute-in-file-name method))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4247 (when user (substitute-in-file-name user))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4248 (when host (substitute-in-file-name host))
94401
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4249 (when localname
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4250 (tramp-run-real-handler
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4251 'substitute-in-file-name (list localname)))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4252 ;; Ignore in LOCALNAME everything before "//" or "/~".
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4253 (when (and (stringp localname) (string-match ".+?/\\(/\\|~\\)" localname))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4254 (setq filename
85962
7f134b676a0c * net/tramp.el (tramp-handle-substitute-in-file-name): Don't
Michael Albinus <michael.albinus@gmx.de>
parents: 85943
diff changeset
4255 (concat (file-remote-p filename)
7f134b676a0c * net/tramp.el (tramp-handle-substitute-in-file-name): Don't
Michael Albinus <michael.albinus@gmx.de>
parents: 85943
diff changeset
4256 (replace-match "\\1" nil nil localname)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4257 ;; "/m:h:~" does not work for completion. We use "/m:h:~/".
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4258 (when (string-match "~$" filename)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4259 (setq filename (concat filename "/"))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4260 (tramp-run-real-handler 'substitute-in-file-name (list filename)))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4261
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4262 ;; In XEmacs, electricity is implemented via a key map for ?/ and ?~,
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4263 ;; which calls corresponding functions (see minibuf.el).
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4264 (when (fboundp 'minibuffer-electric-separator)
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
4265 (mapc
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4266 (lambda (x)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4267 (eval
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4268 `(defadvice ,x
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4269 (around ,(intern (format "tramp-advice-%s" x)) activate)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4270 "Invoke `substitute-in-file-name' for Tramp files."
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4271 (if (and (symbol-value 'minibuffer-electric-file-name-behavior)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4272 (tramp-tramp-file-p (buffer-substring)))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4273 ;; We don't need to handle `last-input-event', because
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4274 ;; due to the key map we know it must be ?/ or ?~.
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4275 (let ((s (concat (buffer-substring (point-min) (point))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4276 (string last-command-char))))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4277 (delete-region (point-min) (point))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4278 (insert (substitute-in-file-name s))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4279 (setq ad-return-value last-command-char))
105952
c3e434f0d02f * net/tramp.el (tramp-advice-minibuffer-electric-separator)
Michael Albinus <michael.albinus@gmx.de>
parents: 105907
diff changeset
4280 ad-do-it)))
c3e434f0d02f * net/tramp.el (tramp-advice-minibuffer-electric-separator)
Michael Albinus <michael.albinus@gmx.de>
parents: 105907
diff changeset
4281 (eval
c3e434f0d02f * net/tramp.el (tramp-advice-minibuffer-electric-separator)
Michael Albinus <michael.albinus@gmx.de>
parents: 105907
diff changeset
4282 `(add-hook
c3e434f0d02f * net/tramp.el (tramp-advice-minibuffer-electric-separator)
Michael Albinus <michael.albinus@gmx.de>
parents: 105907
diff changeset
4283 'tramp-unload-hook
c3e434f0d02f * net/tramp.el (tramp-advice-minibuffer-electric-separator)
Michael Albinus <michael.albinus@gmx.de>
parents: 105907
diff changeset
4284 (lambda ()
c3e434f0d02f * net/tramp.el (tramp-advice-minibuffer-electric-separator)
Michael Albinus <michael.albinus@gmx.de>
parents: 105907
diff changeset
4285 (ad-remove-advice ',x 'around ',(intern (format "tramp-advice-%s" x)))
c3e434f0d02f * net/tramp.el (tramp-advice-minibuffer-electric-separator)
Michael Albinus <michael.albinus@gmx.de>
parents: 105907
diff changeset
4286 (ad-activate ',x)))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4287
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4288 '(minibuffer-electric-separator
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4289 minibuffer-electric-tilde)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4290
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4291
87648
7ae99e295dfd * vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents: 87368
diff changeset
4292 ;;; Remote commands:
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4293
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4294 (defun tramp-handle-executable-find (command)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4295 "Like `executable-find' for Tramp files."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4296 (with-parsed-tramp-file-name default-directory nil
82603
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
4297 (tramp-find-executable v command (tramp-get-remote-path v) t)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4298
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4299 ;; We use BUFFER also as connection buffer during setup. Because of
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4300 ;; this, its original contents must be saved, and restored once
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4301 ;; connection has been setup.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4302 (defun tramp-handle-start-file-process (name buffer program &rest args)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4303 "Like `start-file-process' for Tramp files."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4304 (with-parsed-tramp-file-name default-directory nil
105482
cf961ce7712b (tramp-handle-start-file-process): Move tramp-error call
Glenn Morris <rgm@gnu.org>
parents: 105462
diff changeset
4305 (unless (stringp program)
cf961ce7712b (tramp-handle-start-file-process): Move tramp-error call
Glenn Morris <rgm@gnu.org>
parents: 105462
diff changeset
4306 (tramp-error
cf961ce7712b (tramp-handle-start-file-process): Move tramp-error call
Glenn Morris <rgm@gnu.org>
parents: 105462
diff changeset
4307 v 'file-error "pty association is not supported for `%s'" name))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4308 (unwind-protect
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
4309 (let ((command (format "cd %s; exec %s"
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
4310 (tramp-shell-quote-argument localname)
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
4311 (mapconcat 'tramp-shell-quote-argument
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
4312 (cons program args) " ")))
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
4313 (name1 name)
96990
c9371b294083 * net/tramp.el (tramp-handle-start-file-process): Make NAME a unique
Michael Albinus <michael.albinus@gmx.de>
parents: 96941
diff changeset
4314 (i 0))
96941
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
4315 (unless buffer
97035
837d18731242 * net/tramp.el (tramp-handle-start-file-process): Set
Michael Albinus <michael.albinus@gmx.de>
parents: 96990
diff changeset
4316 ;; BUFFER can be nil. We use a temporary buffer.
96941
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
4317 (setq buffer (generate-new-buffer tramp-temp-buffer-name)))
96990
c9371b294083 * net/tramp.el (tramp-handle-start-file-process): Make NAME a unique
Michael Albinus <michael.albinus@gmx.de>
parents: 96941
diff changeset
4318 (while (get-process name1)
c9371b294083 * net/tramp.el (tramp-handle-start-file-process): Make NAME a unique
Michael Albinus <michael.albinus@gmx.de>
parents: 96941
diff changeset
4319 ;; NAME must be unique as process name.
c9371b294083 * net/tramp.el (tramp-handle-start-file-process): Make NAME a unique
Michael Albinus <michael.albinus@gmx.de>
parents: 96941
diff changeset
4320 (setq i (1+ i)
c9371b294083 * net/tramp.el (tramp-handle-start-file-process): Make NAME a unique
Michael Albinus <michael.albinus@gmx.de>
parents: 96941
diff changeset
4321 name1 (format "%s<%d>" name i)))
c9371b294083 * net/tramp.el (tramp-handle-start-file-process): Make NAME a unique
Michael Albinus <michael.albinus@gmx.de>
parents: 96941
diff changeset
4322 (setq name name1)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4323 ;; Set the new process properties.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4324 (tramp-set-connection-property v "process-name" name)
96941
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
4325 (tramp-set-connection-property v "process-buffer" buffer)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4326 ;; Activate narrowing in order to save BUFFER contents.
95963
a20bb74ebe03 * net/tramp.el (tramp-handle-start-file-process): Clear
Michael Albinus <michael.albinus@gmx.de>
parents: 95659
diff changeset
4327 ;; Clear also the modification time; otherwise we might be
a20bb74ebe03 * net/tramp.el (tramp-handle-start-file-process): Clear
Michael Albinus <michael.albinus@gmx.de>
parents: 95659
diff changeset
4328 ;; interrupted by `verify-visited-file-modtime'.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4329 (with-current-buffer (tramp-get-connection-buffer v)
95963
a20bb74ebe03 * net/tramp.el (tramp-handle-start-file-process): Clear
Michael Albinus <michael.albinus@gmx.de>
parents: 95659
diff changeset
4330 (clear-visited-file-modtime)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4331 (narrow-to-region (point-max) (point-max)))
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
4332 ;; Send the command. `tramp-send-command' opens a new
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4333 ;; connection.
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
4334 (tramp-send-command v command nil t) ; nooutput
97035
837d18731242 * net/tramp.el (tramp-handle-start-file-process): Set
Michael Albinus <michael.albinus@gmx.de>
parents: 96990
diff changeset
4335 ;; Set query flag for this process.
837d18731242 * net/tramp.el (tramp-handle-start-file-process): Set
Michael Albinus <michael.albinus@gmx.de>
parents: 96990
diff changeset
4336 (tramp-set-process-query-on-exit-flag
837d18731242 * net/tramp.el (tramp-handle-start-file-process): Set
Michael Albinus <michael.albinus@gmx.de>
parents: 96990
diff changeset
4337 (tramp-get-connection-process v) t)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4338 ;; Return process.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4339 (tramp-get-connection-process v))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4340 ;; Save exit.
81938
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
4341 (with-current-buffer (tramp-get-connection-buffer v)
97035
837d18731242 * net/tramp.el (tramp-handle-start-file-process): Set
Michael Albinus <michael.albinus@gmx.de>
parents: 96990
diff changeset
4342 (if (string-match tramp-temp-buffer-name (buffer-name))
837d18731242 * net/tramp.el (tramp-handle-start-file-process): Set
Michael Albinus <michael.albinus@gmx.de>
parents: 96990
diff changeset
4343 (progn
837d18731242 * net/tramp.el (tramp-handle-start-file-process): Set
Michael Albinus <michael.albinus@gmx.de>
parents: 96990
diff changeset
4344 (set-process-buffer (tramp-get-connection-process v) nil)
837d18731242 * net/tramp.el (tramp-handle-start-file-process): Set
Michael Albinus <michael.albinus@gmx.de>
parents: 96990
diff changeset
4345 (kill-buffer (current-buffer)))
837d18731242 * net/tramp.el (tramp-handle-start-file-process): Set
Michael Albinus <michael.albinus@gmx.de>
parents: 96990
diff changeset
4346 (widen)
837d18731242 * net/tramp.el (tramp-handle-start-file-process): Set
Michael Albinus <michael.albinus@gmx.de>
parents: 96990
diff changeset
4347 (goto-char (point-max))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4348 (tramp-set-connection-property v "process-name" nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4349 (tramp-set-connection-property v "process-buffer" nil))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4350
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4351 (defun tramp-handle-process-file
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4352 (program &optional infile destination display &rest args)
57653
b324ca4df07c * simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57559
diff changeset
4353 "Like `process-file' for Tramp files."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4354 ;; The implementation is not complete yet.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4355 (when (and (numberp destination) (zerop destination))
57653
b324ca4df07c * simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57559
diff changeset
4356 (error "Implementation does not handle immediate return"))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4357
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4358 (with-parsed-tramp-file-name default-directory nil
85067
4636000015c5 * net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
4359 (let (command input tmpinput stderr tmpstderr outbuf ret)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4360 ;; Compute command.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4361 (setq command (mapconcat 'tramp-shell-quote-argument
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4362 (cons program args) " "))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4363 ;; Determine input.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4364 (if (null infile)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4365 (setq input "/dev/null")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4366 (setq infile (expand-file-name infile))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4367 (if (tramp-equal-remote default-directory infile)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4368 ;; INFILE is on the same remote host.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4369 (setq input (with-parsed-tramp-file-name infile nil localname))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4370 ;; INFILE must be copied to remote host.
85067
4636000015c5 * net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
4371 (setq input (tramp-make-tramp-temp-file v)
4636000015c5 * net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
4372 tmpinput (tramp-make-tramp-file-name method user host input))
4636000015c5 * net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
4373 (copy-file infile tmpinput t)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4374 (when input (setq command (format "%s <%s" command input)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4375
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4376 ;; Determine output.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4377 (cond
103934
33e088977519 * net/tramp.el (tramp-wait-for-output): Handle the case when
Michael Albinus <michael.albinus@gmx.de>
parents: 103782
diff changeset
4378 ;; Just a buffer.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4379 ((bufferp destination)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4380 (setq outbuf destination))
103934
33e088977519 * net/tramp.el (tramp-wait-for-output): Handle the case when
Michael Albinus <michael.albinus@gmx.de>
parents: 103782
diff changeset
4381 ;; A buffer name.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4382 ((stringp destination)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4383 (setq outbuf (get-buffer-create destination)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4384 ;; (REAL-DESTINATION ERROR-DESTINATION)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4385 ((consp destination)
103934
33e088977519 * net/tramp.el (tramp-wait-for-output): Handle the case when
Michael Albinus <michael.albinus@gmx.de>
parents: 103782
diff changeset
4386 ;; output.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4387 (cond
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4388 ((bufferp (car destination))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4389 (setq outbuf (car destination)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4390 ((stringp (car destination))
87648
7ae99e295dfd * vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents: 87368
diff changeset
4391 (setq outbuf (get-buffer-create (car destination))))
7ae99e295dfd * vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents: 87368
diff changeset
4392 ((car destination)
7ae99e295dfd * vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents: 87368
diff changeset
4393 (setq outbuf (current-buffer))))
103934
33e088977519 * net/tramp.el (tramp-wait-for-output): Handle the case when
Michael Albinus <michael.albinus@gmx.de>
parents: 103782
diff changeset
4394 ;; stderr.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4395 (cond
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4396 ((stringp (cadr destination))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4397 (setcar (cdr destination) (expand-file-name (cadr destination)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4398 (if (tramp-equal-remote default-directory (cadr destination))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4399 ;; stderr is on the same remote host.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4400 (setq stderr (with-parsed-tramp-file-name
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4401 (cadr destination) nil localname))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4402 ;; stderr must be copied to remote host. The temporary
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4403 ;; file must be deleted after execution.
85067
4636000015c5 * net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
4404 (setq stderr (tramp-make-tramp-temp-file v)
4636000015c5 * net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
4405 tmpstderr (tramp-make-tramp-file-name
4636000015c5 * net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
4406 method user host stderr))))
103934
33e088977519 * net/tramp.el (tramp-wait-for-output): Handle the case when
Michael Albinus <michael.albinus@gmx.de>
parents: 103782
diff changeset
4407 ;; stderr to be discarded.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4408 ((null (cadr destination))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4409 (setq stderr "/dev/null"))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4410 ;; 't
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4411 (destination
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4412 (setq outbuf (current-buffer))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4413 (when stderr (setq command (format "%s 2>%s" command stderr)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4414
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4415 ;; Send the command. It might not return in time, so we protect it.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4416 (condition-case nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4417 (unwind-protect
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
4418 (setq ret
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
4419 (tramp-send-command-and-check
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
4420 v (format "\\cd %s; %s"
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
4421 (tramp-shell-quote-argument localname)
106204
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
4422 command)
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
4423 nil t))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4424 ;; We should show the output anyway.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4425 (when outbuf
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
4426 (with-current-buffer outbuf
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
4427 (insert
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
4428 (with-current-buffer (tramp-get-connection-buffer v)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
4429 (buffer-string))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4430 (when display (display-buffer outbuf))))
102968
3f05108a52f1 * net/tramp.el (tramp-handle-dired-recursive-delete-directory):
Michael Albinus <michael.albinus@gmx.de>
parents: 102940
diff changeset
4431 ;; When the user did interrupt, we should do it also. We use
3f05108a52f1 * net/tramp.el (tramp-handle-dired-recursive-delete-directory):
Michael Albinus <michael.albinus@gmx.de>
parents: 102940
diff changeset
4432 ;; return code -1 as marker.
3f05108a52f1 * net/tramp.el (tramp-handle-dired-recursive-delete-directory):
Michael Albinus <michael.albinus@gmx.de>
parents: 102940
diff changeset
4433 (quit
3f05108a52f1 * net/tramp.el (tramp-handle-dired-recursive-delete-directory):
Michael Albinus <michael.albinus@gmx.de>
parents: 102940
diff changeset
4434 (kill-buffer (tramp-get-connection-buffer v))
3f05108a52f1 * net/tramp.el (tramp-handle-dired-recursive-delete-directory):
Michael Albinus <michael.albinus@gmx.de>
parents: 102940
diff changeset
4435 (setq ret -1))
3f05108a52f1 * net/tramp.el (tramp-handle-dired-recursive-delete-directory):
Michael Albinus <michael.albinus@gmx.de>
parents: 102940
diff changeset
4436 ;; Handle errors.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4437 (error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4438 (kill-buffer (tramp-get-connection-buffer v))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4439 (setq ret 1)))
85067
4636000015c5 * net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
4440
4636000015c5 * net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
4441 ;; Provide error file.
4636000015c5 * net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
4442 (when tmpstderr (rename-file tmpstderr (cadr destination) t))
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
4443
102968
3f05108a52f1 * net/tramp.el (tramp-handle-dired-recursive-delete-directory):
Michael Albinus <michael.albinus@gmx.de>
parents: 102940
diff changeset
4444 ;; Cleanup. We remove all file cache values for the connection,
3f05108a52f1 * net/tramp.el (tramp-handle-dired-recursive-delete-directory):
Michael Albinus <michael.albinus@gmx.de>
parents: 102940
diff changeset
4445 ;; because the remote process could have changed them.
85067
4636000015c5 * net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
4446 (when tmpinput (delete-file tmpinput))
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
4447
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
4448 ;; `process-file-side-effects' has been introduced with GNU
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
4449 ;; Emacs 23.2. If set to `nil', no remote file will be changed
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
4450 ;; by `program'. If it doesn't exist, we assume its default
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
4451 ;; value 't'.
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
4452 (unless (and (boundp 'process-file-side-effects)
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
4453 (not (symbol-value 'process-file-side-effects)))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
4454 (tramp-flush-directory-property v ""))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
4455
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4456 ;; Return exit status.
102968
3f05108a52f1 * net/tramp.el (tramp-handle-dired-recursive-delete-directory):
Michael Albinus <michael.albinus@gmx.de>
parents: 102940
diff changeset
4457 (if (equal ret -1)
3f05108a52f1 * net/tramp.el (tramp-handle-dired-recursive-delete-directory):
Michael Albinus <michael.albinus@gmx.de>
parents: 102940
diff changeset
4458 (keyboard-quit)
3f05108a52f1 * net/tramp.el (tramp-handle-dired-recursive-delete-directory):
Michael Albinus <michael.albinus@gmx.de>
parents: 102940
diff changeset
4459 ret))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4460
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
4461 (defun tramp-local-call-process
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
4462 (program &optional infile destination display &rest args)
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
4463 "Calls `call-process' on the local host.
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
4464 This is needed because for some Emacs flavors Tramp has
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
4465 defadviced `call-process' to behave like `process-file'. The
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
4466 Lisp error raised when PROGRAM is nil is trapped also, returning 1."
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
4467 (let ((default-directory
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
4468 (if (file-remote-p default-directory)
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
4469 (tramp-compat-temporary-file-directory)
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
4470 default-directory)))
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
4471 (if (executable-find program)
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
4472 (apply 'call-process program infile destination display args)
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
4473 1)))
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
4474
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4475 (defun tramp-handle-call-process-region
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4476 (start end program &optional delete buffer display &rest args)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4477 "Like `call-process-region' for Tramp files."
85041
a42b8750a992 * net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 85024
diff changeset
4478 (let ((tmpfile (tramp-compat-make-temp-file "")))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4479 (write-region start end tmpfile)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4480 (when delete (delete-region start end))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4481 (unwind-protect
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4482 (apply 'call-process program tmpfile buffer display args)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4483 (delete-file tmpfile))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4484
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4485 (defun tramp-handle-shell-command
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4486 (command &optional output-buffer error-buffer)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4487 "Like `shell-command' for Tramp files."
81938
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
4488 (let* ((asynchronous (string-match "[ \t]*&[ \t]*\\'" command))
88051
a67ed67d274a * net/tramp.el (tramp-handle-shell-command): Use "/bin/sh -c" for
Michael Albinus <michael.albinus@gmx.de>
parents: 88028
diff changeset
4489 ;; We cannot use `shell-file-name' and `shell-command-switch',
a67ed67d274a * net/tramp.el (tramp-handle-shell-command): Use "/bin/sh -c" for
Michael Albinus <michael.albinus@gmx.de>
parents: 88028
diff changeset
4490 ;; they are variables of the local host.
a67ed67d274a * net/tramp.el (tramp-handle-shell-command): Use "/bin/sh -c" for
Michael Albinus <michael.albinus@gmx.de>
parents: 88028
diff changeset
4491 (args (list "/bin/sh" "-c" (substring command 0 asynchronous)))
97444
85c2adddd765 (tramp-handle-shell-command): Correctly handle
Andreas Schwab <schwab@suse.de>
parents: 97052
diff changeset
4492 current-buffer-p
81938
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
4493 (output-buffer
82324
5399c02bfd07 * net/tramp.el (tramp-wrong-passwd-regexp): Make the regexp more
Michael Albinus <michael.albinus@gmx.de>
parents: 82201
diff changeset
4494 (cond
5399c02bfd07 * net/tramp.el (tramp-wrong-passwd-regexp): Make the regexp more
Michael Albinus <michael.albinus@gmx.de>
parents: 82201
diff changeset
4495 ((bufferp output-buffer) output-buffer)
5399c02bfd07 * net/tramp.el (tramp-wrong-passwd-regexp): Make the regexp more
Michael Albinus <michael.albinus@gmx.de>
parents: 82201
diff changeset
4496 ((stringp output-buffer) (get-buffer-create output-buffer))
97444
85c2adddd765 (tramp-handle-shell-command): Correctly handle
Andreas Schwab <schwab@suse.de>
parents: 97052
diff changeset
4497 (output-buffer
85c2adddd765 (tramp-handle-shell-command): Correctly handle
Andreas Schwab <schwab@suse.de>
parents: 97052
diff changeset
4498 (setq current-buffer-p t)
85c2adddd765 (tramp-handle-shell-command): Correctly handle
Andreas Schwab <schwab@suse.de>
parents: 97052
diff changeset
4499 (current-buffer))
88072
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
4500 (t (get-buffer-create
82324
5399c02bfd07 * net/tramp.el (tramp-wrong-passwd-regexp): Make the regexp more
Michael Albinus <michael.albinus@gmx.de>
parents: 82201
diff changeset
4501 (if asynchronous
5399c02bfd07 * net/tramp.el (tramp-wrong-passwd-regexp): Make the regexp more
Michael Albinus <michael.albinus@gmx.de>
parents: 82201
diff changeset
4502 "*Async Shell Command*"
5399c02bfd07 * net/tramp.el (tramp-wrong-passwd-regexp): Make the regexp more
Michael Albinus <michael.albinus@gmx.de>
parents: 82201
diff changeset
4503 "*Shell Command Output*")))))
5399c02bfd07 * net/tramp.el (tramp-wrong-passwd-regexp): Make the regexp more
Michael Albinus <michael.albinus@gmx.de>
parents: 82201
diff changeset
4504 (error-buffer
5399c02bfd07 * net/tramp.el (tramp-wrong-passwd-regexp): Make the regexp more
Michael Albinus <michael.albinus@gmx.de>
parents: 82201
diff changeset
4505 (cond
5399c02bfd07 * net/tramp.el (tramp-wrong-passwd-regexp): Make the regexp more
Michael Albinus <michael.albinus@gmx.de>
parents: 82201
diff changeset
4506 ((bufferp error-buffer) error-buffer)
5399c02bfd07 * net/tramp.el (tramp-wrong-passwd-regexp): Make the regexp more
Michael Albinus <michael.albinus@gmx.de>
parents: 82201
diff changeset
4507 ((stringp error-buffer) (get-buffer-create error-buffer))))
81938
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
4508 (buffer
82324
5399c02bfd07 * net/tramp.el (tramp-wrong-passwd-regexp): Make the regexp more
Michael Albinus <michael.albinus@gmx.de>
parents: 82201
diff changeset
4509 (if (and (not asynchronous) error-buffer)
81938
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
4510 (with-parsed-tramp-file-name default-directory nil
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
4511 (list output-buffer (tramp-make-tramp-temp-file v)))
88072
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
4512 output-buffer))
91486
76c777ce052a * net/tramp.el (tramp-process-sentinel): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 88072
diff changeset
4513 (p (get-buffer-process output-buffer)))
88072
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
4514
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
4515 ;; Check whether there is another process running. Tramp does not
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
4516 ;; support 2 (asynchronous) processes in parallel.
91486
76c777ce052a * net/tramp.el (tramp-process-sentinel): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 88072
diff changeset
4517 (when p
88072
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
4518 (if (yes-or-no-p "A command is running. Kill it? ")
93062
079f34f8306f (tramp-drop-volume-letter): Evaluate when compiling.
Glenn Morris <rgm@gnu.org>
parents: 93047
diff changeset
4519 (condition-case nil
079f34f8306f (tramp-drop-volume-letter): Evaluate when compiling.
Glenn Morris <rgm@gnu.org>
parents: 93047
diff changeset
4520 (kill-process p)
079f34f8306f (tramp-drop-volume-letter): Evaluate when compiling.
Glenn Morris <rgm@gnu.org>
parents: 93047
diff changeset
4521 (error nil))
88072
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
4522 (error "Shell command in progress")))
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
4523
97445
8f3b361fa8c1 (tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents: 97444
diff changeset
4524 (if current-buffer-p
8f3b361fa8c1 (tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents: 97444
diff changeset
4525 (progn
8f3b361fa8c1 (tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents: 97444
diff changeset
4526 (barf-if-buffer-read-only)
8f3b361fa8c1 (tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents: 97444
diff changeset
4527 (push-mark nil t))
97444
85c2adddd765 (tramp-handle-shell-command): Correctly handle
Andreas Schwab <schwab@suse.de>
parents: 97052
diff changeset
4528 (with-current-buffer output-buffer
85c2adddd765 (tramp-handle-shell-command): Correctly handle
Andreas Schwab <schwab@suse.de>
parents: 97052
diff changeset
4529 (setq buffer-read-only nil)
85c2adddd765 (tramp-handle-shell-command): Correctly handle
Andreas Schwab <schwab@suse.de>
parents: 97052
diff changeset
4530 (erase-buffer)))
85c2adddd765 (tramp-handle-shell-command): Correctly handle
Andreas Schwab <schwab@suse.de>
parents: 97052
diff changeset
4531
85c2adddd765 (tramp-handle-shell-command): Correctly handle
Andreas Schwab <schwab@suse.de>
parents: 97052
diff changeset
4532 (if (and (not current-buffer-p) (integerp asynchronous))
88072
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
4533 (prog1
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
4534 ;; Run the process.
85841
0c0a9419b0c4 * net/tramp.el (tramp-handle-shell-command): Call `start-file-process'
Michael Albinus <michael.albinus@gmx.de>
parents: 85802
diff changeset
4535 (apply 'start-file-process "*Async Shell*" buffer args)
88072
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
4536 ;; Display output.
91486
76c777ce052a * net/tramp.el (tramp-process-sentinel): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 88072
diff changeset
4537 (pop-to-buffer output-buffer)
76c777ce052a * net/tramp.el (tramp-process-sentinel): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 88072
diff changeset
4538 (setq mode-line-process '(":%s"))
76c777ce052a * net/tramp.el (tramp-process-sentinel): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 88072
diff changeset
4539 (require 'shell) (shell-mode))
88072
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
4540
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
4541 (prog1
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
4542 ;; Run the process.
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
4543 (apply 'process-file (car args) nil buffer nil (cdr args))
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
4544 ;; Insert error messages if they were separated.
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
4545 (when (listp buffer)
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
4546 (with-current-buffer error-buffer
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
4547 (insert-file-contents (cadr buffer)))
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
4548 (delete-file (cadr buffer)))
97445
8f3b361fa8c1 (tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents: 97444
diff changeset
4549 (if current-buffer-p
8f3b361fa8c1 (tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents: 97444
diff changeset
4550 ;; This is like exchange-point-and-mark, but doesn't
8f3b361fa8c1 (tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents: 97444
diff changeset
4551 ;; activate the mark. It is cleaner to avoid activation,
8f3b361fa8c1 (tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents: 97444
diff changeset
4552 ;; even though the command loop would deactivate the mark
8f3b361fa8c1 (tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents: 97444
diff changeset
4553 ;; because we inserted text.
8f3b361fa8c1 (tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents: 97444
diff changeset
4554 (goto-char (prog1 (mark t)
8f3b361fa8c1 (tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents: 97444
diff changeset
4555 (set-marker (mark-marker) (point)
8f3b361fa8c1 (tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents: 97444
diff changeset
4556 (current-buffer))))
8f3b361fa8c1 (tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents: 97444
diff changeset
4557 ;; There's some output, display it.
8f3b361fa8c1 (tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents: 97444
diff changeset
4558 (when (with-current-buffer output-buffer (> (point-max) (point-min)))
8f3b361fa8c1 (tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents: 97444
diff changeset
4559 (if (functionp 'display-message-or-buffer)
8f3b361fa8c1 (tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents: 97444
diff changeset
4560 (funcall (symbol-function 'display-message-or-buffer)
8f3b361fa8c1 (tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents: 97444
diff changeset
4561 output-buffer)
8f3b361fa8c1 (tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents: 97444
diff changeset
4562 (pop-to-buffer output-buffer))))))))
57653
b324ca4df07c * simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57559
diff changeset
4563
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4564 ;; File Editing.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4565
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4566 (defvar tramp-handle-file-local-copy-hook nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4567 "Normal hook to be run at the end of `tramp-handle-file-local-copy'.")
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4568
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4569 (defun tramp-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
4570 "Like `file-local-copy' for Tramp files."
82808
6e5814967ffb * net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 82603
diff changeset
4571
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
4572 (with-parsed-tramp-file-name filename nil
100930
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4573 (unless (file-exists-p filename)
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4574 (tramp-error
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4575 v 'file-error
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4576 "Cannot make local copy of non-existing file `%s'" filename))
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4577
82808
6e5814967ffb * net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 82603
diff changeset
4578 (let ((rem-enc (tramp-get-remote-coding v "remote-encoding"))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4579 (loc-dec (tramp-get-local-coding v "local-decoding"))
85041
a42b8750a992 * net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 85024
diff changeset
4580 (tmpfile (tramp-compat-make-temp-file filename)))
100930
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4581
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4582 (condition-case err
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4583 (cond
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4584 ;; `copy-file' handles direct copy and out-of-band methods.
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4585 ((or (tramp-local-host-p v)
104807
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
4586 (tramp-method-out-of-band-p
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
4587 v (nth 7 (file-attributes filename))))
100930
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4588 (copy-file filename tmpfile t t))
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4589
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4590 ;; Use inline encoding for file transfer.
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4591 (rem-enc
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4592 (save-excursion
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4593 (tramp-message v 5 "Encoding remote file %s..." filename)
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4594 (tramp-barf-unless-okay
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4595 v
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4596 (format "%s < %s" rem-enc (tramp-shell-quote-argument localname))
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4597 "Encoding remote file failed")
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4598 (tramp-message v 5 "Encoding remote file %s...done" filename)
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4599
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4600 (if (and (symbolp loc-dec) (fboundp loc-dec))
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4601 ;; If local decoding is a function, we call it. We
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4602 ;; must disable multibyte, because
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4603 ;; `uudecode-decode-region' doesn't handle it
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4604 ;; correctly.
82808
6e5814967ffb * net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 82603
diff changeset
4605 (with-temp-buffer
6e5814967ffb * net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 82603
diff changeset
4606 (set-buffer-multibyte nil)
6e5814967ffb * net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 82603
diff changeset
4607 (insert-buffer-substring (tramp-get-buffer v))
6e5814967ffb * net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 82603
diff changeset
4608 (tramp-message
6e5814967ffb * net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 82603
diff changeset
4609 v 5 "Decoding remote file %s with function %s..."
6e5814967ffb * net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 82603
diff changeset
4610 filename loc-dec)
6e5814967ffb * net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 82603
diff changeset
4611 (funcall loc-dec (point-min) (point-max))
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4612 ;; Unset `file-name-handler-alist'. Otherwise,
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4613 ;; epa-file gets confused.
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4614 (let (file-name-handler-alist
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4615 (coding-system-for-write 'binary))
100930
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4616 (write-region (point-min) (point-max) tmpfile)))
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4617
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4618 ;; If tramp-decoding-function is not defined for this
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4619 ;; method, we invoke tramp-decoding-command instead.
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4620 (let ((tmpfile2 (tramp-compat-make-temp-file filename)))
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4621 ;; Unset `file-name-handler-alist'. Otherwise,
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4622 ;; epa-file gets confused.
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4623 (let (file-name-handler-alist
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4624 (coding-system-for-write 'binary))
100930
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4625 (write-region (point-min) (point-max) tmpfile2))
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4626 (tramp-message
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4627 v 5 "Decoding remote file %s with command %s..."
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4628 filename loc-dec)
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4629 (unwind-protect
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4630 (tramp-call-local-coding-command loc-dec tmpfile2 tmpfile)
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4631 (delete-file tmpfile2))))
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4632
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4633 (tramp-message v 5 "Decoding remote file %s...done" filename)
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4634 ;; Set proper permissions.
102851
5cc9a4c776e8 * net/tramp.el (tramp-default-file-modes) New defun. Replace all
Michael Albinus <michael.albinus@gmx.de>
parents: 102287
diff changeset
4635 (set-file-modes tmpfile (tramp-default-file-modes filename))
100930
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4636 ;; Set local user ownership.
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4637 (tramp-set-file-uid-gid tmpfile)))
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4638
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4639 ;; Oops, I don't know what to do.
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4640 (t (tramp-error
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4641 v 'file-error "Wrong method specification for `%s'" method)))
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4642
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4643 ;; Error handling.
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4644 ((error quit)
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4645 (delete-file tmpfile)
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4646 (signal (car err) (cdr err))))
82808
6e5814967ffb * net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 82603
diff changeset
4647
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4648 (run-hooks 'tramp-handle-file-local-copy-hook)
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4649 tmpfile)))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4650
78460
45e0e9795cdb * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 78411
diff changeset
4651 (defun tramp-handle-file-remote-p (filename &optional identification connected)
45e0e9795cdb * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 78411
diff changeset
4652 "Like `file-remote-p' for Tramp files."
56261
d863bc830907 (tramp-handle-file-remote-p): New implementation to
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 55864
diff changeset
4653 (when (tramp-tramp-file-p filename)
106613
291ea018e478 * files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents: 106597
diff changeset
4654 (let* ((v (tramp-dissect-file-name filename))
291ea018e478 * files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents: 106597
diff changeset
4655 (p (tramp-get-connection-process v))
291ea018e478 * files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents: 106597
diff changeset
4656 (c (and p (processp p) (memq (process-status p) '(run open)))))
291ea018e478 * files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents: 106597
diff changeset
4657 ;; We expand the file name only, if there is already a connection.
291ea018e478 * files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents: 106597
diff changeset
4658 (with-parsed-tramp-file-name
291ea018e478 * files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents: 106597
diff changeset
4659 (if c (expand-file-name filename) filename) nil
291ea018e478 * files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents: 106597
diff changeset
4660 (and (or (not connected) c)
291ea018e478 * files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents: 106597
diff changeset
4661 (cond
291ea018e478 * files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents: 106597
diff changeset
4662 ((eq identification 'method) method)
291ea018e478 * files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents: 106597
diff changeset
4663 ((eq identification 'user) user)
291ea018e478 * files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents: 106597
diff changeset
4664 ((eq identification 'host) host)
291ea018e478 * files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents: 106597
diff changeset
4665 ((eq identification 'localname) localname)
291ea018e478 * files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents: 106597
diff changeset
4666 (t (tramp-make-tramp-file-name method user host ""))))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4667
93938
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4668 (defun tramp-find-file-name-coding-system-alist (filename tmpname)
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4669 "Like `find-operation-coding-system' for Tramp filenames.
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4670 Tramp's `insert-file-contents' and `write-region' work over
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4671 temporary file names. If `file-coding-system-alist' contains an
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4672 expression, which matches more than the file name suffix, the
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4673 coding system might not be determined. This function repairs it."
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4674 (let (result)
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4675 (dolist (elt file-coding-system-alist result)
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4676 (when (and (consp elt) (string-match (car elt) filename))
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4677 ;; We found a matching entry in `file-coding-system-alist'.
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4678 ;; So we add a similar entry, but with the temporary file name
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4679 ;; as regexp.
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4680 (add-to-list
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4681 'result (cons (regexp-quote tmpname) (cdr elt)) 'append)))))
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4682
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4683 (defun tramp-handle-insert-file-contents
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4684 (filename &optional visit beg end replace)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4685 "Like `insert-file-contents' for Tramp files."
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4686 (barf-if-buffer-read-only)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4687 (setq filename (expand-file-name filename))
104125
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4688 (let (coding-system-used result local-copy remote-copy)
104143
49b412e99f1e * net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents: 104137
diff changeset
4689 (with-parsed-tramp-file-name filename nil
49b412e99f1e * net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents: 104137
diff changeset
4690 (unwind-protect
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4691 (if (not (file-exists-p filename))
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4692 ;; We don't raise a Tramp error, because it might be
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4693 ;; suppressed, like in `find-file-noselect-1'.
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4694 (signal 'file-error
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4695 (list "File not found on remote host" filename))
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4696
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4697 (if (and (tramp-local-host-p v)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4698 (let (file-name-handler-alist)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4699 (file-readable-p localname)))
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4700 ;; Short track: if we are on the local host, we can
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4701 ;; run directly.
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4702 (setq result
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4703 (tramp-run-real-handler
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4704 'insert-file-contents
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4705 (list localname visit beg end replace)))
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4706
104125
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4707 ;; When we shall insert only a part of the file, we copy
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4708 ;; this part.
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4709 (when (or beg end)
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4710 (setq remote-copy (tramp-make-tramp-temp-file v))
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4711 (tramp-send-command
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4712 v
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4713 (cond
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4714 ((and beg end)
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4715 (format "tail -c +%d %s | head -c +%d >%s"
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4716 (1+ beg) (tramp-shell-quote-argument localname)
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4717 (- end beg) remote-copy))
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4718 (beg
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4719 (format "tail -c +%d %s >%s"
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4720 (1+ beg) (tramp-shell-quote-argument localname)
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4721 remote-copy))
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4722 (end
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4723 (format "head -c +%d %s >%s"
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4724 (1+ end) (tramp-shell-quote-argument localname)
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4725 remote-copy)))))
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4726
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4727 ;; `insert-file-contents-literally' takes care to avoid
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4728 ;; calling jka-compr. By let-binding
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4729 ;; `inhibit-file-name-operation', we propagate that care
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4730 ;; to the `file-local-copy' operation.
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4731 (setq local-copy
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4732 (let ((inhibit-file-name-operation
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4733 (when (eq inhibit-file-name-operation
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4734 'insert-file-contents)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4735 'file-local-copy)))
105718
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4736 (cond
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4737 ((stringp remote-copy)
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4738 (file-local-copy
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4739 (tramp-make-tramp-file-name
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4740 method user host remote-copy)))
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4741 ((stringp tramp-temp-buffer-file-name)
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4742 (copy-file filename tramp-temp-buffer-file-name 'ok)
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4743 tramp-temp-buffer-file-name)
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4744 (t (file-local-copy filename)))))
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4745
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4746 (when (and (null remote-copy)
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4747 (tramp-get-method-parameter
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4748 method 'tramp-copy-keep-tmpfile))
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4749 ;; We keep the local file for performance reasons,
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4750 ;; useful for "rsync".
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4751 (set-file-modes local-copy (tramp-octal-to-decimal "0600"))
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4752 (setq tramp-temp-buffer-file-name local-copy)
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4753 (put 'tramp-temp-buffer-file-name 'permanent-local t))
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4754
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4755 (tramp-message
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4756 v 4 "Inserting local temp file `%s'..." local-copy)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4757
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4758 ;; We must ensure that `file-coding-system-alist'
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4759 ;; matches `local-copy'.
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4760 (let ((file-coding-system-alist
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4761 (tramp-find-file-name-coding-system-alist
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4762 filename local-copy)))
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4763 (setq result
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4764 (insert-file-contents
104125
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
4765 local-copy nil nil nil replace))
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4766 ;; Now `last-coding-system-used' has right value.
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4767 ;; Remember it.
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4768 (when (boundp 'last-coding-system-used)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4769 (setq coding-system-used
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4770 (symbol-value 'last-coding-system-used))))
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4771
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4772 (tramp-message
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4773 v 4 "Inserting local temp file `%s'...done" local-copy)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4774 (when (boundp 'last-coding-system-used)
104143
49b412e99f1e * net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents: 104137
diff changeset
4775 (set 'last-coding-system-used coding-system-used))))
49b412e99f1e * net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents: 104137
diff changeset
4776
49b412e99f1e * net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents: 104137
diff changeset
4777 ;; Save exit.
49b412e99f1e * net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents: 104137
diff changeset
4778 (progn
49b412e99f1e * net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents: 104137
diff changeset
4779 (when visit
49b412e99f1e * net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents: 104137
diff changeset
4780 (setq buffer-file-name filename)
49b412e99f1e * net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents: 104137
diff changeset
4781 (setq buffer-read-only (not (file-writable-p filename)))
49b412e99f1e * net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents: 104137
diff changeset
4782 (set-visited-file-modtime)
49b412e99f1e * net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents: 104137
diff changeset
4783 (set-buffer-modified-p nil))
105718
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4784 (when (and (stringp local-copy)
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4785 (or remote-copy (null tramp-temp-buffer-file-name)))
104143
49b412e99f1e * net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents: 104137
diff changeset
4786 (delete-file local-copy))
49b412e99f1e * net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents: 104137
diff changeset
4787 (when (stringp remote-copy)
49b412e99f1e * net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents: 104137
diff changeset
4788 (delete-file
49b412e99f1e * net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents: 104137
diff changeset
4789 (tramp-make-tramp-file-name method user host remote-copy))))))
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4790
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4791 ;; Result.
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4792 (list (expand-file-name filename)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4793 (cadr result))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4794
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4795 ;; This is needed for XEmacs only. Code stolen from files.el.
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4796 (defun tramp-handle-insert-file-contents-literally
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4797 (filename &optional visit beg end replace)
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4798 "Like `insert-file-contents-literally' for Tramp files."
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4799 (let ((format-alist nil)
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4800 (after-insert-file-functions nil)
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4801 (coding-system-for-read 'no-conversion)
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4802 (coding-system-for-write 'no-conversion)
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4803 (find-buffer-file-type-function
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4804 (if (fboundp 'find-buffer-file-type)
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4805 (symbol-function 'find-buffer-file-type)
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4806 nil))
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4807 (inhibit-file-name-handlers '(jka-compr-handler image-file-handler))
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4808 (inhibit-file-name-operation 'insert-file-contents))
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4809 (unwind-protect
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4810 (progn
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4811 (fset 'find-buffer-file-type (lambda (filename) t))
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4812 (insert-file-contents filename visit beg end replace))
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
4813 ;; Save exit.
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4814 (if find-buffer-file-type-function
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4815 (fset 'find-buffer-file-type find-buffer-file-type-function)
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4816 (fmakunbound 'find-buffer-file-type)))))
55420
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
4817
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
4818 (defun tramp-handle-find-backup-file-name (filename)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4819 "Like `find-backup-file-name' for Tramp files."
56460
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
4820 (with-parsed-tramp-file-name filename nil
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
4821 ;; We set both variables. It doesn't matter whether it is
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
4822 ;; Emacs or XEmacs
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
4823 (let ((backup-directory-alist
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
4824 ;; Emacs case
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
4825 (when (boundp 'backup-directory-alist)
102851
5cc9a4c776e8 * net/tramp.el (tramp-default-file-modes) New defun. Replace all
Michael Albinus <michael.albinus@gmx.de>
parents: 102287
diff changeset
4826 (if (symbol-value 'tramp-backup-directory-alist)
56460
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
4827 (mapcar
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4828 (lambda (x)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4829 (cons
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4830 (car x)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4831 (if (and (stringp (cdr x))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4832 (file-name-absolute-p (cdr x))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4833 (not (tramp-file-name-p (cdr x))))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4834 (tramp-make-tramp-file-name method user host (cdr x))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4835 (cdr x))))
56460
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
4836 (symbol-value 'tramp-backup-directory-alist))
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
4837 (symbol-value 'backup-directory-alist))))
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
4838
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
4839 (bkup-backup-directory-info
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
4840 ;; XEmacs case
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
4841 (when (boundp 'bkup-backup-directory-info)
102851
5cc9a4c776e8 * net/tramp.el (tramp-default-file-modes) New defun. Replace all
Michael Albinus <michael.albinus@gmx.de>
parents: 102287
diff changeset
4842 (if (symbol-value 'tramp-bkup-backup-directory-info)
56460
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
4843 (mapcar
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4844 (lambda (x)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4845 (nconc
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4846 (list (car x))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4847 (list
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4848 (if (and (stringp (car (cdr x)))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4849 (file-name-absolute-p (car (cdr x)))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4850 (not (tramp-file-name-p (car (cdr x)))))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4851 (tramp-make-tramp-file-name
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4852 method user host (car (cdr x)))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4853 (car (cdr x))))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4854 (cdr (cdr x))))
56460
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
4855 (symbol-value 'tramp-bkup-backup-directory-info))
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
4856 (symbol-value 'bkup-backup-directory-info)))))
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
4857
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
4858 (tramp-run-real-handler 'find-backup-file-name (list filename)))))
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
4859
65248
0f994edbec5e Make `make-auto-save-file-name' a magic operation.
Michael Albinus <michael.albinus@gmx.de>
parents: 64772
diff changeset
4860 (defun tramp-handle-make-auto-save-file-name ()
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4861 "Like `make-auto-save-file-name' for Tramp files.
65248
0f994edbec5e Make `make-auto-save-file-name' a magic operation.
Michael Albinus <michael.albinus@gmx.de>
parents: 64772
diff changeset
4862 Returns a file name in `tramp-auto-save-directory' for autosaving this file."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4863 (let ((tramp-auto-save-directory tramp-auto-save-directory)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4864 (buffer-file-name
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4865 (tramp-subst-strs-in-string
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4866 '(("_" . "|")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4867 ("/" . "_a")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4868 (":" . "_b")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4869 ("|" . "__")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4870 ("[" . "_l")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4871 ("]" . "_r"))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4872 (buffer-file-name))))
72569
7457615d594a Sync with Tramp 2.0.54.
Michael Albinus <michael.albinus@gmx.de>
parents: 71561
diff changeset
4873 ;; File name must be unique. This is ensured with Emacs 22 (see
7457615d594a Sync with Tramp 2.0.54.
Michael Albinus <michael.albinus@gmx.de>
parents: 71561
diff changeset
4874 ;; UNIQUIFY element of `auto-save-file-name-transforms'); but for
7457615d594a Sync with Tramp 2.0.54.
Michael Albinus <michael.albinus@gmx.de>
parents: 71561
diff changeset
4875 ;; all other cases we must do it ourselves.
7457615d594a Sync with Tramp 2.0.54.
Michael Albinus <michael.albinus@gmx.de>
parents: 71561
diff changeset
4876 (when (boundp 'auto-save-file-name-transforms)
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
4877 (mapc
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4878 (lambda (x)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4879 (when (and (string-match (car x) buffer-file-name)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4880 (not (car (cddr x))))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4881 (setq tramp-auto-save-directory
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4882 (or tramp-auto-save-directory
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
4883 (tramp-compat-temporary-file-directory)))))
72569
7457615d594a Sync with Tramp 2.0.54.
Michael Albinus <michael.albinus@gmx.de>
parents: 71561
diff changeset
4884 (symbol-value 'auto-save-file-name-transforms)))
7457615d594a Sync with Tramp 2.0.54.
Michael Albinus <michael.albinus@gmx.de>
parents: 71561
diff changeset
4885 ;; Create directory.
7457615d594a Sync with Tramp 2.0.54.
Michael Albinus <michael.albinus@gmx.de>
parents: 71561
diff changeset
4886 (when tramp-auto-save-directory
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4887 (setq buffer-file-name
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4888 (expand-file-name buffer-file-name tramp-auto-save-directory))
72569
7457615d594a Sync with Tramp 2.0.54.
Michael Albinus <michael.albinus@gmx.de>
parents: 71561
diff changeset
4889 (unless (file-exists-p tramp-auto-save-directory)
7457615d594a Sync with Tramp 2.0.54.
Michael Albinus <michael.albinus@gmx.de>
parents: 71561
diff changeset
4890 (make-directory tramp-auto-save-directory t)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4891 ;; Run plain `make-auto-save-file-name'. There might be an advice when
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4892 ;; it is not a magic file name operation (since Emacs 22).
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4893 ;; We must deactivate it temporarily.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4894 (if (not (ad-is-active 'make-auto-save-file-name))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4895 (tramp-run-real-handler 'make-auto-save-file-name nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4896 ;; else
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4897 (ad-deactivate 'make-auto-save-file-name)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4898 (prog1
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4899 (tramp-run-real-handler 'make-auto-save-file-name nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4900 (ad-activate 'make-auto-save-file-name)))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4901
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4902 (defvar tramp-handle-write-region-hook nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4903 "Normal hook to be run at the end of `tramp-handle-write-region'.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4904
105718
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4905 ;; CCC grok LOCKNAME
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4906 (defun tramp-handle-write-region
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4907 (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
4908 "Like `write-region' for Tramp files."
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
4909 (setq filename (expand-file-name filename))
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
4910 (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
4911 ;; Following part commented out because we don't know what to do about
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4912 ;; file locking, and it does not appear to be a problem to ignore it.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4913 ;; Ange-ftp ignores it, too.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4914 ;; (when (and lockname (stringp lockname))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4915 ;; (setq lockname (expand-file-name lockname)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4916 ;; (unless (or (eq lockname nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4917 ;; (string= lockname filename))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4918 ;; (error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4919 ;; "tramp-handle-write-region: LOCKNAME must be nil or equal FILENAME"))
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
4920
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
4921 ;; 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
4922 (when (and (not (featurep 'xemacs)) 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
4923 (unless (y-or-n-p (format "File %s exists; overwrite anyway? " filename))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
4924 (tramp-error v 'file-error "File not overwritten")))
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
4925
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
4926 (let ((uid (or (nth 2 (tramp-compat-file-attributes filename 'integer))
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4927 (tramp-get-remote-uid v 'integer)))
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
4928 (gid (or (nth 3 (tramp-compat-file-attributes filename 'integer))
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4929 (tramp-get-remote-gid v 'integer))))
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4930
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4931 (if (and (tramp-local-host-p v)
103782
c5225871ee78 * net/tramp.el (tramp-set-file-uid-gid): Handle the case the
Michael Albinus <michael.albinus@gmx.de>
parents: 103735
diff changeset
4932 ;; `file-writable-p' calls `file-expand-file-name'. We
94401
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4933 ;; cannot use `tramp-run-real-handler' therefore.
ed7a07d27b12 * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 94395
diff changeset
4934 (let (file-name-handler-alist)
95050
adc57176d5f1 * net/tramp.el (tramp-handle-write-region): Fix check for short
Michael Albinus <michael.albinus@gmx.de>
parents: 95025
diff changeset
4935 (and
adc57176d5f1 * net/tramp.el (tramp-handle-write-region): Fix check for short
Michael Albinus <michael.albinus@gmx.de>
parents: 95025
diff changeset
4936 (file-writable-p (file-name-directory localname))
adc57176d5f1 * net/tramp.el (tramp-handle-write-region): Fix check for short
Michael Albinus <michael.albinus@gmx.de>
parents: 95025
diff changeset
4937 (or (file-directory-p localname)
adc57176d5f1 * net/tramp.el (tramp-handle-write-region): Fix check for short
Michael Albinus <michael.albinus@gmx.de>
parents: 95025
diff changeset
4938 (file-writable-p localname)))))
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4939 ;; Short track: if we are on the local host, we can run directly.
103782
c5225871ee78 * net/tramp.el (tramp-set-file-uid-gid): Handle the case the
Michael Albinus <michael.albinus@gmx.de>
parents: 103735
diff changeset
4940 (progn
c5225871ee78 * net/tramp.el (tramp-set-file-uid-gid): Handle the case the
Michael Albinus <michael.albinus@gmx.de>
parents: 103735
diff changeset
4941 (tramp-run-real-handler
c5225871ee78 * net/tramp.el (tramp-set-file-uid-gid): Handle the case the
Michael Albinus <michael.albinus@gmx.de>
parents: 103735
diff changeset
4942 'write-region
c5225871ee78 * net/tramp.el (tramp-set-file-uid-gid): Handle the case the
Michael Albinus <michael.albinus@gmx.de>
parents: 103735
diff changeset
4943 (list start end localname append 'no-message lockname confirm))
103735
d3d4dbf21c9b * net/tramp.el (tramp-handle-write-region): Flush file properties
Michael Albinus <michael.albinus@gmx.de>
parents: 103642
diff changeset
4944 (tramp-flush-file-property v localname))
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4945
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4946 (let ((rem-dec (tramp-get-remote-coding v "remote-decoding"))
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4947 (loc-enc (tramp-get-local-coding v "local-encoding"))
102851
5cc9a4c776e8 * net/tramp.el (tramp-default-file-modes) New defun. Replace all
Michael Albinus <michael.albinus@gmx.de>
parents: 102287
diff changeset
4948 (modes (save-excursion (tramp-default-file-modes filename)))
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4949 ;; We use this to save the value of
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4950 ;; `last-coding-system-used' after writing the tmp file.
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4951 ;; At the end of the function, we set
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4952 ;; `last-coding-system-used' to this saved value. This
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4953 ;; way, any intermediary coding systems used while
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4954 ;; talking to the remote shell or suchlike won't hose
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4955 ;; this variable. This approach was snarfed from
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4956 ;; ange-ftp.el.
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4957 coding-system-used
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4958 ;; Write region into a tmp file. This isn't really
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4959 ;; needed if we use an encoding function, but currently
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4960 ;; we use it always because this makes the logic
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
4961 ;; simpler.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
4962 (tmpfile (or tramp-temp-buffer-file-name
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
4963 (tramp-compat-make-temp-file filename))))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
4964
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
4965 ;; If `append' is non-nil, we copy the file locally, and let
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
4966 ;; the native `write-region' implementation do the job.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
4967 (when append (copy-file filename tmpfile 'ok))
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4968
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4969 ;; We say `no-message' here because we don't want the
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4970 ;; visited file modtime data to be clobbered from the temp
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4971 ;; file. We call `set-visited-file-modtime' ourselves later
93938
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4972 ;; on. We must ensure that `file-coding-system-alist'
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4973 ;; matches `tmpfile'.
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4974 (let ((file-coding-system-alist
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4975 (tramp-find-file-name-coding-system-alist filename tmpfile)))
100922
2b84620022aa * net/tramp.el (tramp-handle-load)
Michael Albinus <michael.albinus@gmx.de>
parents: 100903
diff changeset
4976 (condition-case err
2b84620022aa * net/tramp.el (tramp-handle-load)
Michael Albinus <michael.albinus@gmx.de>
parents: 100903
diff changeset
4977 (tramp-run-real-handler
2b84620022aa * net/tramp.el (tramp-handle-load)
Michael Albinus <michael.albinus@gmx.de>
parents: 100903
diff changeset
4978 'write-region
2b84620022aa * net/tramp.el (tramp-handle-load)
Michael Albinus <michael.albinus@gmx.de>
parents: 100903
diff changeset
4979 (list start end tmpfile append 'no-message lockname confirm))
100930
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4980 ((error quit)
105718
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
4981 (setq tramp-temp-buffer-file-name nil)
100930
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4982 (delete-file tmpfile)
7d332b05e8ac * net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents: 100922
diff changeset
4983 (signal (car err) (cdr err))))
100922
2b84620022aa * net/tramp.el (tramp-handle-load)
Michael Albinus <michael.albinus@gmx.de>
parents: 100903
diff changeset
4984
93938
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4985 ;; Now, `last-coding-system-used' has the right value. Remember it.
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4986 (when (boundp 'last-coding-system-used)
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4987 (setq coding-system-used
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4988 (symbol-value 'last-coding-system-used))))
3c06445e714c * net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents: 93829
diff changeset
4989
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4990 ;; The permissions of the temporary file should be set. If
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4991 ;; filename does not exist (eq modes nil) it has been
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4992 ;; renamed to the backup file. This case `save-buffer'
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4993 ;; handles permissions.
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4994 (when modes (set-file-modes tmpfile modes))
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4995
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4996 ;; This is a bit lengthy due to the different methods
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4997 ;; possible for file transfer. First, we check whether the
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4998 ;; method uses an rcp program. If so, we call it.
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
4999 ;; Otherwise, both encoding and decoding command must be
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5000 ;; specified. However, if the method _also_ specifies an
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5001 ;; encoding function, then that is used for encoding the
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5002 ;; contents of the tmp file.
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5003 (cond
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5004 ;; `rename-file' handles direct copy and out-of-band methods.
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5005 ((or (tramp-local-host-p v)
104807
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5006 (tramp-method-out-of-band-p
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5007 v (- (or end (point-max)) (or start (point-min)))))
105907
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
5008 (if (and (= (or end (point-max)) (point-max))
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
5009 (= (or start (point-min)) (point-min))
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
5010 (tramp-get-method-parameter
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
5011 method 'tramp-copy-keep-tmpfile))
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
5012 (progn
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
5013 (setq tramp-temp-buffer-file-name tmpfile)
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
5014 (condition-case err
105718
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
5015 ;; We keep the local file for performance
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
5016 ;; reasons, useful for "rsync".
105907
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
5017 (copy-file tmpfile filename t)
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
5018 ((error quit)
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
5019 (setq tramp-temp-buffer-file-name nil)
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
5020 (delete-file tmpfile)
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
5021 (signal (car err) (cdr err)))))
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
5022 (setq tramp-temp-buffer-file-name nil)
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
5023 ;; Don't rename, in order to keep context in SELinux.
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
5024 (unwind-protect
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
5025 (copy-file tmpfile filename t)
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
5026 (delete-file tmpfile))))
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5027
99950
f803581cae44 * net/tramp.el (tramp-handle-write-region): Improve the check for
Michael Albinus <michael.albinus@gmx.de>
parents: 99615
diff changeset
5028 ;; Use inline file transfer.
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5029 (rem-dec
99950
f803581cae44 * net/tramp.el (tramp-handle-write-region): Improve the check for
Michael Albinus <michael.albinus@gmx.de>
parents: 99615
diff changeset
5030 ;; Encode tmpfile.
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5031 (tramp-message v 5 "Encoding region...")
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5032 (unwind-protect
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5033 (with-temp-buffer
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5034 ;; Use encoding function or command.
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5035 (if (and (symbolp loc-enc) (fboundp loc-enc))
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5036 (progn
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5037 (tramp-message
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5038 v 5 "Encoding region using function `%s'..."
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5039 (symbol-name loc-enc))
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5040 (let ((coding-system-for-read 'binary))
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5041 (insert-file-contents-literally tmpfile))
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
5042 ;; The following `let' is a workaround for the
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
5043 ;; base64.el that comes with pgnus-0.84. If
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
5044 ;; both of the following conditions are
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
5045 ;; satisfied, it tries to write to a local
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
5046 ;; file in default-directory, but at this
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
5047 ;; point, default-directory is remote.
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
5048 ;; (`call-process-region' can't write to
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
5049 ;; remote files, it seems.) The file in
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
5050 ;; question is a tmp file anyway.
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5051 (let ((default-directory
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5052 (tramp-compat-temporary-file-directory)))
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5053 (funcall loc-enc (point-min) (point-max))))
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5054
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5055 (tramp-message
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5056 v 5 "Encoding region using command `%s'..." loc-enc)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5057 (unless (equal 0 (tramp-call-local-coding-command
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5058 loc-enc tmpfile t))
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5059 (tramp-error
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5060 v 'file-error
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5061 "Cannot write to `%s', local encoding command `%s' failed"
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5062 filename loc-enc)))
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5063
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5064 ;; Send buffer into remote decoding command which
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5065 ;; writes to remote file. Because this happens on
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5066 ;; the remote host, we cannot use the function.
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5067 (goto-char (point-max))
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5068 (unless (bolp) (newline))
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
5069 (tramp-message
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5070 v 5 "Decoding region into remote file %s..." filename)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5071 (tramp-send-command
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5072 v
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5073 (format
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5074 "%s >%s <<'EOF'\n%sEOF"
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5075 rem-dec
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5076 (tramp-shell-quote-argument localname)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5077 (buffer-string)))
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5078 (tramp-barf-unless-okay
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5079 v nil
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5080 "Couldn't write region to `%s', decode using `%s' failed"
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5081 filename rem-dec)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5082 ;; When `file-precious-flag' is set, the region is
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5083 ;; written to a temporary file. Check that the
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5084 ;; checksum is equal to that from the local tmpfile.
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5085 (when file-precious-flag
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5086 (erase-buffer)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5087 (and
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
5088 ;; cksum runs locally, if possible.
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
5089 (zerop (tramp-local-call-process "cksum" tmpfile t))
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
5090 ;; cksum runs remotely.
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5091 (zerop
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5092 (tramp-send-command-and-check
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5093 v
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5094 (format
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5095 "cksum <%s" (tramp-shell-quote-argument localname))))
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
5096 ;; ... they are different.
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5097 (not
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5098 (string-equal
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5099 (buffer-string)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5100 (with-current-buffer (tramp-get-buffer v)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5101 (buffer-string))))
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5102 (tramp-error
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5103 v 'file-error
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5104 (concat "Couldn't write region to `%s',"
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5105 " decode using `%s' failed")
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5106 filename rem-dec)))
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5107 (tramp-message
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5108 v 5 "Decoding region into remote file %s...done" filename)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5109 (tramp-flush-file-property v localname))
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5110
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5111 ;; Save exit.
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5112 (delete-file tmpfile)))
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5113
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5114 ;; That's not expected.
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5115 (t
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5116 (tramp-error
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5117 v 'file-error
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5118 (concat "Method `%s' should specify both encoding and "
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5119 "decoding command or an rcp program")
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5120 method)))
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5121
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5122 ;; Make `last-coding-system-used' have the right value.
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5123 (when coding-system-used
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
5124 (set 'last-coding-system-used coding-system-used))))
85041
a42b8750a992 * net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 85024
diff changeset
5125
93040
ba82da0cb626 * net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents: 93036
diff changeset
5126 ;; We must protect `last-coding-system-used', now we have set it
ba82da0cb626 * net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents: 93036
diff changeset
5127 ;; to its correct value.
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
5128 (let (last-coding-system-used (need-chown t))
93040
ba82da0cb626 * net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents: 93036
diff changeset
5129 ;; Set file modification time.
ba82da0cb626 * net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents: 93036
diff changeset
5130 (when (or (eq visit t) (stringp visit))
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
5131 (let ((file-attr (file-attributes filename)))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
5132 (set-visited-file-modtime
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
5133 ;; We must pass modtime explicitely, because filename can
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
5134 ;; be different from (buffer-file-name), f.e. if
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
5135 ;; `file-precious-flag' is set.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
5136 (nth 5 file-attr))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
5137 (when (and (eq (nth 2 file-attr) uid)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
5138 (eq (nth 3 file-attr) gid))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
5139 (setq need-chown nil))))
93040
ba82da0cb626 * net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents: 93036
diff changeset
5140
ba82da0cb626 * net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents: 93036
diff changeset
5141 ;; Set the ownership.
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
5142 (when need-chown
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
5143 (tramp-set-file-uid-gid filename uid gid))
93040
ba82da0cb626 * net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents: 93036
diff changeset
5144 (when (or (eq visit t) (null visit) (stringp visit))
ba82da0cb626 * net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents: 93036
diff changeset
5145 (tramp-message v 0 "Wrote %s" filename))
ba82da0cb626 * net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents: 93036
diff changeset
5146 (run-hooks 'tramp-handle-write-region-hook)))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
5147
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5148 (defvar tramp-vc-registered-file-names nil
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5149 "List used to collect file names, which are checked during `vc-registered'.")
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5150
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5151 ;; VC backends check for the existence of various different special
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5152 ;; files. This is very time consuming, because every single check
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5153 ;; requires a remote command (the file cache must be invalidated).
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5154 ;; Therefore, we apply a kind of optimization. We install the file
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5155 ;; name handler `tramp-vc-file-name-handler', which does nothing but
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5156 ;; remembers all file names for which `file-exists-p' or
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5157 ;; `file-readable-p' has been applied. A first run of `vc-registered'
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5158 ;; is performed. Afterwards, a script is applied for all collected
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5159 ;; file names, using just one remote command. The result of this
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5160 ;; script is used to fill the file cache with actual values. Now we
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5161 ;; can reset the file name handlers, and we make a second run of
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5162 ;; `vc-registered', which returns the expected result without sending
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5163 ;; any other remote command.
102907
5055f4ba592b * net/tramp.el (tramp-file-name-handler-alist): Add
Michael Albinus <michael.albinus@gmx.de>
parents: 102851
diff changeset
5164 (defun tramp-handle-vc-registered (file)
5055f4ba592b * net/tramp.el (tramp-file-name-handler-alist): Add
Michael Albinus <michael.albinus@gmx.de>
parents: 102851
diff changeset
5165 "Like `vc-registered' for Tramp files."
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5166 (with-parsed-tramp-file-name file nil
104807
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5167
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5168 ;; There could be new files, created by the vc backend. We cannot
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5169 ;; reuse the old cache entries, therefore.
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5170 (let (tramp-vc-registered-file-names
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5171 (tramp-cache-inhibit-cache (current-time))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5172 (file-name-handler-alist
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5173 `((,tramp-file-name-regexp . tramp-vc-file-name-handler))))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5174
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5175 ;; Here we collect only file names, which need an operation.
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5176 (tramp-run-real-handler 'vc-registered (list file))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5177 (tramp-message v 10 "\n%s" tramp-vc-registered-file-names)
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5178
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5179 ;; Send just one command, in order to fill the cache.
104807
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5180 (when tramp-vc-registered-file-names
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5181 (tramp-maybe-send-script
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5182 v
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5183 (format tramp-vc-registered-read-file-names
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5184 (tramp-get-file-exists-command v)
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5185 (format "%s -r" (tramp-get-test-command v)))
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5186 "tramp_vc_registered_read_file_names")
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5187
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5188 (dolist
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5189 (elt
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5190 (tramp-send-command-and-read
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5191 v
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5192 (format
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5193 "tramp_vc_registered_read_file_names %s"
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5194 (mapconcat 'tramp-shell-quote-argument
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5195 tramp-vc-registered-file-names
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5196 " "))))
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5197
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5198 (tramp-set-file-property v (car elt) (cadr elt) (cadr (cdr elt))))))
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5199
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5200 ;; Second run. Now all `file-exists-p' or `file-readable-p' calls
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5201 ;; shall be answered from the file cache.
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5202 ;; We unset `process-file-side-effects' in order to keep the cache
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
5203 ;; when `process-file' calls appear.
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5204 (let (process-file-side-effects)
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5205 (tramp-run-real-handler 'vc-registered (list file)))))
102907
5055f4ba592b * net/tramp.el (tramp-file-name-handler-alist): Add
Michael Albinus <michael.albinus@gmx.de>
parents: 102851
diff changeset
5206
70318
77201b466c80 * net/tramp.el (tramp-completion-file-name-handler-alist)
Michael Albinus <michael.albinus@gmx.de>
parents: 70276
diff changeset
5207 ;;;###autoload
77201b466c80 * net/tramp.el (tramp-completion-file-name-handler-alist)
Michael Albinus <michael.albinus@gmx.de>
parents: 70276
diff changeset
5208 (progn (defun tramp-run-real-handler (operation args)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
5209 "Invoke normal file name handler for OPERATION.
46009
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
5210 First arg specifies the OPERATION, second arg is a list of arguments to
72200622ada8 (tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 45861
diff changeset
5211 pass to the OPERATION."
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5212 (let* ((inhibit-file-name-handlers
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5213 `(tramp-file-name-handler
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5214 tramp-vc-file-name-handler
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5215 tramp-completion-file-name-handler
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5216 cygwin-mount-name-hook-function
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5217 cygwin-mount-map-drive-hook-function
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5218 .
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5219 ,(and (eq inhibit-file-name-operation operation)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5220 inhibit-file-name-handlers)))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5221 (inhibit-file-name-operation operation))
70318
77201b466c80 * net/tramp.el (tramp-completion-file-name-handler-alist)
Michael Albinus <michael.albinus@gmx.de>
parents: 70276
diff changeset
5222 (apply operation args))))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5223
70318
77201b466c80 * net/tramp.el (tramp-completion-file-name-handler-alist)
Michael Albinus <michael.albinus@gmx.de>
parents: 70276
diff changeset
5224 ;;;###autoload
77201b466c80 * net/tramp.el (tramp-completion-file-name-handler-alist)
Michael Albinus <michael.albinus@gmx.de>
parents: 70276
diff changeset
5225 (progn (defun tramp-completion-run-real-handler (operation args)
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5226 "Invoke `tramp-file-name-handler' for OPERATION.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5227 First arg specifies the OPERATION, second arg is a list of arguments to
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5228 pass to the OPERATION."
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5229 (let* ((inhibit-file-name-handlers
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5230 `(tramp-completion-file-name-handler
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5231 cygwin-mount-name-hook-function
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5232 cygwin-mount-map-drive-hook-function
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5233 .
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5234 ,(and (eq inhibit-file-name-operation operation)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5235 inhibit-file-name-handlers)))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5236 (inhibit-file-name-operation operation))
70318
77201b466c80 * net/tramp.el (tramp-completion-file-name-handler-alist)
Michael Albinus <michael.albinus@gmx.de>
parents: 70276
diff changeset
5237 (apply operation args))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
5238
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5239 ;; We handle here all file primitives. Most of them have the file
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5240 ;; name as first parameter; nevertheless we check for them explicitly
96361
a99299e4d2de American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents: 95967
diff changeset
5241 ;; in order to be signaled if a new primitive appears. This
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5242 ;; scenario is needed because there isn't a way to decide by
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5243 ;; syntactical means whether a foreign method must be called. It would
55844
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
5244 ;; ease the life if `file-name-handler-alist' would support a decision
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5245 ;; function as well but regexp only.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5246 (defun tramp-file-name-for-operation (operation &rest args)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5247 "Return file name related to OPERATION file primitive.
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5248 ARGS are the arguments OPERATION has been called with."
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5249 (cond
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5250 ; FILE resp DIRECTORY
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5251 ((member operation
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5252 (list 'access-file 'byte-compiler-base-file-name 'delete-directory
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5253 'delete-file 'diff-latest-backup-file 'directory-file-name
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5254 'directory-files 'directory-files-and-attributes
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5255 'dired-compress-file 'dired-uncache
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5256 'file-accessible-directory-p 'file-attributes
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5257 'file-directory-p 'file-executable-p 'file-exists-p
55844
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
5258 'file-local-copy 'file-remote-p 'file-modes
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
5259 'file-name-as-directory 'file-name-directory
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
5260 'file-name-nondirectory 'file-name-sans-versions
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
5261 'file-ownership-preserved-p 'file-readable-p
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
5262 'file-regular-p 'file-symlink-p 'file-truename
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
5263 'file-writable-p 'find-backup-file-name 'find-file-noselect
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
5264 'get-file-buffer 'insert-directory 'insert-file-contents
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
5265 'load 'make-directory 'make-directory-internal
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
5266 'set-file-modes 'substitute-in-file-name
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
5267 'unhandled-file-name-directory 'vc-registered
81938
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
5268 ; Emacs 22 only
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
5269 'set-file-times
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5270 ; XEmacs only
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5271 'abbreviate-file-name 'create-file-buffer
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5272 'dired-file-modtime 'dired-make-compressed-filename
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5273 'dired-recursive-delete-directory 'dired-set-file-modtime
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5274 'dired-shell-unhandle-file-name 'dired-uucode-file
95025
bdaea36b81dd * net/tramp.el: Load auth-source library.
Michael Albinus <michael.albinus@gmx.de>
parents: 94975
diff changeset
5275 'insert-file-contents-literally 'make-temp-name 'recover-file
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5276 'vm-imap-check-mail 'vm-pop-check-mail 'vm-spool-check-mail))
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5277 (if (file-name-absolute-p (nth 0 args))
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5278 (nth 0 args)
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5279 (expand-file-name (nth 0 args))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5280 ; FILE DIRECTORY resp FILE1 FILE2
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5281 ((member operation
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5282 (list 'add-name-to-file 'copy-file 'expand-file-name
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5283 'file-name-all-completions 'file-name-completion
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5284 'file-newer-than-file-p 'make-symbolic-link 'rename-file
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
5285 ; Emacs 23 only
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
5286 'copy-directory
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5287 ; XEmacs only
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5288 'dired-make-relative-symlink
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5289 'vm-imap-move-mail 'vm-pop-move-mail 'vm-spool-move-mail))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5290 (save-match-data
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5291 (cond
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5292 ((string-match tramp-file-name-regexp (nth 0 args)) (nth 0 args))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5293 ((string-match tramp-file-name-regexp (nth 1 args)) (nth 1 args))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5294 (t (buffer-file-name (current-buffer))))))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5295 ; START END FILE
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5296 ((eq operation 'write-region)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5297 (nth 2 args))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5298 ; BUF
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5299 ((member operation
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5300 (list 'set-visited-file-modtime 'verify-visited-file-modtime
86204
7d7472ea9c0a * net/tramp.el (tramp-completion-reread-directory-timeout): New
Michael Albinus <michael.albinus@gmx.de>
parents: 86048
diff changeset
5301 ; since Emacs 22 only
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5302 'make-auto-save-file-name
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5303 ; XEmacs only
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5304 'backup-buffer))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5305 (buffer-file-name
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5306 (if (bufferp (nth 0 args)) (nth 0 args) (current-buffer))))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5307 ; COMMAND
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5308 ((member operation
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5309 (list ; not in Emacs 23
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5310 'dired-call-process
59582
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
5311 ; Emacs only
60287
865aec6814c3 (tramp-file-name-for-operation): Fix misapplied
Andreas Schwab <schwab@suse.de>
parents: 60156
diff changeset
5312 'shell-command
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5313 ; since Emacs 22 only
57653
b324ca4df07c * simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57559
diff changeset
5314 'process-file
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5315 ; since Emacs 23 only
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5316 'start-file-process
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5317 ; XEmacs only
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5318 'dired-print-file 'dired-shell-call-process
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5319 ; nowhere yet
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5320 'executable-find 'start-process 'call-process))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5321 default-directory)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5322 ; unknown file primitive
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5323 (t (error "unknown file I/O primitive: %s" operation))))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5324
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5325 (defun tramp-find-foreign-file-name-handler (filename)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5326 "Return foreign file name handler if exists."
84966
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
5327 (when (and (stringp filename) (tramp-tramp-file-p filename))
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
5328 (let ((v (tramp-dissect-file-name filename t))
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
5329 (handler tramp-foreign-file-name-handler-alist)
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
5330 elt res)
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
5331 ;; When we are not fully sure that filename completion is safe,
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
5332 ;; we should not return a handler.
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
5333 (when (or (tramp-file-name-method v) (tramp-file-name-user v)
85089
8fb95bcda144 * net/tramp.el (tramp-find-foreign-file-name-handler): Check also
Michael Albinus <michael.albinus@gmx.de>
parents: 85067
diff changeset
5334 (and (tramp-file-name-host v)
8fb95bcda144 * net/tramp.el (tramp-find-foreign-file-name-handler): Check also
Michael Albinus <michael.albinus@gmx.de>
parents: 85067
diff changeset
5335 (not (member (tramp-file-name-host v)
8fb95bcda144 * net/tramp.el (tramp-find-foreign-file-name-handler): Check also
Michael Albinus <michael.albinus@gmx.de>
parents: 85067
diff changeset
5336 (mapcar 'car tramp-methods))))
84966
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
5337 (not (tramp-completion-mode-p)))
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
5338 (while handler
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
5339 (setq elt (car handler)
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
5340 handler (cdr handler))
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
5341 (when (funcall (car elt) filename)
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
5342 (setq handler nil
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
5343 res (cdr elt))))
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
5344 res))))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5345
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
5346 ;; Main function.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
5347 ;;;###autoload
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
5348 (defun tramp-file-name-handler (operation &rest args)
51603
978e262c8f3a Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51177
diff changeset
5349 "Invoke Tramp file name handler.
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
5350 Falls back to normal file name handler if no Tramp file name handler exists."
94436
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5351 (if tramp-mode
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5352 (save-match-data
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5353 (let* ((filename
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5354 (tramp-replace-environment-variables
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5355 (apply 'tramp-file-name-for-operation operation args)))
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5356 (completion (tramp-completion-mode-p))
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5357 (foreign (tramp-find-foreign-file-name-handler filename)))
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5358 (with-parsed-tramp-file-name filename nil
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5359 (cond
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5360 ;; When we are in completion mode, some operations
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5361 ;; shouldn't be handled by backend.
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5362 ((and completion (zerop (length localname))
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5363 (memq operation '(file-exists-p file-directory-p)))
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5364 t)
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5365 ((and completion (zerop (length localname))
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5366 (memq operation '(file-name-as-directory)))
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5367 filename)
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5368 ;; Call the backend function.
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5369 (foreign (apply foreign operation args))
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5370 ;; Nothing to do for us.
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5371 (t (tramp-run-real-handler operation args))))))
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5372 ;; When `tramp-mode' is not enabled, we don't do anything.
0918f4a758d2 * net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents: 94401
diff changeset
5373 (tramp-run-real-handler operation args)))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
5374
56460
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5375 ;; In Emacs, there is some concurrency due to timers. If a timer
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5376 ;; interrupts Tramp and wishes to use the same connection buffer as
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5377 ;; the "main" Emacs, then garbage might occur in the connection
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5378 ;; buffer. Therefore, we need to make sure that a timer does not use
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5379 ;; the same connection buffer as the "main" Emacs. We implement a
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5380 ;; cheap global lock, instead of locking each connection buffer
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5381 ;; separately. The global lock is based on two variables,
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5382 ;; `tramp-locked' and `tramp-locker'. `tramp-locked' is set to true
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5383 ;; (with setq) to indicate a lock. But Tramp also calls itself during
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5384 ;; processing of a single file operation, so we need to allow
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5385 ;; recursive calls. That's where the `tramp-locker' variable comes in
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5386 ;; -- it is let-bound to t during the execution of the current
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5387 ;; handler. So if `tramp-locked' is t and `tramp-locker' is also t,
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5388 ;; then we should just proceed because we have been called
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5389 ;; recursively. But if `tramp-locker' is nil, then we are a timer
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5390 ;; interrupting the "main" Emacs, and then we signal an error.
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5391
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5392 (defvar tramp-locked nil
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5393 "If non-nil, then Tramp is currently busy.
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5394 Together with `tramp-locker', this implements a locking mechanism
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5395 preventing reentrant calls of Tramp.")
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5396
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5397 (defvar tramp-locker nil
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5398 "If non-nil, then a caller has locked Tramp.
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5399 Together with `tramp-locked', this implements a locking mechanism
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5400 preventing reentrant calls of Tramp.")
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5401
51603
978e262c8f3a Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51177
diff changeset
5402 (defun tramp-sh-file-name-handler (operation &rest args)
978e262c8f3a Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51177
diff changeset
5403 "Invoke remote-shell Tramp file name handler.
978e262c8f3a Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51177
diff changeset
5404 Fall back to normal file name handler if no Tramp handler exists."
56460
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5405 (when (and tramp-locked (not tramp-locker))
95963
a20bb74ebe03 * net/tramp.el (tramp-handle-start-file-process): Clear
Michael Albinus <michael.albinus@gmx.de>
parents: 95659
diff changeset
5406 (setq tramp-locked nil)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5407 (signal 'file-error (list "Forbidden reentrant call of Tramp")))
56460
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5408 (let ((tl tramp-locked))
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5409 (unwind-protect
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5410 (progn
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5411 (setq tramp-locked t)
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5412 (let ((tramp-locker t))
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5413 (save-match-data
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5414 (let ((fn (assoc operation tramp-file-name-handler-alist)))
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5415 (if fn
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5416 (apply (cdr fn) args)
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5417 (tramp-run-real-handler operation args))))))
9459300bf43b Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56424
diff changeset
5418 (setq tramp-locked tl))))
51603
978e262c8f3a Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51177
diff changeset
5419
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5420 (defun tramp-vc-file-name-handler (operation &rest args)
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5421 "Invoke special file name handler, which collects files to be handled."
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5422 (save-match-data
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5423 (let ((filename
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5424 (tramp-replace-environment-variables
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5425 (apply 'tramp-file-name-for-operation operation args)))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5426 (fn (assoc operation tramp-file-name-handler-alist)))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5427 (with-parsed-tramp-file-name filename nil
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5428 (cond
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5429 ;; That's what we want: file names, for which checks are
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5430 ;; applied. We assume, that VC uses only `file-exists-p' and
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5431 ;; `file-readable-p' checks; otherwise we must extend the
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5432 ;; list. We do not perform any action, but return nil, in
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5433 ;; order to keep `vc-registered' running.
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5434 ((and fn (memq operation '(file-exists-p file-readable-p)))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5435 (add-to-list 'tramp-vc-registered-file-names localname 'append)
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5436 nil)
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5437 ;; Tramp file name handlers like `expand-file-name'. They
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5438 ;; must still work.
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5439 (fn
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5440 (save-match-data (apply (cdr fn) args)))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5441 ;; Default file name handlers, we don't care.
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5442 (t (tramp-run-real-handler operation args)))))))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
5443
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5444 ;;;###autoload
70255
d57fb8c98714 * net/tramp.el (tramp-completion-file-name-handler): Disable
Michael Albinus <michael.albinus@gmx.de>
parents: 70191
diff changeset
5445 (progn (defun tramp-completion-file-name-handler (operation &rest args)
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
5446 "Invoke Tramp file name completion handler.
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
5447 Falls back to normal file name handler if no Tramp file name handler exists."
93040
ba82da0cb626 * net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents: 93036
diff changeset
5448 ;; We bind `directory-sep-char' here for XEmacs on Windows, which
ba82da0cb626 * net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents: 93036
diff changeset
5449 ;; would otherwise use backslash.
93082
7e079018403b * net/tramp.el (tramp-let-maybe): Removed.
Michael Albinus <michael.albinus@gmx.de>
parents: 93062
diff changeset
5450 (let ((directory-sep-char ?/)
7e079018403b * net/tramp.el (tramp-let-maybe): Removed.
Michael Albinus <michael.albinus@gmx.de>
parents: 93062
diff changeset
5451 (fn (assoc operation tramp-completion-file-name-handler-alist)))
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5452 (if (and
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5453 ;; When `tramp-mode' is not enabled, we don't do anything.
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5454 fn tramp-mode
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5455 ;; For other syntaxes than `sep', the regexp matches many common
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5456 ;; situations where the user doesn't actually want to use Tramp.
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5457 ;; So to avoid autoloading Tramp after typing just "/s", we
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5458 ;; disable this part of the completion, unless the user implicitly
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5459 ;; indicated his interest in using a fancier completion system.
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5460 (or (eq tramp-syntax 'sep)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5461 (featurep 'tramp) ; If it's loaded, we may as well use it.
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5462 (and (boundp 'partial-completion-mode) partial-completion-mode)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5463 ;; FIXME: These may have been loaded even if the user never
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5464 ;; intended to use them.
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5465 (featurep 'ido)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5466 (featurep 'icicles)))
93082
7e079018403b * net/tramp.el (tramp-let-maybe): Removed.
Michael Albinus <michael.albinus@gmx.de>
parents: 93062
diff changeset
5467 (save-match-data (apply (cdr fn) args))
7e079018403b * net/tramp.el (tramp-let-maybe): Removed.
Michael Albinus <michael.albinus@gmx.de>
parents: 93062
diff changeset
5468 (tramp-completion-run-real-handler operation args)))))
70318
77201b466c80 * net/tramp.el (tramp-completion-file-name-handler-alist)
Michael Albinus <michael.albinus@gmx.de>
parents: 70276
diff changeset
5469
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
5470 ;;;###autoload
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5471 (progn (defun tramp-register-file-name-handlers ()
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5472 "Add Tramp file name handlers to `file-name-handler-alist'."
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5473 ;; Remove autoloaded handlers from file name handler alist. Useful,
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5474 ;; if `tramp-syntax' has been changed.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5475 (let ((a1 (rassq 'tramp-file-name-handler file-name-handler-alist)))
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5476 (setq file-name-handler-alist (delq a1 file-name-handler-alist)))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5477 (let ((a1 (rassq
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5478 'tramp-completion-file-name-handler file-name-handler-alist)))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5479 (setq file-name-handler-alist (delq a1 file-name-handler-alist)))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5480 ;; Add the handlers.
70318
77201b466c80 * net/tramp.el (tramp-completion-file-name-handler-alist)
Michael Albinus <michael.albinus@gmx.de>
parents: 70276
diff changeset
5481 (add-to-list 'file-name-handler-alist
77201b466c80 * net/tramp.el (tramp-completion-file-name-handler-alist)
Michael Albinus <michael.albinus@gmx.de>
parents: 70276
diff changeset
5482 (cons tramp-file-name-regexp 'tramp-file-name-handler))
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5483 (add-to-list 'file-name-handler-alist
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5484 (cons tramp-completion-file-name-regexp
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5485 'tramp-completion-file-name-handler))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5486 (put 'tramp-completion-file-name-handler 'safe-magic t)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5487 ;; If jka-compr or epa-file are already loaded, move them to the
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5488 ;; front of `file-name-handler-alist'.
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5489 (dolist (fnh '(epa-file-handler jka-compr-handler))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5490 (let ((entry (rassoc fnh file-name-handler-alist)))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5491 (when entry
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5492 (setq file-name-handler-alist
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5493 (cons entry (delete entry file-name-handler-alist))))))))
76846
d55ab93ab5bf * net/tramp.el (tramp-register-file-name-handler)
Michael Albinus <michael.albinus@gmx.de>
parents: 76326
diff changeset
5494
d55ab93ab5bf * net/tramp.el (tramp-register-file-name-handler)
Michael Albinus <michael.albinus@gmx.de>
parents: 76326
diff changeset
5495 ;; `tramp-file-name-handler' must be registered before evaluation of
d55ab93ab5bf * net/tramp.el (tramp-register-file-name-handler)
Michael Albinus <michael.albinus@gmx.de>
parents: 76326
diff changeset
5496 ;; site-start and init files, because there might exist remote files
d55ab93ab5bf * net/tramp.el (tramp-register-file-name-handler)
Michael Albinus <michael.albinus@gmx.de>
parents: 76326
diff changeset
5497 ;; already, f.e. files kept via recentf-mode.
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5498 ;;;###autoload(tramp-register-file-name-handlers)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
5499 (tramp-register-file-name-handlers)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
5500
68335
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
5501 ;;;###autoload
70191
3a3093f77da8 * net/tramp.el (tramp-register-file-name-handlers): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 70073
diff changeset
5502 (defun tramp-unload-file-name-handlers ()
68335
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
5503 (setq file-name-handler-alist
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
5504 (delete (rassoc 'tramp-file-name-handler
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
5505 file-name-handler-alist)
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
5506 (delete (rassoc 'tramp-completion-file-name-handler
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
5507 file-name-handler-alist)
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
5508 file-name-handler-alist))))
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
5509
70191
3a3093f77da8 * net/tramp.el (tramp-register-file-name-handlers): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 70073
diff changeset
5510 (add-hook 'tramp-unload-hook 'tramp-unload-file-name-handlers)
68335
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
5511
87648
7ae99e295dfd * vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents: 87368
diff changeset
5512 ;;; File name handler functions for completion mode:
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5513
66496
63563507d684 (tramp-completion-mode): defvar moved up.
Richard M. Stallman <rms@gnu.org>
parents: 66135
diff changeset
5514 (defvar tramp-completion-mode nil
78997
ef0a2673bf5e * net/tramp.el (tramp-completion-mode): Extend doc-string.
Michael Albinus <michael.albinus@gmx.de>
parents: 78887
diff changeset
5515 "If non-nil, external packages signal that they are in file name completion.
ef0a2673bf5e * net/tramp.el (tramp-completion-mode): Extend doc-string.
Michael Albinus <michael.albinus@gmx.de>
parents: 78887
diff changeset
5516
ef0a2673bf5e * net/tramp.el (tramp-completion-mode): Extend doc-string.
Michael Albinus <michael.albinus@gmx.de>
parents: 78887
diff changeset
5517 This is necessary, because Tramp uses a heuristic depending on last
ef0a2673bf5e * net/tramp.el (tramp-completion-mode): Extend doc-string.
Michael Albinus <michael.albinus@gmx.de>
parents: 78887
diff changeset
5518 input event. This fails when external packages use other characters
ef0a2673bf5e * net/tramp.el (tramp-completion-mode): Extend doc-string.
Michael Albinus <michael.albinus@gmx.de>
parents: 78887
diff changeset
5519 but <TAB>, <SPACE> or ?\\? for file name completion. This variable
ef0a2673bf5e * net/tramp.el (tramp-completion-mode): Extend doc-string.
Michael Albinus <michael.albinus@gmx.de>
parents: 78887
diff changeset
5520 should never be set globally, the intention is to let-bind it.")
66496
63563507d684 (tramp-completion-mode): defvar moved up.
Richard M. Stallman <rms@gnu.org>
parents: 66135
diff changeset
5521
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5522 ;; Necessary because `tramp-file-name-regexp-unified' and
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5523 ;; `tramp-completion-file-name-regexp-unified' aren't different. If
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5524 ;; nil, `tramp-completion-run-real-handler' is called (i.e. forwarding
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5525 ;; to `tramp-file-name-handler'). Otherwise, it takes
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5526 ;; `tramp-run-real-handler'. Using `last-input-event' is a little bit
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5527 ;; risky, because completing a file might require loading other files,
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5528 ;; like "~/.netrc", and for them it shouldn't be decided based on that
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5529 ;; variable. On the other hand, those files shouldn't have partial
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
5530 ;; Tramp file name syntax. Maybe another variable should be introduced
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
5531 ;; overwriting this check in such cases. Or we change Tramp file name
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5532 ;; syntax in order to avoid ambiguities, like in XEmacs ...
84833
b8f420afb6df * net/tramp.el (tramp-completion-mode-p): Rename from
Michael Albinus <michael.albinus@gmx.de>
parents: 84739
diff changeset
5533 (defun tramp-completion-mode-p ()
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5534 "Checks whether method / user name / host name completion is active."
84833
b8f420afb6df * net/tramp.el (tramp-completion-mode-p): Rename from
Michael Albinus <michael.albinus@gmx.de>
parents: 84739
diff changeset
5535 (or
85067
4636000015c5 * net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
5536 ;; Signal from outside.
4636000015c5 * net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
5537 tramp-completion-mode
4636000015c5 * net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
5538 ;; Emacs.
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
5539 (equal last-input-event 'tab)
84833
b8f420afb6df * net/tramp.el (tramp-completion-mode-p): Rename from
Michael Albinus <michael.albinus@gmx.de>
parents: 84739
diff changeset
5540 (and (natnump last-input-event)
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
5541 (or
85067
4636000015c5 * net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
5542 ;; ?\t has event-modifier 'control.
93036
50a5f7c885c1 (tramp-completion-mode-p): Don't use char-equal for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92982
diff changeset
5543 (equal last-input-event ?\t)
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
5544 (and (not (event-modifiers last-input-event))
93036
50a5f7c885c1 (tramp-completion-mode-p): Don't use char-equal for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92982
diff changeset
5545 (or (equal last-input-event ?\?)
50a5f7c885c1 (tramp-completion-mode-p): Don't use char-equal for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92982
diff changeset
5546 (equal last-input-event ?\ )))))
85067
4636000015c5 * net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
5547 ;; XEmacs.
84833
b8f420afb6df * net/tramp.el (tramp-completion-mode-p): Rename from
Michael Albinus <michael.albinus@gmx.de>
parents: 84739
diff changeset
5548 (and (featurep 'xemacs)
b8f420afb6df * net/tramp.el (tramp-completion-mode-p): Rename from
Michael Albinus <michael.albinus@gmx.de>
parents: 84739
diff changeset
5549 ;; `last-input-event' might be nil.
b8f420afb6df * net/tramp.el (tramp-completion-mode-p): Rename from
Michael Albinus <michael.albinus@gmx.de>
parents: 84739
diff changeset
5550 (not (null last-input-event))
b8f420afb6df * net/tramp.el (tramp-completion-mode-p): Rename from
Michael Albinus <michael.albinus@gmx.de>
parents: 84739
diff changeset
5551 ;; `last-input-event' may have no character approximation.
b8f420afb6df * net/tramp.el (tramp-completion-mode-p): Rename from
Michael Albinus <michael.albinus@gmx.de>
parents: 84739
diff changeset
5552 (funcall (symbol-function 'event-to-character) last-input-event)
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
5553 (or
85067
4636000015c5 * net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents: 85041
diff changeset
5554 ;; ?\t has event-modifier 'control.
93036
50a5f7c885c1 (tramp-completion-mode-p): Don't use char-equal for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92982
diff changeset
5555 (equal
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
5556 (funcall (symbol-function 'event-to-character)
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
5557 last-input-event) ?\t)
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
5558 (and (not (event-modifiers last-input-event))
93036
50a5f7c885c1 (tramp-completion-mode-p): Don't use char-equal for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92982
diff changeset
5559 (or (equal
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
5560 (funcall (symbol-function 'event-to-character)
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
5561 last-input-event) ?\?)
93036
50a5f7c885c1 (tramp-completion-mode-p): Don't use char-equal for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92982
diff changeset
5562 (equal
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
5563 (funcall (symbol-function 'event-to-character)
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
5564 last-input-event) ?\ )))))))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5565
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5566 ;; Method, host name and user name completion.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5567 ;; `tramp-completion-dissect-file-name' returns a list of
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5568 ;; tramp-file-name structures. For all of them we return possible completions.
70318
77201b466c80 * net/tramp.el (tramp-completion-file-name-handler-alist)
Michael Albinus <michael.albinus@gmx.de>
parents: 70276
diff changeset
5569 ;;;###autoload
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5570 (defun tramp-completion-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
5571 "Like `file-name-all-completions' for partial Tramp files."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5572
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5573 (let* ((fullname (tramp-drop-volume-letter
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5574 (expand-file-name filename directory)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5575 ;; Possible completion structures.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5576 (v (tramp-completion-dissect-file-name fullname))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5577 result result1)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5578
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5579 (while v
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5580 (let* ((car (car v))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5581 (method (tramp-file-name-method car))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5582 (user (tramp-file-name-user car))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5583 (host (tramp-file-name-host car))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5584 (localname (tramp-file-name-localname car))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5585 (m (tramp-find-method method user host))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5586 (tramp-current-user user) ; see `tramp-parse-passwd'
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5587 all-user-hosts)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5588
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5589 (unless localname ;; Nothing to complete.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5590
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5591 (if (or user host)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5592
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5593 ;; Method dependent user / host combinations.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5594 (progn
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
5595 (mapc
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5596 (lambda (x)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5597 (setq all-user-hosts
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5598 (append all-user-hosts
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5599 (funcall (nth 0 x) (nth 1 x)))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5600 (tramp-get-completion-function m))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5601
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
5602 (setq result
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
5603 (append result
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
5604 (mapcar
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
5605 (lambda (x)
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
5606 (tramp-get-completion-user-host
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
5607 method user host (nth 0 x) (nth 1 x)))
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
5608 (delq nil all-user-hosts)))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5609
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5610 ;; Possible methods.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5611 (setq result
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5612 (append result (tramp-get-completion-methods m)))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5613
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5614 (setq v (cdr v))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5615
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5616 ;; Unify list, remove nil elements.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5617 (while result
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5618 (let ((car (car result)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5619 (when car
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5620 (add-to-list
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5621 'result1
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5622 (substring car (length (tramp-drop-volume-letter directory)))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5623 (setq result (cdr result))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5624
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5625 ;; Complete local parts.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5626 (append
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5627 result1
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5628 (condition-case nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5629 (tramp-completion-run-real-handler
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5630 'file-name-all-completions (list filename directory))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5631 (error nil)))))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5632
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5633 ;; Method, host name and user name completion for a file.
70318
77201b466c80 * net/tramp.el (tramp-completion-file-name-handler-alist)
Michael Albinus <michael.albinus@gmx.de>
parents: 70276
diff changeset
5634 ;;;###autoload
74766
ca4412906dbd * net/ange-ftp.el (ange-ftp-file-name-completion): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 74739
diff changeset
5635 (defun tramp-completion-handle-file-name-completion
ca4412906dbd * net/ange-ftp.el (ange-ftp-file-name-completion): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 74739
diff changeset
5636 (filename directory &optional predicate)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5637 "Like `file-name-completion' for Tramp files."
74766
ca4412906dbd * net/ange-ftp.el (ange-ftp-file-name-completion): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 74739
diff changeset
5638 (try-completion
ca4412906dbd * net/ange-ftp.el (ange-ftp-file-name-completion): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 74739
diff changeset
5639 filename
ca4412906dbd * net/ange-ftp.el (ange-ftp-file-name-completion): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 74739
diff changeset
5640 (mapcar 'list (file-name-all-completions filename directory))
74777
948c86bf6396 * net/tramp.el (tramp-default-method): We still need to check for
Michael Albinus <michael.albinus@gmx.de>
parents: 74766
diff changeset
5641 (when predicate
948c86bf6396 * net/tramp.el (tramp-default-method): We still need to check for
Michael Albinus <michael.albinus@gmx.de>
parents: 74766
diff changeset
5642 (lambda (x) (funcall predicate (expand-file-name (car x) directory))))))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5643
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5644 ;; I misuse a little bit the tramp-file-name structure in order to handle
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5645 ;; completion possibilities for partial methods / user names / host names.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5646 ;; Return value is a list of tramp-file-name structures according to possible
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5647 ;; completions. If "localname" is non-nil it means there
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5648 ;; shouldn't be a completion anymore.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5649
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5650 ;; Expected results:
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5651
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5652 ;; "/x" "/[x" "/x@" "/[x@" "/x@y" "/[x@y"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5653 ;; [nil nil "x" nil] [nil "x" nil nil] [nil "x" "y" nil]
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5654 ;; [nil "x" nil nil]
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5655 ;; ["x" nil nil nil]
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5656
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5657 ;; "/x:" "/x:y" "/x:y:"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5658 ;; [nil nil "x" ""] [nil nil "x" "y"] ["x" nil "y" ""]
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5659 ;; "/[x/" "/[x/y"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5660 ;; ["x" nil "" nil] ["x" nil "y" nil]
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5661 ;; ["x" "" nil nil] ["x" "y" nil nil]
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5662
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5663 ;; "/x:y@" "/x:y@z" "/x:y@z:"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5664 ;; [nil nil "x" "y@"] [nil nil "x" "y@z"] ["x" "y" "z" ""]
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5665 ;; "/[x/y@" "/[x/y@z"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5666 ;; ["x" nil "y" nil] ["x" "y" "z" nil]
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5667 (defun tramp-completion-dissect-file-name (name)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5668 "Returns a list of `tramp-file-name' structures.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5669 They are collected by `tramp-completion-dissect-file-name1'."
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5670
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5671 (let* ((result)
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5672 (x-nil "\\|\\(\\)")
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5673 (tramp-completion-ipv6-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5674 (format
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5675 "[^%s]*"
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5676 (if (zerop (length tramp-postfix-ipv6-format))
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5677 tramp-postfix-host-format
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5678 tramp-postfix-ipv6-format)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5679 ;; "/method" "/[method"
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5680 (tramp-completion-file-name-structure1
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5681 (list (concat tramp-prefix-regexp "\\(" tramp-method-regexp x-nil "\\)$")
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5682 1 nil nil nil))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5683 ;; "/user" "/[user"
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5684 (tramp-completion-file-name-structure2
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5685 (list (concat tramp-prefix-regexp "\\(" tramp-user-regexp x-nil "\\)$")
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5686 nil 1 nil nil))
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5687 ;; "/host" "/[host"
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5688 (tramp-completion-file-name-structure3
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5689 (list (concat tramp-prefix-regexp "\\(" tramp-host-regexp x-nil "\\)$")
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5690 nil nil 1 nil))
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5691 ;; "/[ipv6" "/[ipv6"
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5692 (tramp-completion-file-name-structure4
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5693 (list (concat tramp-prefix-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5694 tramp-prefix-ipv6-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5695 "\\(" tramp-completion-ipv6-regexp x-nil "\\)$")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5696 nil nil 1 nil))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5697 ;; "/user@host" "/[user@host"
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5698 (tramp-completion-file-name-structure5
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5699 (list (concat tramp-prefix-regexp
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5700 "\\(" tramp-user-regexp "\\)" tramp-postfix-user-regexp
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5701 "\\(" tramp-host-regexp x-nil "\\)$")
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5702 nil 1 2 nil))
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5703 ;; "/user@[ipv6" "/[user@ipv6"
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5704 (tramp-completion-file-name-structure6
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5705 (list (concat tramp-prefix-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5706 "\\(" tramp-user-regexp "\\)" tramp-postfix-user-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5707 tramp-prefix-ipv6-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5708 "\\(" tramp-completion-ipv6-regexp x-nil "\\)$")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5709 nil 1 2 nil))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5710 ;; "/method:user" "/[method/user" "/method://user"
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5711 (tramp-completion-file-name-structure7
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5712 (list (concat tramp-prefix-regexp
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5713 "\\(" tramp-method-regexp "\\)" tramp-postfix-method-regexp
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5714 "\\(" tramp-user-regexp x-nil "\\)$")
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5715 1 2 nil nil))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5716 ;; "/method:host" "/[method/host" "/method://host"
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5717 (tramp-completion-file-name-structure8
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5718 (list (concat tramp-prefix-regexp
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5719 "\\(" tramp-method-regexp "\\)" tramp-postfix-method-regexp
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5720 "\\(" tramp-host-regexp x-nil "\\)$")
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5721 1 nil 2 nil))
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5722 ;; "/method:[ipv6" "/[method/ipv6" "/method://[ipv6"
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5723 (tramp-completion-file-name-structure9
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5724 (list (concat tramp-prefix-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5725 "\\(" tramp-method-regexp "\\)" tramp-postfix-method-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5726 tramp-prefix-ipv6-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5727 "\\(" tramp-completion-ipv6-regexp x-nil "\\)$")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5728 1 nil 2 nil))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5729 ;; "/method:user@host" "/[method/user@host" "/method://user@host"
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5730 (tramp-completion-file-name-structure10
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5731 (list (concat tramp-prefix-regexp
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5732 "\\(" tramp-method-regexp "\\)" tramp-postfix-method-regexp
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5733 "\\(" tramp-user-regexp "\\)" tramp-postfix-user-regexp
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5734 "\\(" tramp-host-regexp x-nil "\\)$")
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5735 1 2 3 nil))
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5736 ;; "/method:user@[ipv6" "/[method/user@ipv6" "/method://user@[ipv6"
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5737 (tramp-completion-file-name-structure11
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5738 (list (concat tramp-prefix-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5739 "\\(" tramp-method-regexp "\\)" tramp-postfix-method-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5740 "\\(" tramp-user-regexp "\\)" tramp-postfix-user-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5741 tramp-prefix-ipv6-regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5742 "\\(" tramp-completion-ipv6-regexp x-nil "\\)$")
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5743 1 2 3 nil))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5744 ;; "/method: "/method:/"
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5745 (tramp-completion-file-name-structure12
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5746 (list
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5747 (if (equal tramp-syntax 'url)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5748 (concat tramp-prefix-regexp
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5749 "\\(" tramp-method-regexp "\\)"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5750 "\\(" (substring tramp-postfix-method-regexp 0 1)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5751 "\\|" (substring tramp-postfix-method-regexp 1 2) "\\)"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5752 "\\(" "\\)$")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5753 ;; Should not match if not URL syntax.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5754 (concat tramp-prefix-regexp "/$"))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5755 1 3 nil nil))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5756 ;; "/method: "/method:/"
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5757 (tramp-completion-file-name-structure13
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5758 (list
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5759 (if (equal tramp-syntax 'url)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5760 (concat tramp-prefix-regexp
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5761 "\\(" tramp-method-regexp "\\)"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5762 "\\(" (substring tramp-postfix-method-regexp 0 1)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5763 "\\|" (substring tramp-postfix-method-regexp 1 2) "\\)"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5764 "\\(" "\\)$")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5765 ;; Should not match if not URL syntax.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5766 (concat tramp-prefix-regexp "/$"))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5767 1 nil 3 nil)))
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5768
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
5769 (mapc (lambda (regexp)
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5770 (add-to-list 'result
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5771 (tramp-completion-dissect-file-name1 regexp name)))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5772 (list
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5773 tramp-completion-file-name-structure1
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5774 tramp-completion-file-name-structure2
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5775 tramp-completion-file-name-structure3
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5776 tramp-completion-file-name-structure4
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5777 tramp-completion-file-name-structure5
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5778 tramp-completion-file-name-structure6
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5779 tramp-completion-file-name-structure7
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5780 tramp-completion-file-name-structure8
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5781 tramp-completion-file-name-structure9
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5782 tramp-completion-file-name-structure10
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5783 tramp-completion-file-name-structure11
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5784 tramp-completion-file-name-structure12
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5785 tramp-completion-file-name-structure13
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5786 tramp-file-name-structure))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5787
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5788 (delq nil result)))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5789
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5790 (defun tramp-completion-dissect-file-name1 (structure name)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5791 "Returns a `tramp-file-name' structure matching STRUCTURE.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5792 The structure consists of remote method, remote user,
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
5793 remote host and localname (filename on remote host)."
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5794
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5795 (save-match-data
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5796 (when (string-match (nth 0 structure) name)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5797 (let ((method (and (nth 1 structure)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5798 (match-string (nth 1 structure) name)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5799 (user (and (nth 2 structure)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5800 (match-string (nth 2 structure) name)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5801 (host (and (nth 3 structure)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5802 (match-string (nth 3 structure) name)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5803 (localname (and (nth 4 structure)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5804 (match-string (nth 4 structure) name))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5805 (vector method user host localname)))))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5806
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5807 ;; This function returns all possible method completions, adding the
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5808 ;; trailing method delimeter.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5809 (defun tramp-get-completion-methods (partial-method)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5810 "Returns all method completions for PARTIAL-METHOD."
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5811 (mapcar
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5812 (lambda (method)
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5813 (and method
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
5814 (string-match (concat "^" (regexp-quote partial-method)) method)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5815 (tramp-completion-make-tramp-file-name method nil nil nil)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5816 (mapcar 'car tramp-methods)))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5817
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5818 ;; Compares partial user and host names with possible completions.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5819 (defun tramp-get-completion-user-host (method partial-user partial-host user host)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5820 "Returns the most expanded string for user and host name completion.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5821 PARTIAL-USER must match USER, PARTIAL-HOST must match HOST."
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5822 (cond
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5823
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5824 ((and partial-user partial-host)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5825 (if (and host
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5826 (string-match (concat "^" (regexp-quote partial-host)) host)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5827 (string-equal partial-user (or user partial-user)))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5828 (setq user partial-user)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5829 (setq user nil
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5830 host nil)))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5831
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5832 (partial-user
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5833 (setq host nil)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5834 (unless
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5835 (and user (string-match (concat "^" (regexp-quote partial-user)) user))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5836 (setq user nil)))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5837
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5838 (partial-host
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5839 (setq user nil)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5840 (unless
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5841 (and host (string-match (concat "^" (regexp-quote partial-host)) host))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5842 (setq host nil)))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5843
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5844 (t (setq user nil
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5845 host nil)))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5846
47578
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
5847 (unless (zerop (+ (length user) (length host)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5848 (tramp-completion-make-tramp-file-name method user host nil)))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5849
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5850 (defun tramp-parse-rhosts (filename)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5851 "Return a list of (user host) tuples allowed to access.
47578
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
5852 Either user or host may be nil."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5853 ;; On Windows, there are problems in completion when
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5854 ;; `default-directory' is remote.
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
5855 (let ((default-directory (tramp-compat-temporary-file-directory))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5856 res)
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5857 (when (file-readable-p filename)
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5858 (with-temp-buffer
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5859 (insert-file-contents filename)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5860 (goto-char (point-min))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5861 (while (not (eobp))
47578
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
5862 (push (tramp-parse-rhosts-group) res))))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5863 res))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5864
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5865 (defun tramp-parse-rhosts-group ()
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5866 "Return a (user host) tuple allowed to access.
47578
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
5867 Either user or host may be nil."
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5868 (let ((result)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5869 (regexp
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5870 (concat
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5871 "^\\(" tramp-host-regexp "\\)"
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5872 "\\([ \t]+" "\\(" tramp-user-regexp "\\)" "\\)?")))
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
5873 (narrow-to-region (point) (tramp-compat-line-end-position))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5874 (when (re-search-forward regexp nil t)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5875 (setq result (append (list (match-string 3) (match-string 1)))))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5876 (widen)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5877 (forward-line 1)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5878 result))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5879
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5880 (defun tramp-parse-shosts (filename)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5881 "Return a list of (user host) tuples allowed to access.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5882 User is always nil."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5883 ;; On Windows, there are problems in completion when
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5884 ;; `default-directory' is remote.
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
5885 (let ((default-directory (tramp-compat-temporary-file-directory))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5886 res)
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5887 (when (file-readable-p filename)
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5888 (with-temp-buffer
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5889 (insert-file-contents filename)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5890 (goto-char (point-min))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5891 (while (not (eobp))
47578
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
5892 (push (tramp-parse-shosts-group) res))))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5893 res))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5894
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5895 (defun tramp-parse-shosts-group ()
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5896 "Return a (user host) tuple allowed to access.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5897 User is always nil."
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5898 (let ((result)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5899 (regexp (concat "^\\(" tramp-host-regexp "\\)")))
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
5900 (narrow-to-region (point) (tramp-compat-line-end-position))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5901 (when (re-search-forward regexp nil t)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5902 (setq result (list nil (match-string 1))))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5903 (widen)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5904 (or
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5905 (> (skip-chars-forward ",") 0)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5906 (forward-line 1))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5907 result))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5908
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5909 (defun tramp-parse-sconfig (filename)
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5910 "Return a list of (user host) tuples allowed to access.
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5911 User is always nil."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5912 ;; On Windows, there are problems in completion when
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5913 ;; `default-directory' is remote.
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
5914 (let ((default-directory (tramp-compat-temporary-file-directory))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5915 res)
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5916 (when (file-readable-p filename)
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5917 (with-temp-buffer
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5918 (insert-file-contents filename)
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5919 (goto-char (point-min))
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5920 (while (not (eobp))
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5921 (push (tramp-parse-sconfig-group) res))))
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5922 res))
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5923
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5924 (defun tramp-parse-sconfig-group ()
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5925 "Return a (user host) tuple allowed to access.
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5926 User is always nil."
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5927 (let ((result)
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5928 (regexp (concat "^[ \t]*Host[ \t]+" "\\(" tramp-host-regexp "\\)")))
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
5929 (narrow-to-region (point) (tramp-compat-line-end-position))
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5930 (when (re-search-forward regexp nil t)
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5931 (setq result (list nil (match-string 1))))
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5932 (widen)
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5933 (or
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5934 (> (skip-chars-forward ",") 0)
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5935 (forward-line 1))
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5936 result))
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5937
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
5938 (defun tramp-parse-shostkeys (dirname)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
5939 "Return a list of (user host) tuples allowed to access.
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
5940 User is always nil."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5941 ;; On Windows, there are problems in completion when
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5942 ;; `default-directory' is remote.
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
5943 (let* ((default-directory (tramp-compat-temporary-file-directory))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5944 (regexp (concat "^key_[0-9]+_\\(" tramp-host-regexp "\\)\\.pub$"))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5945 (files (when (file-directory-p dirname) (directory-files dirname)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5946 result)
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
5947 (while files
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
5948 (when (string-match regexp (car files))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
5949 (push (list nil (match-string 1 (car files))) result))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
5950 (setq files (cdr files)))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
5951 result))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
5952
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
5953 (defun tramp-parse-sknownhosts (dirname)
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
5954 "Return a list of (user host) tuples allowed to access.
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
5955 User is always nil."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5956 ;; On Windows, there are problems in completion when
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5957 ;; `default-directory' is remote.
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
5958 (let* ((default-directory (tramp-compat-temporary-file-directory))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5959 (regexp (concat "^\\(" tramp-host-regexp
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5960 "\\)\\.ssh-\\(dss\\|rsa\\)\\.pub$"))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5961 (files (when (file-directory-p dirname) (directory-files dirname)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5962 result)
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
5963 (while files
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
5964 (when (string-match regexp (car files))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
5965 (push (list nil (match-string 1 (car files))) result))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
5966 (setq files (cdr files)))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
5967 result))
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
5968
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5969 (defun tramp-parse-hosts (filename)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5970 "Return a list of (user host) tuples allowed to access.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5971 User is always nil."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5972 ;; On Windows, there are problems in completion when
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5973 ;; `default-directory' is remote.
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
5974 (let ((default-directory (tramp-compat-temporary-file-directory))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
5975 res)
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5976 (when (file-readable-p filename)
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5977 (with-temp-buffer
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5978 (insert-file-contents filename)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5979 (goto-char (point-min))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5980 (while (not (eobp))
47578
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
5981 (push (tramp-parse-hosts-group) res))))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5982 res))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5983
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5984 (defun tramp-parse-hosts-group ()
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5985 "Return a (user host) tuple allowed to access.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5986 User is always nil."
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5987 (let ((result)
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5988 (regexp
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5989 (concat "^\\(" tramp-ipv6-regexp "\\|" tramp-host-regexp "\\)")))
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
5990 (narrow-to-region (point) (tramp-compat-line-end-position))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5991 (when (re-search-forward regexp nil t)
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
5992 (setq result (list nil (match-string 1))))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5993 (widen)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5994 (or
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5995 (> (skip-chars-forward " \t") 0)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5996 (forward-line 1))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5997 result))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
5998
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
5999 ;; For su-alike methods it would be desirable to return "root@localhost"
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
6000 ;; as default. Unfortunately, we have no information whether any user name
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6001 ;; has been typed already. So we use `tramp-current-user' as indication,
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
6002 ;; assuming it is set in `tramp-completion-handle-file-name-all-completions'.
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6003 (defun tramp-parse-passwd (filename)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6004 "Return a list of (user host) tuples allowed to access.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6005 Host is always \"localhost\"."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6006 ;; On Windows, there are problems in completion when
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6007 ;; `default-directory' is remote.
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
6008 (let ((default-directory (tramp-compat-temporary-file-directory))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6009 res)
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
6010 (if (zerop (length tramp-current-user))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6011 '(("root" nil))
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
6012 (when (file-readable-p filename)
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6013 (with-temp-buffer
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6014 (insert-file-contents filename)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6015 (goto-char (point-min))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6016 (while (not (eobp))
47578
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6017 (push (tramp-parse-passwd-group) res))))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6018 res)))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6019
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6020 (defun tramp-parse-passwd-group ()
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6021 "Return a (user host) tuple allowed to access.
47578
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6022 Host is always \"localhost\"."
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6023 (let ((result)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6024 (regexp (concat "^\\(" tramp-user-regexp "\\):")))
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
6025 (narrow-to-region (point) (tramp-compat-line-end-position))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6026 (when (re-search-forward regexp nil t)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6027 (setq result (list (match-string 1) "localhost")))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6028 (widen)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6029 (forward-line 1)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6030 result))
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6031
47578
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6032 (defun tramp-parse-netrc (filename)
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6033 "Return a list of (user host) tuples allowed to access.
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6034 User may be nil."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6035 ;; On Windows, there are problems in completion when
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6036 ;; `default-directory' is remote.
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
6037 (let ((default-directory (tramp-compat-temporary-file-directory))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6038 res)
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
6039 (when (file-readable-p filename)
47578
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6040 (with-temp-buffer
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6041 (insert-file-contents filename)
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6042 (goto-char (point-min))
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6043 (while (not (eobp))
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6044 (push (tramp-parse-netrc-group) res))))
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6045 res))
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6046
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6047 (defun tramp-parse-netrc-group ()
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6048 "Return a (user host) tuple allowed to access.
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6049 User may be nil."
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6050 (let ((result)
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6051 (regexp
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6052 (concat
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6053 "^[ \t]*machine[ \t]+" "\\(" tramp-host-regexp "\\)"
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6054 "\\([ \t]+login[ \t]+" "\\(" tramp-user-regexp "\\)" "\\)?")))
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
6055 (narrow-to-region (point) (tramp-compat-line-end-position))
47578
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6056 (when (re-search-forward regexp nil t)
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6057 (setq result (list (match-string 3) (match-string 1))))
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6058 (widen)
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6059 (forward-line 1)
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6060 result))
6e910ba94c42 Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47577
diff changeset
6061
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6062 (defun tramp-parse-putty (registry)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6063 "Return a list of (user host) tuples allowed to access.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6064 User is always nil."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6065 ;; On Windows, there are problems in completion when
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6066 ;; `default-directory' is remote.
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
6067 (let ((default-directory (tramp-compat-temporary-file-directory))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6068 res)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6069 (with-temp-buffer
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
6070 (when (zerop (tramp-local-call-process "reg" nil t nil "query" registry))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6071 (goto-char (point-min))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6072 (while (not (eobp))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6073 (push (tramp-parse-putty-group registry) res))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6074 res))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6075
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6076 (defun tramp-parse-putty-group (registry)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6077 "Return a (user host) tuple allowed to access.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6078 User is always nil."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6079 (let ((result)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6080 (regexp (concat (regexp-quote registry) "\\\\\\(.+\\)")))
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
6081 (narrow-to-region (point) (tramp-compat-line-end-position))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6082 (when (re-search-forward regexp nil t)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6083 (setq result (list nil (match-string 1))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6084 (widen)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6085 (forward-line 1)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6086 result))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6087
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6088 ;;; Internal Functions:
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6089
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6090 (defun tramp-maybe-send-script (vec script name)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6091 "Define in remote shell function NAME implemented as SCRIPT.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6092 Only send the definition if it has not already been done."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6093 (let* ((p (tramp-get-connection-process vec))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6094 (scripts (tramp-get-connection-property p "scripts" nil)))
85089
8fb95bcda144 * net/tramp.el (tramp-find-foreign-file-name-handler): Check also
Michael Albinus <michael.albinus@gmx.de>
parents: 85067
diff changeset
6095 (unless (member name scripts)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6096 (tramp-message vec 5 "Sending script `%s'..." name)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6097 ;; The script could contain a call of Perl. This is masked with `%s'.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6098 (tramp-send-command-and-check
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6099 vec
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6100 (format "%s () {\n%s\n}" name
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6101 (format script (tramp-get-remote-perl vec))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6102 (tramp-set-connection-property p "scripts" (cons name scripts))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6103 (tramp-message vec 5 "Sending script `%s'...done." name))))
58540
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
6104
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6105 (defun tramp-set-auto-save ()
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6106 (when (and ;; ange-ftp has its own auto-save mechanism
62344
5a19ff64befb Sync with Tramp 2.0.49.
Michael Albinus <michael.albinus@gmx.de>
parents: 60763
diff changeset
6107 (eq (tramp-find-foreign-file-name-handler (buffer-file-name))
5a19ff64befb Sync with Tramp 2.0.49.
Michael Albinus <michael.albinus@gmx.de>
parents: 60763
diff changeset
6108 'tramp-sh-file-name-handler)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6109 auto-save-default)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6110 (auto-save-mode 1)))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6111 (add-hook 'find-file-hooks 'tramp-set-auto-save t)
68335
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
6112 (add-hook 'tramp-unload-hook
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
6113 (lambda ()
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
6114 (remove-hook 'find-file-hooks 'tramp-set-auto-save)))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6115
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6116 (defun tramp-run-test (switch filename)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6117 "Run `test' on the remote system, given a SWITCH and a FILENAME.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6118 Returns the exit code of the `test' program."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6119 (with-parsed-tramp-file-name filename nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6120 (tramp-send-command-and-check
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6121 v
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6122 (format
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6123 "%s %s %s"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6124 (tramp-get-test-command v)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6125 switch
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6126 (tramp-shell-quote-argument localname)))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6127
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6128 (defun tramp-run-test2 (format-string file1 file2)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6129 "Run `test'-like program on the remote system, given FILE1, FILE2.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6130 FORMAT-STRING contains the program name, switches, and place holders.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6131 Returns the exit code of the `test' program. Barfs if the methods,
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6132 hosts, or files, disagree."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6133 (unless (tramp-equal-remote file1 file2)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6134 (with-parsed-tramp-file-name (if (tramp-tramp-file-p file1) file1 file2) nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6135 (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6136 v 'file-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6137 "tramp-run-test2 only implemented for same method, user, host")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6138 (with-parsed-tramp-file-name file1 v1
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6139 (with-parsed-tramp-file-name file1 v2
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6140 (tramp-send-command-and-check
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6141 v1
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6142 (format format-string
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6143 (tramp-shell-quote-argument v1-localname)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6144 (tramp-shell-quote-argument v2-localname))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6145
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6146 (defun tramp-buffer-name (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6147 "A name for the connection buffer VEC."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6148 ;; We must use `tramp-file-name-real-host', because for gateway
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6149 ;; methods the default port will be expanded later on, which would
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6150 ;; tamper the name.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6151 (let ((method (tramp-file-name-method vec))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6152 (user (tramp-file-name-user vec))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6153 (host (tramp-file-name-real-host vec)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6154 (if (not (zerop (length user)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6155 (format "*tramp/%s %s@%s*" method user host)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6156 (format "*tramp/%s %s*" method host))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6157
105718
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
6158 (defun tramp-delete-temp-file-function ()
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
6159 "Remove temporary files related to current buffer."
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
6160 (when (stringp tramp-temp-buffer-file-name)
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
6161 (condition-case nil
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
6162 (delete-file tramp-temp-buffer-file-name)
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
6163 (error nil))))
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
6164
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
6165 (add-hook 'kill-buffer-hook 'tramp-delete-temp-file-function)
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
6166 (add-hook 'tramp-cache-unload-hook
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
6167 (lambda ()
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
6168 (remove-hook 'kill-buffer-hook
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
6169 'tramp-delete-temp-file-function)))
828d51e45d15 * net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents: 105615
diff changeset
6170
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6171 (defun tramp-get-buffer (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6172 "Get the connection buffer to be used for VEC."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6173 (or (get-buffer (tramp-buffer-name vec))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6174 (with-current-buffer (get-buffer-create (tramp-buffer-name vec))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6175 (setq buffer-undo-list t)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6176 (setq default-directory
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6177 (tramp-make-tramp-file-name
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6178 (tramp-file-name-method vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6179 (tramp-file-name-user vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6180 (tramp-file-name-host vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6181 "/"))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6182 (current-buffer))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6183
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6184 (defun tramp-get-connection-buffer (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6185 "Get the connection buffer to be used for VEC.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6186 In case a second asynchronous communication has been started, it is different
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6187 from `tramp-get-buffer'."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6188 (or (tramp-get-connection-property vec "process-buffer" nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6189 (tramp-get-buffer vec)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6190
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6191 (defun tramp-get-connection-process (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6192 "Get the connection process to be used for VEC.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6193 In case a second asynchronous communication has been started, it is different
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6194 from the default one."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6195 (get-process
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6196 (or (tramp-get-connection-property vec "process-name" nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6197 (tramp-buffer-name vec))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6198
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6199 (defun tramp-debug-buffer-name (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6200 "A name for the debug buffer for VEC."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6201 ;; We must use `tramp-file-name-real-host', because for gateway
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6202 ;; methods the default port will be expanded later on, which would
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6203 ;; tamper the name.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6204 (let ((method (tramp-file-name-method vec))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6205 (user (tramp-file-name-user vec))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6206 (host (tramp-file-name-real-host vec)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6207 (if (not (zerop (length user)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6208 (format "*debug tramp/%s %s@%s*" method user host)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6209 (format "*debug tramp/%s %s*" method host))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6210
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6211 (defun tramp-get-debug-buffer (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6212 "Get the debug buffer for VEC."
59582
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
6213 (with-current-buffer
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6214 (get-buffer-create (tramp-debug-buffer-name vec))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6215 (when (bobp)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6216 (setq buffer-undo-list t)
84966
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
6217 ;; Activate outline-mode. This runs `text-mode-hook' and
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
6218 ;; `outline-mode-hook'. We must prevent that local processes
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
6219 ;; die. Yes: I've seen `flyspell-mode', which starts "ispell"
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
6220 ;; ...
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
6221 (let ((default-directory (tramp-compat-temporary-file-directory)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6222 (outline-mode))
84966
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
6223 (set (make-local-variable 'outline-regexp)
104125
fd4d8124e329 * net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents: 104097
diff changeset
6224 "[0-9]+:[0-9]+:[0-9]+\\.[0-9]+ [a-z0-9-]+ (\\([0-9]+\\)) #")
84966
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
6225 ; (set (make-local-variable 'outline-regexp)
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
6226 ; "[a-z.-]+:[0-9]+: [a-z0-9-]+ (\\([0-9]+\\)) #")
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
6227 (set (make-local-variable 'outline-level) 'tramp-outline-level))
59582
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
6228 (current-buffer)))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6229
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6230 (defun tramp-outline-level ()
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6231 "Return the depth to which a statement is nested in the outline.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6232 Point must be at the beginning of a header line.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6233
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6234 The outline level is equal to the verbosity of the Tramp message."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6235 (1+ (string-to-number (match-string 1))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6236
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6237 (defun tramp-find-executable
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6238 (vec progname dirlist &optional ignore-tilde ignore-path)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6239 "Searches for PROGNAME in $PATH and all directories mentioned in DIRLIST.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6240 First arg VEC specifies the connection, PROGNAME is the program
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6241 to search for, and DIRLIST gives the list of directories to
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6242 search. If IGNORE-TILDE is non-nil, directory names starting
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6243 with `~' will be ignored. If IGNORE-PATH is non-nil, searches
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6244 only in DIRLIST.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6245
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
6246 Returns the absolute file name of PROGNAME, if found, and nil otherwise.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6247
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6248 This function expects to be in the right *tramp* buffer."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6249 (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
6250 (let (result)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6251 ;; Check whether the executable is in $PATH. "which(1)" does not
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6252 ;; report always a correct error code; therefore we check the
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6253 ;; number of words it returns.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6254 (unless ignore-path
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6255 (tramp-send-command vec (format "which \\%s | wc -w" progname))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6256 (goto-char (point-min))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6257 (if (looking-at "^1$")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6258 (setq result (concat "\\" progname))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6259 (unless result
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6260 (when ignore-tilde
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6261 ;; Remove all ~/foo directories from dirlist. In Emacs 20,
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6262 ;; `remove' is in CL, and we want to avoid CL dependencies.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6263 (let (newdl d)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6264 (while dirlist
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6265 (setq d (car dirlist))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6266 (setq dirlist (cdr dirlist))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6267 (unless (char-equal ?~ (aref d 0))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6268 (setq newdl (cons d newdl))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6269 (setq dirlist (nreverse newdl))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6270 (tramp-send-command
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6271 vec
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6272 (format (concat "while read d; "
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6273 "do if test -x $d/%s -a -f $d/%s; "
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6274 "then echo tramp_executable $d/%s; "
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6275 "break; fi; done <<'EOF'\n"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6276 "%s\nEOF")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6277 progname progname progname (mapconcat 'identity dirlist "\n")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6278 (goto-char (point-max))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6279 (when (search-backward "tramp_executable " nil t)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6280 (skip-chars-forward "^ ")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6281 (skip-chars-forward " ")
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
6282 (setq result (buffer-substring
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
6283 (point) (tramp-compat-line-end-position)))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6284 result)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6285
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6286 (defun tramp-set-remote-path (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6287 "Sets the remote environment PATH to existing directories.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6288 I.e., for each directory in `tramp-remote-path', it is tested
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6289 whether it exists and if so, it is added to the environment
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6290 variable PATH."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6291 (tramp-message vec 5 (format "Setting $PATH environment variable"))
82603
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
6292 (tramp-send-command
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
6293 vec (format "PATH=%s; export PATH"
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
6294 (mapconcat 'identity (tramp-get-remote-path vec) ":"))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6295
91486
76c777ce052a * net/tramp.el (tramp-process-sentinel): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 88072
diff changeset
6296 ;; ------------------------------------------------------------
76c777ce052a * net/tramp.el (tramp-process-sentinel): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 88072
diff changeset
6297 ;; -- Communication with external shell --
76c777ce052a * net/tramp.el (tramp-process-sentinel): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 88072
diff changeset
6298 ;; ------------------------------------------------------------
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6299
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6300 (defun tramp-find-file-exists-command (vec)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6301 "Find a command on the remote host for checking if a file exists.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6302 Here, we are looking for a command which has zero exit status if the
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6303 file exists and nonzero exit status otherwise."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6304 (let ((existing "/")
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6305 (nonexisting
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6306 (tramp-shell-quote-argument "/ this file does not exist "))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6307 result)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6308 ;; The algorithm is as follows: we try a list of several commands.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6309 ;; For each command, we first run `$cmd /' -- this should return
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6310 ;; true, as the root directory always exists. And then we run
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6311 ;; `$cmd /this\ file\ does\ not\ exist ', hoping that the file indeed
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6312 ;; does not exist. This should return false. We use the first
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6313 ;; command we find that seems to work.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6314 ;; The list of commands to try is as follows:
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6315 ;; `ls -d' This works on most systems, but NetBSD 1.4
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6316 ;; has a bug: `ls' always returns zero exit
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6317 ;; status, even for files which don't exist.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6318 ;; `test -e' Some Bourne shells have a `test' builtin
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6319 ;; which does not know the `-e' option.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6320 ;; `/bin/test -e' For those, the `test' binary on disk normally
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6321 ;; provides the option. Alas, the binary
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6322 ;; is sometimes `/bin/test' and sometimes it's
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6323 ;; `/usr/bin/test'.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6324 ;; `/usr/bin/test -e' In case `/bin/test' does not exist.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6325 (unless (or
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6326 (and (setq result (format "%s -e" (tramp-get-test-command vec)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6327 (zerop (tramp-send-command-and-check
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6328 vec (format "%s %s" result existing)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6329 (not (zerop (tramp-send-command-and-check
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6330 vec (format "%s %s" result nonexisting)))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6331 (and (setq result "/bin/test -e")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6332 (zerop (tramp-send-command-and-check
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6333 vec (format "%s %s" result existing)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6334 (not (zerop (tramp-send-command-and-check
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6335 vec (format "%s %s" result nonexisting)))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6336 (and (setq result "/usr/bin/test -e")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6337 (zerop (tramp-send-command-and-check
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6338 vec (format "%s %s" result existing)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6339 (not (zerop (tramp-send-command-and-check
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6340 vec (format "%s %s" result nonexisting)))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6341 (and (setq result (format "%s -d" (tramp-get-ls-command vec)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6342 (zerop (tramp-send-command-and-check
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6343 vec (format "%s %s" result existing)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6344 (not (zerop (tramp-send-command-and-check
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6345 vec (format "%s %s" result nonexisting))))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6346 (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6347 vec 'file-error "Couldn't find command to check if file exists"))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6348 result))
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59582
diff changeset
6349
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6350 ;; CCC test ksh or bash found for tilde expansion?
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6351 (defun tramp-find-shell (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6352 "Opens a shell on the remote host which groks tilde expansion."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6353 (unless (tramp-get-connection-property vec "remote-shell" nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6354 (let (shell)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6355 (with-current-buffer (tramp-get-buffer vec)
85553
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6356 (tramp-send-command vec "echo ~root" t)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6357 (cond
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6358 ((string-match "^~root$" (buffer-string))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6359 (setq shell
82603
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
6360 (or (tramp-find-executable
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
6361 vec "bash" (tramp-get-remote-path vec) t)
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
6362 (tramp-find-executable
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
6363 vec "ksh" (tramp-get-remote-path vec) t)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6364 (unless shell
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6365 (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6366 vec 'file-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6367 "Couldn't find a shell which groks tilde expansion"))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6368 ;; Find arguments for this shell.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6369 (let ((alist tramp-sh-extra-args)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6370 item extra-args)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6371 (while (and alist (null extra-args))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6372 (setq item (pop alist))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6373 (when (string-match (car item) shell)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6374 (setq extra-args (cdr item))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6375 (when extra-args (setq shell (concat shell " " extra-args))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6376 (tramp-message
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6377 vec 5 "Starting remote shell `%s' for tilde expansion..." shell)
106470
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
6378 (let ((tramp-end-of-output tramp-initial-end-of-output))
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
6379 (tramp-send-command
85962
7f134b676a0c * net/tramp.el (tramp-handle-substitute-in-file-name): Don't
Michael Albinus <michael.albinus@gmx.de>
parents: 85943
diff changeset
6380 vec
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
6381 (format "PROMPT_COMMAND='' PS1=%s PS2='' PS3='' exec %s"
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
6382 (shell-quote-argument tramp-end-of-output) shell)
85962
7f134b676a0c * net/tramp.el (tramp-handle-substitute-in-file-name): Don't
Michael Albinus <michael.albinus@gmx.de>
parents: 85943
diff changeset
6383 t))
87921
c49bc2860fd0 * net/tramp.el (tramp-remote-process-environment): Set "LC_ALL=C".
Michael Albinus <michael.albinus@gmx.de>
parents: 87748
diff changeset
6384 ;; Setting prompts.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6385 (tramp-message vec 5 "Setting remote shell prompt...")
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
6386 (tramp-send-command
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
6387 vec (format "PS1=%s" (shell-quote-argument tramp-end-of-output)) t)
87322
e99e230d7eb3 * files.el (cd-absolute): Set `list-buffers-directory' in order to
Michael Albinus <michael.albinus@gmx.de>
parents: 87040
diff changeset
6388 (tramp-send-command vec "PS2=''" t)
e99e230d7eb3 * files.el (cd-absolute): Set `list-buffers-directory' in order to
Michael Albinus <michael.albinus@gmx.de>
parents: 87040
diff changeset
6389 (tramp-send-command vec "PS3=''" t)
e99e230d7eb3 * files.el (cd-absolute): Set `list-buffers-directory' in order to
Michael Albinus <michael.albinus@gmx.de>
parents: 87040
diff changeset
6390 (tramp-send-command vec "PROMPT_COMMAND=''" t)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6391 (tramp-message vec 5 "Setting remote shell prompt...done"))
87921
c49bc2860fd0 * net/tramp.el (tramp-remote-process-environment): Set "LC_ALL=C".
Michael Albinus <michael.albinus@gmx.de>
parents: 87748
diff changeset
6392
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6393 (t (tramp-message
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6394 vec 5 "Remote `%s' groks tilde expansion, good"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6395 (tramp-get-method-parameter
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6396 (tramp-file-name-method vec) 'tramp-remote-sh))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6397 (tramp-set-connection-property
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6398 vec "remote-shell"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6399 (tramp-get-method-parameter
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6400 (tramp-file-name-method vec) 'tramp-remote-sh))))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6401
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59582
diff changeset
6402 ;; ------------------------------------------------------------
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59582
diff changeset
6403 ;; -- Functions for establishing connection --
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59582
diff changeset
6404 ;; ------------------------------------------------------------
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6405
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6406 ;; The following functions are actions to be taken when seeing certain
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6407 ;; prompts from the remote host. See the variable
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6408 ;; `tramp-actions-before-shell' for usage of these functions.
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6409
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6410 (defun tramp-action-login (proc vec)
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6411 "Send the login name."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6412 (when (not (stringp tramp-current-user))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6413 (save-window-excursion
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6414 (let ((enable-recursive-minibuffers t))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6415 (pop-to-buffer (tramp-get-connection-buffer vec))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6416 (setq tramp-current-user (read-string (match-string 0))))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6417 (tramp-message vec 3 "Sending login name `%s'" tramp-current-user)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6418 (with-current-buffer (tramp-get-connection-buffer vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6419 (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
6420 (tramp-send-string vec tramp-current-user))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6421
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6422 (defun tramp-action-password (proc vec)
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6423 "Query the user for a password."
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
6424 (with-current-buffer (process-buffer proc)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
6425 (tramp-check-for-regexp proc tramp-password-prompt-regexp)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
6426 (tramp-message vec 3 "Sending %s" (match-string 1)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6427 (tramp-enter-password proc))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6428
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6429 (defun tramp-action-succeed (proc vec)
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6430 "Signal success in finding shell prompt."
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6431 (throw 'tramp-action 'ok))
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6432
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6433 (defun tramp-action-permission-denied (proc vec)
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6434 "Signal permission denied."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6435 (kill-process proc)
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6436 (throw 'tramp-action 'permission-denied))
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6437
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6438 (defun tramp-action-yesno (proc vec)
46992
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
6439 "Ask the user for confirmation using `yes-or-no-p'.
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
6440 Send \"yes\" to remote process on confirmation, abort otherwise.
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
6441 See also `tramp-action-yn'."
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6442 (save-window-excursion
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6443 (let ((enable-recursive-minibuffers t))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6444 (save-match-data (pop-to-buffer (tramp-get-connection-buffer vec)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6445 (unless (yes-or-no-p (match-string 0))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6446 (kill-process proc)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6447 (throw 'tramp-action 'permission-denied))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6448 (with-current-buffer (tramp-get-connection-buffer vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6449 (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
6450 (tramp-send-string vec "yes"))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6451
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6452 (defun tramp-action-yn (proc vec)
46992
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
6453 "Ask the user for confirmation using `y-or-n-p'.
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
6454 Send \"y\" to remote process on confirmation, abort otherwise.
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
6455 See also `tramp-action-yesno'."
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
6456 (save-window-excursion
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6457 (let ((enable-recursive-minibuffers t))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6458 (save-match-data (pop-to-buffer (tramp-get-connection-buffer vec)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6459 (unless (y-or-n-p (match-string 0))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6460 (kill-process proc)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6461 (throw 'tramp-action 'permission-denied))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6462 (with-current-buffer (tramp-get-connection-buffer vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6463 (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
6464 (tramp-send-string vec "y"))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6465
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6466 (defun tramp-action-terminal (proc vec)
47771
ac3dfc909b56 Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47683
diff changeset
6467 "Tell the remote host which terminal type to use.
ac3dfc909b56 Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47683
diff changeset
6468 The terminal type can be configured with `tramp-terminal-type'."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6469 (tramp-message vec 5 "Setting `%s' as terminal type." tramp-terminal-type)
85553
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6470 (with-current-buffer (tramp-get-connection-buffer vec)
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6471 (tramp-message vec 6 "\n%s" (buffer-string)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6472 (tramp-send-string vec tramp-terminal-type))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6473
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6474 (defun tramp-action-process-alive (proc vec)
55844
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
6475 "Check whether a process has finished."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6476 (unless (memq (process-status proc) '(run open))
55844
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
6477 (throw 'tramp-action 'process-died)))
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
6478
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6479 (defun tramp-action-out-of-band (proc vec)
55420
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
6480 "Check whether an out-of-band copy has finished."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6481 (cond ((and (memq (process-status proc) '(stop exit))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6482 (zerop (process-exit-status proc)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6483 (tramp-message vec 3 "Process has finished.")
55420
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
6484 (throw 'tramp-action 'ok))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6485 ((or (and (memq (process-status proc) '(stop exit))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6486 (not (zerop (process-exit-status proc))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6487 (memq (process-status proc) '(signal)))
59582
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
6488 ;; `scp' could have copied correctly, but set modes could have failed.
92796330257a Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents: 59031
diff changeset
6489 ;; This can be ignored.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6490 (with-current-buffer (process-buffer proc)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6491 (goto-char (point-min))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6492 (if (re-search-forward tramp-operation-not-permitted-regexp nil t)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6493 (progn
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6494 (tramp-message vec 5 "'set mode' error ignored.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6495 (tramp-message vec 3 "Process has finished.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6496 (throw 'tramp-action 'ok))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6497 (tramp-message vec 3 "Process has died.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6498 (throw 'tramp-action 'process-died))))
55420
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
6499 (t nil)))
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
6500
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6501 ;; Functions for processing the actions.
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6502
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6503 (defun tramp-process-one-action (proc vec actions)
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6504 "Wait for output from the shell and perform one action."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6505 (let (found todo item pattern action)
75148
bdffb0038313 * net/tramp.el: (tramp-process-one-action): Remove `with-timeout'.
Michael Albinus <michael.albinus@gmx.de>
parents: 75007
diff changeset
6506 (while (not found)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6507 ;; Reread output once all actions have been performed.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6508 ;; Obviously, the output was not complete.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6509 (tramp-accept-process-output proc 1)
75148
bdffb0038313 * net/tramp.el: (tramp-process-one-action): Remove `with-timeout'.
Michael Albinus <michael.albinus@gmx.de>
parents: 75007
diff changeset
6510 (setq todo actions)
bdffb0038313 * net/tramp.el: (tramp-process-one-action): Remove `with-timeout'.
Michael Albinus <michael.albinus@gmx.de>
parents: 75007
diff changeset
6511 (while todo
bdffb0038313 * net/tramp.el: (tramp-process-one-action): Remove `with-timeout'.
Michael Albinus <michael.albinus@gmx.de>
parents: 75007
diff changeset
6512 (setq item (pop todo))
98699
f3c1254483a0 * net/tramp.el (tramp-process-one-action): Embed regexp in
Michael Albinus <michael.albinus@gmx.de>
parents: 97613
diff changeset
6513 (setq pattern (format "\\(%s\\)\\'" (symbol-value (nth 0 item))))
75148
bdffb0038313 * net/tramp.el: (tramp-process-one-action): Remove `with-timeout'.
Michael Albinus <michael.albinus@gmx.de>
parents: 75007
diff changeset
6514 (setq action (nth 1 item))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6515 (tramp-message
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6516 vec 5 "Looking for regexp \"%s\" from remote shell" pattern)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6517 (when (tramp-check-for-regexp proc pattern)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6518 (tramp-message vec 5 "Call `%s'" (symbol-name action))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6519 (setq found (funcall action proc vec)))))
75148
bdffb0038313 * net/tramp.el: (tramp-process-one-action): Remove `with-timeout'.
Michael Albinus <michael.albinus@gmx.de>
parents: 75007
diff changeset
6520 found))
bdffb0038313 * net/tramp.el: (tramp-process-one-action): Remove `with-timeout'.
Michael Albinus <michael.albinus@gmx.de>
parents: 75007
diff changeset
6521
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6522 (defun tramp-process-actions (proc vec actions &optional timeout)
75148
bdffb0038313 * net/tramp.el: (tramp-process-one-action): Remove `with-timeout'.
Michael Albinus <michael.albinus@gmx.de>
parents: 75007
diff changeset
6523 "Perform actions until success or TIMEOUT."
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
6524 ;; Enable auth-source and password-cache.
101656
287ee0c13903 * net/tramp.el (tramp-process-actions, tramp-read-passwd): Allow
Michael Albinus <michael.albinus@gmx.de>
parents: 101282
diff changeset
6525 (tramp-set-connection-property proc "first-password-request" t)
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6526 (let (exit)
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6527 (while (not exit)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6528 (tramp-message proc 3 "Waiting for prompts from remote shell")
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6529 (setq exit
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6530 (catch 'tramp-action
75148
bdffb0038313 * net/tramp.el: (tramp-process-one-action): Remove `with-timeout'.
Michael Albinus <michael.albinus@gmx.de>
parents: 75007
diff changeset
6531 (if timeout
bdffb0038313 * net/tramp.el: (tramp-process-one-action): Remove `with-timeout'.
Michael Albinus <michael.albinus@gmx.de>
parents: 75007
diff changeset
6532 (with-timeout (timeout)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6533 (tramp-process-one-action proc vec actions))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6534 (tramp-process-one-action proc vec actions)))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6535 (with-current-buffer (tramp-get-connection-buffer vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6536 (tramp-message vec 6 "\n%s" (buffer-string)))
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6537 (unless (eq exit 'ok)
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
6538 (tramp-clear-passwd vec)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6539 (tramp-error-with-buffer
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6540 nil vec 'file-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6541 (cond
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6542 ((eq exit 'permission-denied) "Permission denied")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6543 ((eq exit 'process-died) "Process died")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6544 (t "Login failed"))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6545
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6546 ;; Utility functions.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6547
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6548 (defun tramp-accept-process-output (&optional proc timeout timeout-msecs)
64772
060177e931f8 Sync with Tramp 2.0.50.
Michael Albinus <michael.albinus@gmx.de>
parents: 64701
diff changeset
6549 "Like `accept-process-output' for Tramp processes.
060177e931f8 Sync with Tramp 2.0.50.
Michael Albinus <michael.albinus@gmx.de>
parents: 64701
diff changeset
6550 This is needed in order to hide `last-coding-system-used', which is set
060177e931f8 Sync with Tramp 2.0.50.
Michael Albinus <michael.albinus@gmx.de>
parents: 64701
diff changeset
6551 for process communication also."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6552 (with-current-buffer (process-buffer proc)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6553 (tramp-message proc 10 "%s %s" proc (process-status proc))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6554 (let (buffer-read-only last-coding-system-used)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6555 ;; Under Windows XP, accept-process-output doesn't return
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6556 ;; sometimes. So we add an additional timeout.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6557 (with-timeout ((or timeout 1))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6558 (accept-process-output proc timeout timeout-msecs)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6559 (tramp-message proc 10 "\n%s" (buffer-string))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6560
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6561 (defun tramp-check-for-regexp (proc regexp)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6562 "Check whether REGEXP is contained in process buffer of PROC.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6563 Erase echoed commands if exists."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6564 (with-current-buffer (process-buffer proc)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6565 (goto-char (point-min))
94975
5bb8f7b3f835 * net/tramp.el (tramp-echo-mark): Update docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 94677
diff changeset
6566
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6567 ;; Check whether we need to remove echo output.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6568 (when (and (tramp-get-connection-property proc "check-remote-echo" nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6569 (re-search-forward tramp-echoed-echo-mark-regexp nil t))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6570 (let ((begin (match-beginning 0)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6571 (when (re-search-forward tramp-echoed-echo-mark-regexp nil t)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6572 ;; Discard echo from remote output.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6573 (tramp-set-connection-property proc "check-remote-echo" nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6574 (tramp-message proc 5 "echo-mark found")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6575 (forward-line)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6576 (delete-region begin (point))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6577 (goto-char (point-min)))))
94975
5bb8f7b3f835 * net/tramp.el (tramp-echo-mark): Update docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 94677
diff changeset
6578
106597
b0e5aae20733 * net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 106508
diff changeset
6579 (when (or (not (tramp-get-connection-property proc "check-remote-echo" nil))
b0e5aae20733 * net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 106508
diff changeset
6580 ;; Sometimes, the echo string is suppressed on the remote side.
b0e5aae20733 * net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 106508
diff changeset
6581 (not (string-equal
b0e5aae20733 * net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 106508
diff changeset
6582 (substring-no-properties
b0e5aae20733 * net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 106508
diff changeset
6583 tramp-echo-mark-marker
b0e5aae20733 * net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 106508
diff changeset
6584 0 (min tramp-echo-mark-marker-length (1- (point-max))))
b0e5aae20733 * net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 106508
diff changeset
6585 (buffer-substring-no-properties
b0e5aae20733 * net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents: 106508
diff changeset
6586 1 (min (1+ tramp-echo-mark-marker-length) (point-max))))))
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
6587 ;; No echo to be handled, now we can look for the regexp.
94975
5bb8f7b3f835 * net/tramp.el (tramp-echo-mark): Update docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 94677
diff changeset
6588 (goto-char (point-min))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6589 (re-search-forward regexp nil t))))
64772
060177e931f8 Sync with Tramp 2.0.50.
Michael Albinus <michael.albinus@gmx.de>
parents: 64701
diff changeset
6590
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6591 (defun tramp-wait-for-regexp (proc timeout regexp)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6592 "Wait for a REGEXP to appear from process PROC within TIMEOUT seconds.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6593 Expects the output of PROC to be sent to the current buffer. Returns
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6594 the string that matched, or nil. Waits indefinitely if TIMEOUT is
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6595 nil."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6596 (with-current-buffer (process-buffer proc)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6597 (let ((found (tramp-check-for-regexp proc regexp))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6598 (start-time (current-time)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6599 (cond (timeout
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6600 ;; Work around a bug in XEmacs 21, where the timeout
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6601 ;; expires faster than it should. This degenerates
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6602 ;; to polling for buggy XEmacsen, but oh, well.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6603 (while (and (not found)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6604 (< (tramp-time-diff (current-time) start-time)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6605 timeout))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6606 (with-timeout (timeout)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6607 (while (not found)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6608 (tramp-accept-process-output proc 1)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6609 (unless (memq (process-status proc) '(run open))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6610 (tramp-error-with-buffer
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6611 nil proc 'file-error "Process has died"))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6612 (setq found (tramp-check-for-regexp proc regexp))))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6613 (t
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6614 (while (not found)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6615 (tramp-accept-process-output proc 1)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6616 (unless (memq (process-status proc) '(run open))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6617 (tramp-error-with-buffer
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6618 nil proc 'file-error "Process has died"))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6619 (setq found (tramp-check-for-regexp proc regexp)))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6620 (tramp-message proc 6 "\n%s" (buffer-string))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6621 (when (not found)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6622 (if timeout
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6623 (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6624 proc 'file-error "[[Regexp `%s' not found in %d secs]]"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6625 regexp timeout)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6626 (tramp-error proc 'file-error "[[Regexp `%s' not found]]" regexp)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6627 found)))
51177
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
6628
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
6629 (defun tramp-barf-if-no-shell-prompt (proc timeout &rest error-args)
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
6630 "Wait for shell prompt and barf if none appears.
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
6631 Looks at process PROC to see if a shell prompt appears in TIMEOUT
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
6632 seconds. If not, it produces an error message with the given ERROR-ARGS."
85553
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6633 (unless
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6634 (tramp-wait-for-regexp
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6635 proc timeout
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6636 (format
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6637 "\\(%s\\|%s\\)\\'" shell-prompt-pattern tramp-shell-prompt-pattern))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6638 (apply 'tramp-error-with-buffer nil proc 'file-error error-args)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6639
85553
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6640 ;; We don't call `tramp-send-string' in order to hide the password
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6641 ;; from the debug buffer, and because end-of-line handling of the
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6642 ;; string.
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6643 (defun tramp-enter-password (proc)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6644 "Prompt for a password and send it to the remote end."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6645 (process-send-string
85553
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6646 proc (concat (tramp-read-passwd proc)
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6647 (or (tramp-get-method-parameter
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6648 tramp-current-method
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6649 'tramp-password-end-of-line)
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6650 tramp-default-password-end-of-line))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6651
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6652 (defun tramp-open-connection-setup-interactive-shell (proc vec)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6653 "Set up an interactive shell.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6654 Mainly sets the prompt and the echo correctly. PROC is the shell
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6655 process to set up. VEC specifies the connection."
106470
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
6656 (let ((tramp-end-of-output tramp-initial-end-of-output))
86241
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6657 ;; It is useful to set the prompt in the following command because
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6658 ;; some people have a setting for $PS1 which /bin/sh doesn't know
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6659 ;; about and thus /bin/sh will display a strange prompt. For
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6660 ;; example, if $PS1 has "${CWD}" in the value, then ksh will
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6661 ;; display the current working directory but /bin/sh will display
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6662 ;; a dollar sign. The following command line sets $PS1 to a sane
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6663 ;; value, and works under Bourne-ish shells as well as csh-like
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6664 ;; shells. Daniel Pittman reports that the unusual positioning of
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6665 ;; the single quotes makes it work under `rc', too. We also unset
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6666 ;; the variable $ENV because that is read by some sh
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6667 ;; implementations (eg, bash when called as sh) on startup; this
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6668 ;; way, we avoid the startup file clobbering $PS1. $PROMP_COMMAND
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6669 ;; is another way to set the prompt in /bin/bash, it must be
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6670 ;; discarded as well.
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
6671 (tramp-send-command
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
6672 vec
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
6673 (format
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
6674 "exec env ENV='' PROMPT_COMMAND='' PS1=%s PS2='' PS3='' %s"
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
6675 (shell-quote-argument tramp-end-of-output)
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
6676 (tramp-get-method-parameter
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
6677 (tramp-file-name-method vec) 'tramp-remote-sh))
86241
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6678 t)
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6679
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6680 ;; Disable echo.
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6681 (tramp-message vec 5 "Setting up remote shell environment")
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6682 (tramp-send-command vec "stty -inlcr -echo kill '^U' erase '^H'" t)
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6683 ;; Check whether the echo has really been disabled. Some
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6684 ;; implementations, like busybox of embedded GNU/Linux, don't
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6685 ;; support disabling.
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6686 (tramp-send-command vec "echo foo" t)
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6687 (with-current-buffer (process-buffer proc)
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6688 (goto-char (point-min))
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6689 (when (looking-at "echo foo")
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6690 (tramp-set-connection-property proc "remote-echo" t)
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6691 (tramp-message vec 5 "Remote echo still on. Ok.")
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6692 ;; Make sure backspaces and their echo are enabled and no line
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6693 ;; width magic interferes with them.
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
6694 (tramp-send-command vec "stty icanon erase ^H cols 32767" t))))
86048
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6695
85553
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6696 (tramp-message vec 5 "Setting shell prompt")
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
6697 (tramp-send-command
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
6698 vec (format "PS1=%s" (shell-quote-argument tramp-end-of-output)) t)
87322
e99e230d7eb3 * files.el (cd-absolute): Set `list-buffers-directory' in order to
Michael Albinus <michael.albinus@gmx.de>
parents: 87040
diff changeset
6699 (tramp-send-command vec "PS2=''" t)
e99e230d7eb3 * files.el (cd-absolute): Set `list-buffers-directory' in order to
Michael Albinus <michael.albinus@gmx.de>
parents: 87040
diff changeset
6700 (tramp-send-command vec "PS3=''" t)
e99e230d7eb3 * files.el (cd-absolute): Set `list-buffers-directory' in order to
Michael Albinus <michael.albinus@gmx.de>
parents: 87040
diff changeset
6701 (tramp-send-command vec "PROMPT_COMMAND=''" t)
62344
5a19ff64befb Sync with Tramp 2.0.49.
Michael Albinus <michael.albinus@gmx.de>
parents: 60763
diff changeset
6702
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6703 ;; Try to set up the coding system correctly.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6704 ;; CCC this can't be the right way to do it. Hm.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6705 (tramp-message vec 5 "Determining coding system")
85553
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6706 (tramp-send-command vec "echo foo ; echo bar" t)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6707 (with-current-buffer (process-buffer proc)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6708 (goto-char (point-min))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6709 (if (featurep 'mule)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6710 ;; Use MULE to select the right EOL convention for communicating
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6711 ;; with the process.
85126
9a6e9b6e4a76 Sync with Tramp 2.1.11.
Michael Albinus <michael.albinus@gmx.de>
parents: 85089
diff changeset
6712 (let* ((cs (or (funcall (symbol-function 'process-coding-system) proc)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6713 (cons 'undecided 'undecided)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6714 cs-decode cs-encode)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6715 (when (symbolp cs) (setq cs (cons cs cs)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6716 (setq cs-decode (car cs))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6717 (setq cs-encode (cdr cs))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6718 (unless cs-decode (setq cs-decode 'undecided))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6719 (unless cs-encode (setq cs-encode 'undecided))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6720 (setq cs-encode (tramp-coding-system-change-eol-conversion
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6721 cs-encode 'unix))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6722 (when (search-forward "\r" nil t)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6723 (setq cs-decode (tramp-coding-system-change-eol-conversion
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6724 cs-decode 'dos)))
85126
9a6e9b6e4a76 Sync with Tramp 2.1.11.
Michael Albinus <michael.albinus@gmx.de>
parents: 85089
diff changeset
6725 (funcall (symbol-function 'set-buffer-process-coding-system)
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
6726 cs-decode cs-encode)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
6727 (tramp-message
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
6728 vec 5 "Setting coding system to `%s' and `%s'" cs-decode cs-encode))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6729 ;; Look for ^M and do something useful if found.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6730 (when (search-forward "\r" nil t)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6731 ;; We have found a ^M but cannot frob the process coding system
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6732 ;; because we're running on a non-MULE Emacs. Let's try
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6733 ;; stty, instead.
85553
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6734 (tramp-send-command vec "stty -onlcr" t))))
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6735 (tramp-send-command vec "set +o vi +o emacs" t)
86048
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6736
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6737 ;; Check whether the output of "uname -sr" has been changed. If
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6738 ;; yes, this is a strong indication that we must expire all
95967
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
6739 ;; connection properties. We start again with
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
6740 ;; `tramp-maybe-open-connection', it will be catched there.
86048
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6741 (tramp-message vec 5 "Checking system information")
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6742 (let ((old-uname (tramp-get-connection-property vec "uname" nil))
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6743 (new-uname
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6744 (tramp-set-connection-property
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6745 vec "uname"
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6746 (tramp-send-command-and-read vec "echo \\\"`uname -sr`\\\""))))
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6747 (when (and (stringp old-uname) (not (string-equal old-uname new-uname)))
95967
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
6748 (with-current-buffer (tramp-get-debug-buffer vec)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
6749 ;; Keep the debug buffer
96941
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
6750 (rename-buffer
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
6751 (generate-new-buffer-name tramp-temp-buffer-name) 'unique)
95967
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
6752 (funcall (symbol-function 'tramp-cleanup-connection) vec)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
6753 (if (= (point-min) (point-max))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
6754 (kill-buffer nil)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
6755 (rename-buffer (tramp-debug-buffer-name vec) 'unique))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
6756 ;; We call `tramp-get-buffer' in order to keep the debug buffer.
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
6757 (tramp-get-buffer vec)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
6758 (tramp-message
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
6759 vec 3
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
6760 "Connection reset, because remote host changed from `%s' to `%s'"
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
6761 old-uname new-uname)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
6762 (throw 'uname-changed (tramp-maybe-open-connection vec)))))
86048
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6763
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6764 ;; Check whether the remote host suffers from buggy
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6765 ;; `send-process-string'. This is known for FreeBSD (see comment in
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6766 ;; `send_process', file process.c). I've tested sending 624 bytes
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6767 ;; successfully, sending 625 bytes failed. Emacs makes a hack when
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6768 ;; this host type is detected locally. It cannot handle remote
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6769 ;; hosts, though.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6770 (with-connection-property proc "chunksize"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6771 (cond
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6772 ((and (integerp tramp-chunksize) (> tramp-chunksize 0))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6773 tramp-chunksize)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6774 (t
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6775 (tramp-message
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6776 vec 5 "Checking remote host type for `send-process-string' bug")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6777 (if (string-match
86048
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6778 "^FreeBSD" (tramp-get-connection-property vec "uname" ""))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6779 500 0))))
86048
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6780
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6781 ;; Set remote PATH variable.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6782 (tramp-set-remote-path vec)
86048
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6783
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6784 ;; Search for a good shell before searching for a command which
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6785 ;; checks if a file exists. This is done because Tramp wants to use
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6786 ;; "test foo; echo $?" to check if various conditions hold, and
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6787 ;; there are buggy /bin/sh implementations which don't execute the
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6788 ;; "echo $?" part if the "test" part has an error. In particular,
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6789 ;; the Solaris /bin/sh is a problem. I'm betting that all systems
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6790 ;; with buggy /bin/sh implementations will have a working bash or
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6791 ;; ksh. Whee...
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6792 (tramp-find-shell vec)
86048
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6793
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6794 ;; Disable unexpected output.
85553
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6795 (tramp-send-command vec "mesg n; biff n" t)
86048
766c1ba3d613 * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents: 85970
diff changeset
6796
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6797 ;; Set the environment.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6798 (tramp-message vec 5 "Setting default environment")
103328
485abb3b56cd * tramp.el (tramp-open-connection-setup-interactive-shell): Apply
Michael Albinus <michael.albinus@gmx.de>
parents: 103060
diff changeset
6799
485abb3b56cd * tramp.el (tramp-open-connection-setup-interactive-shell): Apply
Michael Albinus <michael.albinus@gmx.de>
parents: 103060
diff changeset
6800 ;; On OpenSolaris, there is a bug when HISTFILE is changed in place
485abb3b56cd * tramp.el (tramp-open-connection-setup-interactive-shell): Apply
Michael Albinus <michael.albinus@gmx.de>
parents: 103060
diff changeset
6801 ;; <http://bugs.opensolaris.org/view_bug.do?bug_id=6834184>. We
485abb3b56cd * tramp.el (tramp-open-connection-setup-interactive-shell): Apply
Michael Albinus <michael.albinus@gmx.de>
parents: 103060
diff changeset
6802 ;; apply the workaround.
485abb3b56cd * tramp.el (tramp-open-connection-setup-interactive-shell): Apply
Michael Albinus <michael.albinus@gmx.de>
parents: 103060
diff changeset
6803 (if (string-equal (tramp-get-connection-property vec "uname" "") "SunOS 5.11")
485abb3b56cd * tramp.el (tramp-open-connection-setup-interactive-shell): Apply
Michael Albinus <michael.albinus@gmx.de>
parents: 103060
diff changeset
6804 (tramp-send-command vec "unset HISTFILE"))
485abb3b56cd * tramp.el (tramp-open-connection-setup-interactive-shell): Apply
Michael Albinus <michael.albinus@gmx.de>
parents: 103060
diff changeset
6805
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6806 (let ((env (copy-sequence tramp-remote-process-environment))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6807 unset item)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6808 (while env
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
6809 (setq item (tramp-compat-split-string (car env) "="))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6810 (if (and (stringp (cadr item)) (not (string-equal (cadr item) "")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6811 (tramp-send-command
85553
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6812 vec (format "%s=%s; export %s" (car item) (cadr item) (car item)) t)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6813 (push (car item) unset))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6814 (setq env (cdr env)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6815 (when unset
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6816 (tramp-send-command
85553
4ccd437aad2e * net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents: 85542
diff changeset
6817 vec (format "unset %s" (mapconcat 'identity unset " "))))) t)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6818
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6819 ;; CCC: We should either implement a Perl version of base64 encoding
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6820 ;; and decoding. Then we just use that in the last item. The other
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6821 ;; alternative is to use the Perl version of UU encoding. But then
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6822 ;; we need a Lisp version of uuencode.
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6823 ;;
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6824 ;; Old text from documentation of tramp-methods:
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6825 ;; Using a uuencode/uudecode inline method is discouraged, please use one
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6826 ;; of the base64 methods instead since base64 encoding is much more
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6827 ;; reliable and the commands are more standardized between the different
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6828 ;; Unix versions. But if you can't use base64 for some reason, please
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6829 ;; note that the default uudecode command does not work well for some
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6830 ;; Unices, in particular AIX and Irix. For AIX, you might want to use
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6831 ;; the following command for uudecode:
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6832 ;;
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6833 ;; sed '/^begin/d;/^[` ]$/d;/^end/d' | iconv -f uucode -t ISO8859-1
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6834 ;;
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6835 ;; For Irix, no solution is known yet.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6836
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6837 (defconst tramp-local-coding-commands
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6838 '((b64 base64-encode-region base64-decode-region)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6839 (uu tramp-uuencode-region uudecode-decode-region)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6840 (pack
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6841 "perl -e 'binmode STDIN; binmode STDOUT; print pack(q{u*}, join q{}, <>)'"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6842 "perl -e 'binmode STDIN; binmode STDOUT; print unpack(q{u*}, join q{}, <>)'"))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6843 "List of local coding commands for inline transfer.
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6844 Each item is a list that looks like this:
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6845
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6846 \(FORMAT ENCODING DECODING)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6847
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6848 FORMAT is symbol describing the encoding/decoding format. It can be
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6849 `b64' for base64 encoding, `uu' for uu encoding, or `pack' for simple packing.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6850
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6851 ENCODING and DECODING can be strings, giving commands, or symbols,
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6852 giving functions. If they are strings, then they can contain
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6853 the \"%s\" format specifier. If that specifier is present, the input
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6854 filename will be put into the command line at that spot. If the
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6855 specifier is not present, the input should be read from standard
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6856 input.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6857
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6858 If they are functions, they will be called with two arguments, start
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6859 and end of region, and are expected to replace the region contents
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6860 with the encoded or decoded results, respectively.")
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6861
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6862 (defconst tramp-remote-coding-commands
102287
fdcbc3edbb87 * net/tramp.el (tramp-remote-coding-commands): Add "base64". (Bug#2463)
Michael Albinus <michael.albinus@gmx.de>
parents: 101729
diff changeset
6863 '((b64 "base64" "base64 -d")
fdcbc3edbb87 * net/tramp.el (tramp-remote-coding-commands): Add "base64". (Bug#2463)
Michael Albinus <michael.albinus@gmx.de>
parents: 101729
diff changeset
6864 (b64 "mimencode -b" "mimencode -u -b")
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6865 (b64 "mmencode -b" "mmencode -u -b")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6866 (b64 "recode data..base64" "recode base64..data")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6867 (b64 tramp-perl-encode-with-module tramp-perl-decode-with-module)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6868 (b64 tramp-perl-encode tramp-perl-decode)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6869 (uu "uuencode xxx" "uudecode -o /dev/stdout")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6870 (uu "uuencode xxx" "uudecode -o -")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6871 (uu "uuencode xxx" "uudecode -p")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6872 (uu "uuencode xxx" tramp-uudecode)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6873 (pack
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6874 "perl -e 'binmode STDIN; binmode STDOUT; print pack(q{u*}, join q{}, <>)'"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6875 "perl -e 'binmode STDIN; binmode STDOUT; print unpack(q{u*}, join q{}, <>)'"))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6876 "List of remote coding commands for inline transfer.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6877 Each item is a list that looks like this:
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6878
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6879 \(FORMAT ENCODING DECODING)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6880
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6881 FORMAT is symbol describing the encoding/decoding format. It can be
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6882 `b64' for base64 encoding, `uu' for uu encoding, or `pack' for simple packing.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6883
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6884 ENCODING and DECODING can be strings, giving commands, or symbols,
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6885 giving variables. If they are strings, then they can contain
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6886 the \"%s\" format specifier. If that specifier is present, the input
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6887 filename will be put into the command line at that spot. If the
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6888 specifier is not present, the input should be read from standard
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6889 input.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6890
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6891 If they are variables, this variable is a string containing a Perl
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6892 implementation for this functionality. This Perl program will be transferred
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6893 to the remote host, and it is avalible as shell function with the same name.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6894
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6895 (defun tramp-find-inline-encoding (vec)
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
6896 "Find an inline transfer encoding that works.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6897 Goes through the list `tramp-local-coding-commands' and
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6898 `tramp-remote-coding-commands'."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6899 (save-excursion
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6900 (let ((local-commands tramp-local-coding-commands)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6901 (magic "xyzzy")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6902 loc-enc loc-dec rem-enc rem-dec litem ritem found)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6903 (while (and local-commands (not found))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6904 (setq litem (pop local-commands))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6905 (catch 'wont-work-local
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6906 (let ((format (nth 0 litem))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6907 (remote-commands tramp-remote-coding-commands))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6908 (setq loc-enc (nth 1 litem))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6909 (setq loc-dec (nth 2 litem))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6910 ;; If the local encoder or decoder is a string, the
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6911 ;; corresponding command has to work locally.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6912 (if (not (stringp loc-enc))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6913 (tramp-message
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6914 vec 5 "Checking local encoding function `%s'" loc-enc)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6915 (tramp-message
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6916 vec 5 "Checking local encoding command `%s' for sanity" loc-enc)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6917 (unless (zerop (tramp-call-local-coding-command
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6918 loc-enc nil nil))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6919 (throw 'wont-work-local nil)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6920 (if (not (stringp loc-dec))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6921 (tramp-message
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6922 vec 5 "Checking local decoding function `%s'" loc-dec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6923 (tramp-message
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6924 vec 5 "Checking local decoding command `%s' for sanity" loc-dec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6925 (unless (zerop (tramp-call-local-coding-command
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6926 loc-dec nil nil))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6927 (throw 'wont-work-local nil)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6928 ;; Search for remote coding commands with the same format
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6929 (while (and remote-commands (not found))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6930 (setq ritem (pop remote-commands))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6931 (catch 'wont-work-remote
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6932 (when (equal format (nth 0 ritem))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6933 (setq rem-enc (nth 1 ritem))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6934 (setq rem-dec (nth 2 ritem))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6935 ;; Check if remote encoding and decoding commands can be
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6936 ;; called remotely with null input and output. This makes
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6937 ;; sure there are no syntax errors and the command is really
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6938 ;; found. Note that we do not redirect stdout to /dev/null,
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6939 ;; for two reasons: when checking the decoding command, we
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6940 ;; actually check the output it gives. And also, when
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6941 ;; redirecting "mimencode" output to /dev/null, then as root
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6942 ;; it might change the permissions of /dev/null!
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6943 (when (not (stringp rem-enc))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6944 (let ((name (symbol-name rem-enc)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6945 (while (string-match (regexp-quote "-") name)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6946 (setq name (replace-match "_" nil t name)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6947 (tramp-maybe-send-script vec (symbol-value rem-enc) name)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6948 (setq rem-enc name)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6949 (tramp-message
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6950 vec 5
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6951 "Checking remote encoding command `%s' for sanity" rem-enc)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6952 (unless (zerop (tramp-send-command-and-check
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6953 vec (format "%s </dev/null" rem-enc) t))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6954 (throw 'wont-work-remote nil))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6955
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6956 (when (not (stringp rem-dec))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6957 (let ((name (symbol-name rem-dec)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6958 (while (string-match (regexp-quote "-") name)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6959 (setq name (replace-match "_" nil t name)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6960 (tramp-maybe-send-script vec (symbol-value rem-dec) name)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6961 (setq rem-dec name)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6962 (tramp-message
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6963 vec 5
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6964 "Checking remote decoding command `%s' for sanity" rem-dec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6965 (unless (zerop (tramp-send-command-and-check
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6966 vec
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6967 (format "echo %s | %s | %s"
106204
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
6968 magic rem-enc rem-dec)
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
6969 t))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6970 (throw 'wont-work-remote nil))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6971
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6972 (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
6973 (goto-char (point-min))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6974 (unless (looking-at (regexp-quote magic))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6975 (throw 'wont-work-remote nil)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6976
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6977 ;; `rem-enc' and `rem-dec' could be a string meanwhile.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6978 (setq rem-enc (nth 1 ritem))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6979 (setq rem-dec (nth 2 ritem))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6980 (setq found t)))))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6981
99950
f803581cae44 * net/tramp.el (tramp-handle-write-region): Improve the check for
Michael Albinus <michael.albinus@gmx.de>
parents: 99615
diff changeset
6982 ;; Did we find something?
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6983 (unless found
99950
f803581cae44 * net/tramp.el (tramp-handle-write-region): Improve the check for
Michael Albinus <michael.albinus@gmx.de>
parents: 99615
diff changeset
6984 (tramp-message vec 2 "Couldn't find an inline transfer encoding"))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6985
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6986 ;; Set connection properties.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6987 (tramp-message vec 5 "Using local encoding `%s'" loc-enc)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6988 (tramp-set-connection-property vec "local-encoding" loc-enc)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6989 (tramp-message vec 5 "Using local decoding `%s'" loc-dec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6990 (tramp-set-connection-property vec "local-decoding" loc-dec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6991 (tramp-message vec 5 "Using remote encoding `%s'" rem-enc)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6992 (tramp-set-connection-property vec "remote-encoding" rem-enc)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6993 (tramp-message vec 5 "Using remote decoding `%s'" rem-dec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
6994 (tramp-set-connection-property vec "remote-decoding" rem-dec))))
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6995
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6996 (defun tramp-call-local-coding-command (cmd input output)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6997 "Call the local encoding or decoding command.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6998 If CMD contains \"%s\", provide input file INPUT there in command.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
6999 Otherwise, INPUT is passed via standard input.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
7000 INPUT can also be nil which means `/dev/null'.
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
7001 OUTPUT can be a string (which specifies a filename), or t (which
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
7002 means standard output and thus the current buffer), or nil (which
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
7003 means discard it)."
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
7004 (tramp-local-call-process
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
7005 tramp-encoding-shell
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
7006 (when (and input (not (string-match "%s" cmd))) input)
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
7007 (if (eq output t) t nil)
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
7008 nil
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
7009 tramp-encoding-command-switch
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
7010 (concat
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
7011 (if (string-match "%s" cmd) (format cmd input) cmd)
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
7012 (if (stringp output) (concat "> " output) ""))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7013
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7014 (defun tramp-compute-multi-hops (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7015 "Expands VEC according to `tramp-default-proxies-alist'.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7016 Gateway hops are already opened."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7017 (let ((target-alist `(,vec))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7018 (choices tramp-default-proxies-alist)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7019 item proxy)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7020
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7021 ;; Look for proxy hosts to be passed.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7022 (while choices
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7023 (setq item (pop choices)
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7024 proxy (eval (nth 2 item)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7025 (when (and
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7026 ;; host
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7027 (string-match (or (eval (nth 0 item)) "")
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7028 (or (tramp-file-name-host (car target-alist)) ""))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7029 ;; user
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7030 (string-match (or (eval (nth 1 item)) "")
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7031 (or (tramp-file-name-user (car target-alist)) "")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7032 (if (null proxy)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7033 ;; No more hops needed.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7034 (setq choices nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7035 ;; Replace placeholders.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7036 (setq proxy
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7037 (format-spec
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7038 proxy
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7039 `((?u . ,(or (tramp-file-name-user (car target-alist)) ""))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7040 (?h . ,(or (tramp-file-name-host (car target-alist)) "")))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7041 (with-parsed-tramp-file-name proxy l
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7042 ;; Add the hop.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7043 (add-to-list 'target-alist l)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7044 ;; Start next search.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7045 (setq choices tramp-default-proxies-alist)))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7046
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7047 ;; Handle gateways.
84406
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
7048 (when (and (boundp 'tramp-gw-tunnel-method)
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
7049 (string-match (format
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
7050 "^\\(%s\\|%s\\)$"
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
7051 (symbol-value 'tramp-gw-tunnel-method)
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
7052 (symbol-value 'tramp-gw-socks-method))
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
7053 (tramp-file-name-method (car target-alist))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7054 (let ((gw (pop target-alist))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7055 (hop (pop target-alist)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7056 ;; Is the method prepared for gateways?
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7057 (unless (tramp-get-method-parameter
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7058 (tramp-file-name-method hop) 'tramp-default-port)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7059 (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7060 vec 'file-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7061 "Method `%s' is not supported for gateway access."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7062 (tramp-file-name-method hop)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7063 ;; Add default port if needed.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7064 (unless
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7065 (string-match
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7066 tramp-host-with-port-regexp (tramp-file-name-host hop))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7067 (aset hop 2
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7068 (concat
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7069 (tramp-file-name-host hop) tramp-prefix-port-format
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7070 (number-to-string
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7071 (tramp-get-method-parameter
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7072 (tramp-file-name-method hop) 'tramp-default-port)))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7073 ;; Open the gateway connection.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7074 (add-to-list
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7075 'target-alist
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7076 (vector
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7077 (tramp-file-name-method hop) (tramp-file-name-user hop)
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
7078 (funcall (symbol-function 'tramp-gw-open-connection) vec gw hop) nil))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7079 ;; For the password prompt, we need the correct values.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7080 ;; Therefore, we must remember the gateway vector. But we
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7081 ;; cannot do it as connection property, because it shouldn't
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7082 ;; be persistent. And we have no started process yet either.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7083 (tramp-set-file-property (car target-alist) "" "gateway" hop)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7084
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7085 ;; Foreign and out-of-band methods are not supported for multi-hops.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7086 (when (cdr target-alist)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7087 (setq choices target-alist)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7088 (while choices
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7089 (setq item (pop choices))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7090 (when
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7091 (or
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7092 (not
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7093 (tramp-get-method-parameter
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7094 (tramp-file-name-method item) 'tramp-login-program))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7095 (tramp-get-method-parameter
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7096 (tramp-file-name-method item) 'tramp-copy-program))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7097 (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7098 vec 'file-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7099 "Method `%s' is not supported for multi-hops."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7100 (tramp-file-name-method item)))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7101
88028
2a4ab582b2a6 * net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents: 87997
diff changeset
7102 ;; In case the host name is not used for the remote shell
2a4ab582b2a6 * net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents: 87997
diff changeset
7103 ;; command, the user could be misguided by applying a random
2a4ab582b2a6 * net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents: 87997
diff changeset
7104 ;; hostname.
2a4ab582b2a6 * net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents: 87997
diff changeset
7105 (let* ((v (car target-alist))
2a4ab582b2a6 * net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents: 87997
diff changeset
7106 (method (tramp-file-name-method v))
2a4ab582b2a6 * net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents: 87997
diff changeset
7107 (host (tramp-file-name-host v)))
2a4ab582b2a6 * net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents: 87997
diff changeset
7108 (unless
2a4ab582b2a6 * net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents: 87997
diff changeset
7109 (or
2a4ab582b2a6 * net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents: 87997
diff changeset
7110 ;; There are multi-hops.
2a4ab582b2a6 * net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents: 87997
diff changeset
7111 (cdr target-alist)
2a4ab582b2a6 * net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents: 87997
diff changeset
7112 ;; The host name is used for the remote shell command.
2a4ab582b2a6 * net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents: 87997
diff changeset
7113 (member
2a4ab582b2a6 * net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents: 87997
diff changeset
7114 '("%h") (tramp-get-method-parameter method 'tramp-login-args))
2a4ab582b2a6 * net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents: 87997
diff changeset
7115 ;; The host is local. We cannot use `tramp-local-host-p'
2a4ab582b2a6 * net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents: 87997
diff changeset
7116 ;; here, because it opens a connection as well.
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
7117 (string-match tramp-local-host-regexp host))
88028
2a4ab582b2a6 * net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents: 87997
diff changeset
7118 (tramp-error
88072
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
7119 v 'file-error
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
7120 "Host `%s' looks like a remote host, `%s' can only use the local host"
948a005afe18 * net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents: 88051
diff changeset
7121 host method)))
88028
2a4ab582b2a6 * net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents: 87997
diff changeset
7122
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7123 ;; Result.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7124 target-alist))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7125
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7126 (defun tramp-maybe-open-connection (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7127 "Maybe open a connection VEC.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7128 Does not do anything if a connection is already open, but re-opens the
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7129 connection if a previous connection has died for some reason."
95967
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7130 (catch 'uname-changed
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7131 (let ((p (tramp-get-connection-process vec))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7132 (process-environment (copy-sequence process-environment)))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7133
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7134 ;; If too much time has passed since last command was sent, look
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7135 ;; whether process is still alive. If it isn't, kill it. When
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7136 ;; using ssh, it can sometimes happen that the remote end has
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7137 ;; hung up but the local ssh client doesn't recognize this until
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7138 ;; it tries to send some data to the remote end. So that's why
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7139 ;; we try to send a command from time to time, then look again
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7140 ;; whether the process is really alive.
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7141 (condition-case nil
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7142 (when (and (> (tramp-time-diff
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7143 (current-time)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7144 (tramp-get-connection-property
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7145 p "last-cmd-time" '(0 0 0)))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7146 60)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7147 p (processp p) (memq (process-status p) '(run open)))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7148 (tramp-send-command vec "echo are you awake" t t)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7149 (unless (and (memq (process-status p) '(run open))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7150 (tramp-wait-for-output p 10))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7151 ;; The error will be catched locally.
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7152 (tramp-error vec 'file-error "Awake did fail")))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7153 (file-error
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7154 (tramp-flush-connection-property vec)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7155 (tramp-flush-connection-property p)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7156 (delete-process p)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7157 (setq p nil)))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7158
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7159 ;; New connection must be opened.
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7160 (unless (and p (processp p) (memq (process-status p) '(run open)))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7161
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7162 ;; We call `tramp-get-buffer' in order to get a debug buffer for
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7163 ;; messages from the beginning.
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7164 (tramp-get-buffer vec)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7165 (if (zerop (length (tramp-file-name-user vec)))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7166 (tramp-message
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7167 vec 3 "Opening connection for %s using %s..."
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7168 (tramp-file-name-host vec)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7169 (tramp-file-name-method vec))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7170 (tramp-message
95967
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7171 vec 3 "Opening connection for %s@%s using %s..."
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7172 (tramp-file-name-user vec)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7173 (tramp-file-name-host vec)
95967
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7174 (tramp-file-name-method vec)))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7175
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7176 ;; Start new process.
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7177 (when (and p (processp p))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7178 (delete-process p))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7179 (setenv "TERM" tramp-terminal-type)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7180 (setenv "LC_ALL" "C")
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7181 (setenv "PROMPT_COMMAND")
106470
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
7182 (setenv "PS1" tramp-initial-end-of-output)
95967
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7183 (let* ((target-alist (tramp-compute-multi-hops vec))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7184 (process-connection-type tramp-process-connection-type)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7185 (process-adaptive-read-buffering nil)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7186 (coding-system-for-read nil)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7187 ;; This must be done in order to avoid our file name handler.
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7188 (p (let ((default-directory
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7189 (tramp-compat-temporary-file-directory)))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7190 (start-process
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7191 (or (tramp-get-connection-property vec "process-name" nil)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7192 (tramp-buffer-name vec))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7193 (tramp-get-connection-buffer vec)
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7194 tramp-encoding-shell))))
95967
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7195
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7196 (tramp-message
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7197 vec 6 "%s" (mapconcat 'identity (process-command p) " "))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7198
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7199 ;; Check whether process is alive.
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7200 (tramp-set-process-query-on-exit-flag p nil)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7201 (tramp-message vec 3 "Waiting 60s for local shell to come up...")
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7202 (tramp-barf-if-no-shell-prompt
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7203 p 60 "Couldn't find local shell prompt %s" tramp-encoding-shell)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7204
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7205 ;; Now do all the connections as specified.
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7206 (while target-alist
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7207 (let* ((hop (car target-alist))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7208 (l-method (tramp-file-name-method hop))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7209 (l-user (tramp-file-name-user hop))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7210 (l-host (tramp-file-name-host hop))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7211 (l-port nil)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7212 (login-program
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7213 (tramp-get-method-parameter l-method 'tramp-login-program))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7214 (login-args
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7215 (tramp-get-method-parameter l-method 'tramp-login-args))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7216 (gw-args
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7217 (tramp-get-method-parameter l-method 'tramp-gw-args))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7218 (gw (tramp-get-file-property hop "" "gateway" nil))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7219 (g-method (and gw (tramp-file-name-method gw)))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7220 (g-user (and gw (tramp-file-name-user gw)))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7221 (g-host (and gw (tramp-file-name-host gw)))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7222 (command login-program)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7223 ;; We don't create the temporary file. In fact, it
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7224 ;; is just a prefix for the ControlPath option of
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7225 ;; ssh; the real temporary file has another name, and
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7226 ;; it is created and protected by ssh. It is also
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7227 ;; removed by ssh, when the connection is closed.
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7228 (tmpfile
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7229 (tramp-set-connection-property
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7230 p "temp-file"
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7231 (make-temp-name
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7232 (expand-file-name
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7233 tramp-temp-name-prefix
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7234 (tramp-compat-temporary-file-directory)))))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7235 spec)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7236
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7237 ;; Add gateway arguments if necessary.
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7238 (when (and gw gw-args)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7239 (setq login-args (append login-args gw-args)))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7240
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7241 ;; Check for port number. Until now, there's no need
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7242 ;; for handling like method, user, host.
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7243 (when (string-match tramp-host-with-port-regexp l-host)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7244 (setq l-port (match-string 2 l-host)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7245 l-host (match-string 1 l-host)))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7246
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7247 ;; Set variables for computing the prompt for reading
96941
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
7248 ;; password. They can also be derived from a gateway.
95967
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7249 (setq tramp-current-method (or g-method l-method)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7250 tramp-current-user (or g-user l-user)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7251 tramp-current-host (or g-host l-host))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7252
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7253 ;; Replace login-args place holders.
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7254 (setq
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7255 l-host (or l-host "")
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7256 l-user (or l-user "")
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7257 l-port (or l-port "")
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7258 spec `((?h . ,l-host) (?u . ,l-user) (?p . ,l-port)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7259 (?t . ,tmpfile))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7260 command
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7261 (concat
106310
334a4954c17e * net/tramp.el (tramp-maybe-open-connection): Open the remote
Michael Albinus <michael.albinus@gmx.de>
parents: 106219
diff changeset
7262 ;; We do not want to see the trailing local prompt in
334a4954c17e * net/tramp.el (tramp-maybe-open-connection): Open the remote
Michael Albinus <michael.albinus@gmx.de>
parents: 106219
diff changeset
7263 ;; `start-file-process'.
334a4954c17e * net/tramp.el (tramp-maybe-open-connection): Open the remote
Michael Albinus <michael.albinus@gmx.de>
parents: 106219
diff changeset
7264 (unless (memq system-type '(windows-nt)) "exec ")
95967
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7265 command " "
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7266 (mapconcat
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
7267 (lambda (x)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
7268 (setq x (mapcar (lambda (y) (format-spec y spec)) x))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
7269 (unless (member "" x) (mapconcat 'identity x " ")))
95967
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7270 login-args " ")
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7271 ;; Local shell could be a Windows COMSPEC. It doesn't
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7272 ;; know the ";" syntax, but we must exit always for
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7273 ;; `start-file-process'. "exec" does not work either.
106310
334a4954c17e * net/tramp.el (tramp-maybe-open-connection): Open the remote
Michael Albinus <michael.albinus@gmx.de>
parents: 106219
diff changeset
7274 (if (memq system-type '(windows-nt)) " && exit || exit")))
95967
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7275
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7276 ;; Send the command.
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7277 (tramp-message vec 3 "Sending command `%s'" command)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7278 (tramp-send-command vec command t t)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7279 (tramp-process-actions p vec tramp-actions-before-shell 60)
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7280 (tramp-message vec 3 "Found remote shell prompt on `%s'" l-host))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7281 ;; Next hop.
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7282 (setq target-alist (cdr target-alist)))
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7283
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7284 ;; Make initial shell settings.
13aa0133c5af (tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents: 95963
diff changeset
7285 (tramp-open-connection-setup-interactive-shell p vec))))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7286
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7287 (defun tramp-send-command (vec command &optional neveropen nooutput)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7288 "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
7289 Erases temporary buffer before sending the command. If optional
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7290 arg NEVEROPEN is non-nil, never try to open the connection. This
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7291 is meant to be used from `tramp-maybe-open-connection' only. The
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7292 function waits for output unless NOOUTPUT is set."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7293 (unless neveropen (tramp-maybe-open-connection vec))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7294 (let ((p (tramp-get-connection-process vec)))
86241
4a7e0b7fde4e * net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents: 86224
diff changeset
7295 (when (tramp-get-connection-property p "remote-echo" nil)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7296 ;; We mark the command string that it can be erased in the output buffer.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7297 (tramp-set-connection-property p "check-remote-echo" t)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7298 (setq command (format "%s%s%s" tramp-echo-mark command tramp-echo-mark)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7299 (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
7300 (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
7301 (unless nooutput (tramp-wait-for-output p))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7302
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7303 (defun tramp-wait-for-output (proc &optional timeout)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7304 "Wait for output from remote rsh command."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7305 (with-current-buffer (process-buffer proc)
106470
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
7306 (let* (;; Initially, `tramp-end-of-output' is "#$ ". There might
103934
33e088977519 * net/tramp.el (tramp-wait-for-output): Handle the case when
Michael Albinus <michael.albinus@gmx.de>
parents: 103782
diff changeset
7307 ;; be leading escape sequences, which must be ignored.
106470
9e96dbbd314e Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents: 106390
diff changeset
7308 (regexp (format "[^#$\n]*%s\r?$" (regexp-quote tramp-end-of-output)))
103934
33e088977519 * net/tramp.el (tramp-wait-for-output): Handle the case when
Michael Albinus <michael.albinus@gmx.de>
parents: 103782
diff changeset
7309 ;; Sometimes, the commands do not return a newline but a
33e088977519 * net/tramp.el (tramp-wait-for-output): Handle the case when
Michael Albinus <michael.albinus@gmx.de>
parents: 103782
diff changeset
7310 ;; null byte before the shell prompt, for example "git
33e088977519 * net/tramp.el (tramp-wait-for-output): Handle the case when
Michael Albinus <michael.albinus@gmx.de>
parents: 103782
diff changeset
7311 ;; ls-files -c -z ...".
33e088977519 * net/tramp.el (tramp-wait-for-output): Handle the case when
Michael Albinus <michael.albinus@gmx.de>
parents: 103782
diff changeset
7312 (regexp1 (format "\\(^\\|\000\\)%s" regexp))
33e088977519 * net/tramp.el (tramp-wait-for-output): Handle the case when
Michael Albinus <michael.albinus@gmx.de>
parents: 103782
diff changeset
7313 (found (tramp-wait-for-regexp proc timeout regexp1)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7314 (if found
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7315 (let (buffer-read-only)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7316 (goto-char (point-max))
87648
7ae99e295dfd * vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents: 87368
diff changeset
7317 (re-search-backward regexp nil t)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7318 (delete-region (point) (point-max)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7319 (if timeout
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7320 (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7321 proc 'file-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7322 "[[Remote prompt `%s' not found in %d secs]]"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7323 tramp-end-of-output timeout)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7324 (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7325 proc 'file-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7326 "[[Remote prompt `%s' not found]]" tramp-end-of-output)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7327 ;; Return value is whether end-of-output sentinel was found.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7328 found)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7329
106204
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
7330 (defun tramp-send-command-and-check
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
7331 (vec command &optional subshell dont-suppress-err)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7332 "Run COMMAND and check its exit status.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7333 Sends `echo $?' along with the COMMAND for checking the exit status. If
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7334 COMMAND is nil, just sends `echo $?'. Returns the exit status found.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7335
106204
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
7336 If the optional argument SUBSHELL is non-nil, the command is
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
7337 executed in a subshell, ie surrounded by parentheses. If
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
7338 DONT-SUPPRESS-ERR is non-nil, stderr won't be sent to /dev/null."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7339 (tramp-send-command
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7340 vec
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7341 (concat (if subshell "( " "")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7342 command
106204
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
7343 (if command (if dont-suppress-err "; " " 2>/dev/null; ") "")
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7344 "echo tramp_exit_status $?"
106204
075fc4ee6c41 * net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents: 106115
diff changeset
7345 (if subshell " )" "")))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7346 (with-current-buffer (tramp-get-connection-buffer vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7347 (goto-char (point-max))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7348 (unless (re-search-backward "tramp_exit_status [0-9]+" nil t)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7349 (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7350 vec 'file-error "Couldn't find exit status of `%s'" command))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7351 (skip-chars-forward "^ ")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7352 (prog1
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7353 (read (current-buffer))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7354 (let (buffer-read-only) (delete-region (match-beginning 0) (point-max))))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7355
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7356 (defun tramp-barf-unless-okay (vec command fmt &rest args)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7357 "Run COMMAND, check exit status, throw error if exit status not okay.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7358 Similar to `tramp-send-command-and-check' but accepts two more arguments
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7359 FMT and ARGS which are passed to `error'."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7360 (unless (zerop (tramp-send-command-and-check vec command))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7361 (apply 'tramp-error vec 'file-error fmt args)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7362
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7363 (defun tramp-send-command-and-read (vec command)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7364 "Run COMMAND and return the output, which must be a Lisp expression.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7365 In case there is no valid Lisp expression, it raises an error"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7366 (tramp-barf-unless-okay vec command "`%s' returns with error" command)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7367 (with-current-buffer (tramp-get-connection-buffer vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7368 ;; Read the expression.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7369 (goto-char (point-min))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7370 (condition-case nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7371 (prog1 (read (current-buffer))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7372 ;; Error handling.
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
7373 (when (re-search-forward "\\S-" (tramp-compat-line-end-position) t)
84966
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
7374 (error nil)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7375 (error (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7376 vec 'file-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7377 "`%s' does not return a valid Lisp expression: `%s'"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7378 command (buffer-string))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7379
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
7380 ;; It seems that Tru64 Unix does not like it if long strings are sent
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
7381 ;; to it in one go. (This happens when sending the Perl
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
7382 ;; `file-attributes' implementation, for instance.) Therefore, we
82324
5399c02bfd07 * net/tramp.el (tramp-wrong-passwd-regexp): Make the regexp more
Michael Albinus <michael.albinus@gmx.de>
parents: 82201
diff changeset
7383 ;; have this function which sends the string in chunks.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7384 (defun tramp-send-string (vec string)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7385 "Send the STRING via connection VEC.
49995
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
7386
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
7387 The STRING is expected to use Unix line-endings, but the lines sent to
a0e8a85259ed Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49612
diff changeset
7388 the remote host use line-endings as defined in the variable
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7389 `tramp-rsh-end-of-line'. The communication buffer is erased before sending."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7390 (let* ((p (tramp-get-connection-process vec))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7391 (chunksize (tramp-get-connection-property p "chunksize" nil)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7392 (unless p
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7393 (tramp-error
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7394 vec 'file-error "Can't send string to remote host -- not logged in"))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7395 (tramp-set-connection-property p "last-cmd-time" (current-time))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7396 (tramp-message vec 10 "%s" string)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7397 (with-current-buffer (tramp-get-connection-buffer vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7398 ;; Clean up the buffer. We cannot call `erase-buffer' because
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7399 ;; narrowing might be in effect.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7400 (let (buffer-read-only) (delete-region (point-min) (point-max)))
82324
5399c02bfd07 * net/tramp.el (tramp-wrong-passwd-regexp): Make the regexp more
Michael Albinus <michael.albinus@gmx.de>
parents: 82201
diff changeset
7401 ;; Replace "\n" by `tramp-rsh-end-of-line'.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7402 (setq string
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7403 (mapconcat 'identity
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7404 (tramp-compat-split-string string "\n")
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7405 tramp-rsh-end-of-line))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7406 (unless (or (string= string "")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7407 (string-equal (substring string -1) tramp-rsh-end-of-line))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7408 (setq string (concat string tramp-rsh-end-of-line)))
82324
5399c02bfd07 * net/tramp.el (tramp-wrong-passwd-regexp): Make the regexp more
Michael Albinus <michael.albinus@gmx.de>
parents: 82201
diff changeset
7409 ;; Send the string.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7410 (if (and chunksize (not (zerop chunksize)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7411 (let ((pos 0)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7412 (end (length string)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7413 (while (< pos end)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7414 (tramp-message
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7415 vec 10 "Sending chunk from %s to %s"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7416 pos (min (+ pos chunksize) end))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7417 (process-send-string
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7418 p (substring string pos (min (+ pos chunksize) end)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7419 (setq pos (+ pos chunksize))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7420 (process-send-string p string)))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7421
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7422 (defun tramp-mode-string-to-int (mode-string)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7423 "Converts a ten-letter `drwxrwxrwx'-style mode string into mode bits."
77986
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7424 (let* (case-fold-search
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7425 (mode-chars (string-to-vector mode-string))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7426 (owner-read (aref mode-chars 1))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7427 (owner-write (aref mode-chars 2))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7428 (owner-execute-or-setid (aref mode-chars 3))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7429 (group-read (aref mode-chars 4))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7430 (group-write (aref mode-chars 5))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7431 (group-execute-or-setid (aref mode-chars 6))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7432 (other-read (aref mode-chars 7))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7433 (other-write (aref mode-chars 8))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7434 (other-execute-or-sticky (aref mode-chars 9)))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7435 (save-match-data
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7436 (logior
77986
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7437 (cond
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7438 ((char-equal owner-read ?r) (tramp-octal-to-decimal "00400"))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7439 ((char-equal owner-read ?-) 0)
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7440 (t (error "Second char `%c' must be one of `r-'" owner-read)))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7441 (cond
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7442 ((char-equal owner-write ?w) (tramp-octal-to-decimal "00200"))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7443 ((char-equal owner-write ?-) 0)
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7444 (t (error "Third char `%c' must be one of `w-'" owner-write)))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7445 (cond
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7446 ((char-equal owner-execute-or-setid ?x)
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7447 (tramp-octal-to-decimal "00100"))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7448 ((char-equal owner-execute-or-setid ?S)
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7449 (tramp-octal-to-decimal "04000"))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7450 ((char-equal owner-execute-or-setid ?s)
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7451 (tramp-octal-to-decimal "04100"))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7452 ((char-equal owner-execute-or-setid ?-) 0)
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7453 (t (error "Fourth char `%c' must be one of `xsS-'"
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7454 owner-execute-or-setid)))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7455 (cond
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7456 ((char-equal group-read ?r) (tramp-octal-to-decimal "00040"))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7457 ((char-equal group-read ?-) 0)
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7458 (t (error "Fifth char `%c' must be one of `r-'" group-read)))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7459 (cond
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7460 ((char-equal group-write ?w) (tramp-octal-to-decimal "00020"))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7461 ((char-equal group-write ?-) 0)
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7462 (t (error "Sixth char `%c' must be one of `w-'" group-write)))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7463 (cond
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7464 ((char-equal group-execute-or-setid ?x)
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7465 (tramp-octal-to-decimal "00010"))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7466 ((char-equal group-execute-or-setid ?S)
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7467 (tramp-octal-to-decimal "02000"))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7468 ((char-equal group-execute-or-setid ?s)
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7469 (tramp-octal-to-decimal "02010"))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7470 ((char-equal group-execute-or-setid ?-) 0)
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7471 (t (error "Seventh char `%c' must be one of `xsS-'"
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7472 group-execute-or-setid)))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7473 (cond
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7474 ((char-equal other-read ?r)
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7475 (tramp-octal-to-decimal "00004"))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7476 ((char-equal other-read ?-) 0)
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7477 (t (error "Eighth char `%c' must be one of `r-'" other-read)))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7478 (cond
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7479 ((char-equal other-write ?w) (tramp-octal-to-decimal "00002"))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7480 ((char-equal other-write ?-) 0)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7481 (t (error "Nineth char `%c' must be one of `w-'" other-write)))
77986
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7482 (cond
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7483 ((char-equal other-execute-or-sticky ?x)
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7484 (tramp-octal-to-decimal "00001"))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7485 ((char-equal other-execute-or-sticky ?T)
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7486 (tramp-octal-to-decimal "01000"))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7487 ((char-equal other-execute-or-sticky ?t)
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7488 (tramp-octal-to-decimal "01001"))
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7489 ((char-equal other-execute-or-sticky ?-) 0)
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7490 (t (error "Tenth char `%c' must be one of `xtT-'"
0cc9b64806d2 Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents: 76846
diff changeset
7491 other-execute-or-sticky)))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7492
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7493 (defun tramp-convert-file-attributes (vec attr)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7494 "Convert file-attributes ATTR generated by perl script, stat or ls.
58540
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
7495 Convert file mode bits to string and set virtual device number.
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
7496 Return ATTR."
104866
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7497 (when attr
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7498 ;; Convert last access time.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7499 (unless (listp (nth 4 attr))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7500 (setcar (nthcdr 4 attr)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7501 (list (floor (nth 4 attr) 65536)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7502 (floor (mod (nth 4 attr) 65536)))))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7503 ;; Convert last modification time.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7504 (unless (listp (nth 5 attr))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7505 (setcar (nthcdr 5 attr)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7506 (list (floor (nth 5 attr) 65536)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7507 (floor (mod (nth 5 attr) 65536)))))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7508 ;; Convert last status change time.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7509 (unless (listp (nth 6 attr))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7510 (setcar (nthcdr 6 attr)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7511 (list (floor (nth 6 attr) 65536)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7512 (floor (mod (nth 6 attr) 65536)))))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7513 ;; Convert file size.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7514 (when (< (nth 7 attr) 0)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7515 (setcar (nthcdr 7 attr) -1))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7516 (when (and (floatp (nth 7 attr))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7517 (<= (nth 7 attr) (tramp-compat-most-positive-fixnum)))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7518 (setcar (nthcdr 7 attr) (round (nth 7 attr))))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7519 ;; Convert file mode bits to string.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7520 (unless (stringp (nth 8 attr))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7521 (setcar (nthcdr 8 attr) (tramp-file-mode-from-int (nth 8 attr)))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7522 (when (stringp (car attr))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7523 (aset (nth 8 attr) 0 ?l)))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7524 ;; Convert directory indication bit.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7525 (when (string-match "^d" (nth 8 attr))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7526 (setcar attr t))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7527 ;; Convert symlink from `tramp-do-file-attributes-with-stat'.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7528 (when (consp (car attr))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7529 (if (and (stringp (caar attr))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7530 (string-match ".+ -> .\\(.+\\)." (caar attr)))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7531 (setcar attr (match-string 1 (caar attr)))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7532 (setcar attr nil)))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7533 ;; Set file's gid change bit.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7534 (setcar (nthcdr 9 attr)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7535 (if (numberp (nth 3 attr))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7536 (not (= (nth 3 attr)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7537 (tramp-get-remote-gid vec 'integer)))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7538 (not (string-equal
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7539 (nth 3 attr)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7540 (tramp-get-remote-gid vec 'string)))))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7541 ;; Convert inode.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7542 (unless (listp (nth 10 attr))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7543 (setcar (nthcdr 10 attr)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7544 (condition-case nil
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7545 (cons (floor (nth 10 attr) 65536)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7546 (floor (mod (nth 10 attr) 65536)))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7547 ;; Inodes can be incredible huge. We must hide this.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7548 (error (tramp-get-inode vec)))))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7549 ;; Set virtual device number.
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7550 (setcar (nthcdr 11 attr)
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7551 (tramp-get-device vec))
3d5d2850cbef * net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents: 104850
diff changeset
7552 attr))
58540
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
7553
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7554 (defun tramp-check-cached-permissions (vec access)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7555 "Check `file-attributes' caches for VEC.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7556 Return t if according to the cache access type ACCESS is known to
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7557 be granted."
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7558 (let ((result nil)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7559 (offset (cond
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7560 ((eq ?r access) 1)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7561 ((eq ?w access) 2)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7562 ((eq ?x access) 3))))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7563 (dolist (suffix '("string" "integer") result)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7564 (setq
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7565 result
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7566 (or
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7567 result
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7568 (let ((file-attr
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7569 (tramp-get-file-property
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7570 vec (tramp-file-name-localname vec)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7571 (concat "file-attributes-" suffix) nil))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7572 (remote-uid
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7573 (tramp-get-connection-property
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7574 vec (concat "uid-" suffix) nil))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7575 (remote-gid
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7576 (tramp-get-connection-property
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7577 vec (concat "gid-" suffix) nil)))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7578 (and
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7579 file-attr
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7580 (or
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7581 ;; Not a symlink
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7582 (eq t (car file-attr))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7583 (null (car file-attr)))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7584 (or
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7585 ;; World accessible.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7586 (eq access (aref (nth 8 file-attr) (+ offset 6)))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7587 ;; User accessible and owned by user.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7588 (and
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7589 (eq access (aref (nth 8 file-attr) offset))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7590 (equal remote-uid (nth 2 file-attr)))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7591 ;; Group accessible and owned by user's
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7592 ;; principal group.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7593 (and
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7594 (eq access (aref (nth 8 file-attr) (+ offset 3)))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7595 (equal remote-gid (nth 3 file-attr)))))))))))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
7596
81938
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
7597 (defun tramp-get-inode (vec)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7598 "Returns the virtual inode number.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7599 If it doesn't exist, generate a new one."
81938
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
7600 (let ((string (tramp-make-tramp-file-name
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
7601 (tramp-file-name-method vec)
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
7602 (tramp-file-name-user vec)
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
7603 (tramp-file-name-host vec)
26330ef1aa46 * net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents: 81758
diff changeset
7604 "")))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7605 (unless (assoc string tramp-inodes)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7606 (add-to-list 'tramp-inodes
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7607 (list string (length tramp-inodes))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7608 (nth 1 (assoc string tramp-inodes))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7609
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7610 (defun tramp-get-device (vec)
58540
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
7611 "Returns the virtual device number.
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
7612 If it doesn't exist, generate a new one."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7613 (let ((string (tramp-make-tramp-file-name
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7614 (tramp-file-name-method vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7615 (tramp-file-name-user vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7616 (tramp-file-name-host vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7617 "")))
58540
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
7618 (unless (assoc string tramp-devices)
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
7619 (add-to-list 'tramp-devices
d3f76ef9ad46 (tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents: 58005
diff changeset
7620 (list string (length tramp-devices))))
97052
bed318e44ebd * net/tramp.el (tramp-perl-directory-files-and-attributes)
Michael Albinus <michael.albinus@gmx.de>
parents: 97035
diff changeset
7621 (cons -1 (nth 1 (assoc string tramp-devices)))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7622
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7623 (defun tramp-file-mode-from-int (mode)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7624 "Turn an integer representing a file mode into an ls(1)-like string."
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7625 (let ((type (cdr (assoc (logand (lsh mode -12) 15) tramp-file-mode-type-map)))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7626 (user (logand (lsh mode -6) 7))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7627 (group (logand (lsh mode -3) 7))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7628 (other (logand (lsh mode -0) 7))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7629 (suid (> (logand (lsh mode -9) 4) 0))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7630 (sgid (> (logand (lsh mode -9) 2) 0))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7631 (sticky (> (logand (lsh mode -9) 1) 0)))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7632 (setq user (tramp-file-mode-permissions user suid "s"))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7633 (setq group (tramp-file-mode-permissions group sgid "s"))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7634 (setq other (tramp-file-mode-permissions other sticky "t"))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7635 (concat type user group other)))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7636
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7637 (defun tramp-file-mode-permissions (perm suid suid-text)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7638 "Convert a permission bitset into a string.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7639 This is used internally by `tramp-file-mode-from-int'."
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7640 (let ((r (> (logand perm 4) 0))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7641 (w (> (logand perm 2) 0))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7642 (x (> (logand perm 1) 0)))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7643 (concat (or (and r "r") "-")
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7644 (or (and w "w") "-")
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7645 (or (and suid x suid-text) ; suid, execute
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7646 (and suid (upcase suid-text)) ; suid, !execute
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7647 (and x "x") "-")))) ; !suid
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7648
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7649 (defun tramp-decimal-to-octal (i)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7650 "Return a string consisting of the octal digits of I.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7651 Not actually used. Use `(format \"%o\" i)' instead?"
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7652 (cond ((< i 0) (error "Cannot convert negative number to octal"))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7653 ((not (integerp i)) (error "Cannot convert non-integer to octal"))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7654 ((zerop i) "0")
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7655 (t (concat (tramp-decimal-to-octal (/ i 8))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7656 (number-to-string (% i 8))))))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7657
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7658 ;; Kudos to Gerd Moellmann for this suggestion.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7659 (defun tramp-octal-to-decimal (ostr)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7660 "Given a string of octal digits, return a decimal number."
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7661 (let ((x (or ostr "")))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7662 ;; `save-match' is in `tramp-mode-string-to-int' which calls this.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7663 (unless (string-match "\\`[0-7]*\\'" x)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7664 (error "Non-octal junk in string `%s'" x))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7665 (string-to-number ostr 8)))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7666
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7667 (defun tramp-shell-case-fold (string)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7668 "Converts STRING to shell glob pattern which ignores case."
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7669 (mapconcat
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7670 (lambda (c)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7671 (if (equal (downcase c) (upcase c))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7672 (vector c)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7673 (format "[%c%c]" (downcase c) (upcase c))))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7674 string
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7675 ""))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7676
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7677
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59582
diff changeset
7678 ;; ------------------------------------------------------------
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
7679 ;; -- Tramp file names --
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59582
diff changeset
7680 ;; ------------------------------------------------------------
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7681 ;; Conversion functions between external representation and
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7682 ;; internal data structure. Convenience functions for internal
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7683 ;; data structure.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7684
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7685 (defun tramp-file-name-p (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7686 "Check whether VEC is a Tramp object."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7687 (and (vectorp vec) (= 4 (length vec))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7688
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7689 (defun tramp-file-name-method (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7690 "Return method component of VEC."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7691 (and (tramp-file-name-p vec) (aref vec 0)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7692
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7693 (defun tramp-file-name-user (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7694 "Return user component of VEC."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7695 (and (tramp-file-name-p vec) (aref vec 1)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7696
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7697 (defun tramp-file-name-host (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7698 "Return host component of VEC."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7699 (and (tramp-file-name-p vec) (aref vec 2)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7700
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7701 (defun tramp-file-name-localname (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7702 "Return localname component of VEC."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7703 (and (tramp-file-name-p vec) (aref vec 3)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7704
100634
2af636c8c9d2 * net/tramp.el (tramp-rfn-eshadow-update-overlay): Move overlay to
Michael Albinus <michael.albinus@gmx.de>
parents: 100316
diff changeset
7705 ;; The user part of a Tramp file name vector can be of kind
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
7706 ;; "user%domain". Sometimes, we must extract these parts.
100634
2af636c8c9d2 * net/tramp.el (tramp-rfn-eshadow-update-overlay): Move overlay to
Michael Albinus <michael.albinus@gmx.de>
parents: 100316
diff changeset
7707 (defun tramp-file-name-real-user (vec)
2af636c8c9d2 * net/tramp.el (tramp-rfn-eshadow-update-overlay): Move overlay to
Michael Albinus <michael.albinus@gmx.de>
parents: 100316
diff changeset
7708 "Return the user name of VEC without domain."
105523
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7709 (save-match-data
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7710 (let ((user (tramp-file-name-user vec)))
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7711 (if (and (stringp user)
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7712 (string-match tramp-user-with-domain-regexp user))
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7713 (match-string 1 user)
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7714 user))))
100634
2af636c8c9d2 * net/tramp.el (tramp-rfn-eshadow-update-overlay): Move overlay to
Michael Albinus <michael.albinus@gmx.de>
parents: 100316
diff changeset
7715
2af636c8c9d2 * net/tramp.el (tramp-rfn-eshadow-update-overlay): Move overlay to
Michael Albinus <michael.albinus@gmx.de>
parents: 100316
diff changeset
7716 (defun tramp-file-name-domain (vec)
2af636c8c9d2 * net/tramp.el (tramp-rfn-eshadow-update-overlay): Move overlay to
Michael Albinus <michael.albinus@gmx.de>
parents: 100316
diff changeset
7717 "Return the domain name of VEC."
105523
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7718 (save-match-data
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7719 (let ((user (tramp-file-name-user vec)))
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7720 (and (stringp user)
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7721 (string-match tramp-user-with-domain-regexp user)
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7722 (match-string 2 user)))))
100634
2af636c8c9d2 * net/tramp.el (tramp-rfn-eshadow-update-overlay): Move overlay to
Michael Albinus <michael.albinus@gmx.de>
parents: 100316
diff changeset
7723
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7724 ;; The host part of a Tramp file name vector can be of kind
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7725 ;; "host#port". Sometimes, we must extract these parts.
84406
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
7726 (defun tramp-file-name-real-host (vec)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7727 "Return the host name of VEC without port."
105523
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7728 (save-match-data
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7729 (let ((host (tramp-file-name-host vec)))
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7730 (if (and (stringp host)
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7731 (string-match tramp-host-with-port-regexp host))
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7732 (match-string 1 host)
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7733 host))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7734
84406
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
7735 (defun tramp-file-name-port (vec)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7736 "Return the port number of VEC."
105523
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7737 (save-match-data
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7738 (let ((host (tramp-file-name-host vec)))
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7739 (and (stringp host)
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7740 (string-match tramp-host-with-port-regexp host)
54704a452681 * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
Michael Albinus <michael.albinus@gmx.de>
parents: 105482
diff changeset
7741 (string-to-number (match-string 2 host))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7742
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7743 (defun tramp-tramp-file-p (name)
106390
4eee659fa954 Cleanup.
Michael Albinus <michael.albinus@gmx.de>
parents: 106310
diff changeset
7744 "Return t if NAME is a string with Tramp file name syntax."
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7745 (save-match-data
106390
4eee659fa954 Cleanup.
Michael Albinus <michael.albinus@gmx.de>
parents: 106310
diff changeset
7746 (and (stringp name) (string-match tramp-file-name-regexp name))))
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59582
diff changeset
7747
84406
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
7748 (defun tramp-find-method (method user host)
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
7749 "Return the right method string to use.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7750 This is METHOD, if non-nil. Otherwise, do a lookup in
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
7751 `tramp-default-method-alist'."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7752 (or method
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7753 (let ((choices tramp-default-method-alist)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7754 lmethod item)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7755 (while choices
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7756 (setq item (pop choices))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7757 (when (and (string-match (or (nth 0 item) "") (or host ""))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7758 (string-match (or (nth 1 item) "") (or user "")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7759 (setq lmethod (nth 2 item))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7760 (setq choices nil)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7761 lmethod)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7762 tramp-default-method))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7763
84406
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
7764 (defun tramp-find-user (method user host)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7765 "Return the right user string to use.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7766 This is USER, if non-nil. Otherwise, do a lookup in
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7767 `tramp-default-user-alist'."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7768 (or user
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7769 (let ((choices tramp-default-user-alist)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7770 luser item)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7771 (while choices
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7772 (setq item (pop choices))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7773 (when (and (string-match (or (nth 0 item) "") (or method ""))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7774 (string-match (or (nth 1 item) "") (or host "")))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7775 (setq luser (nth 2 item))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7776 (setq choices nil)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7777 luser)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7778 tramp-default-user))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7779
84406
38bcf4ef30c3 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents: 82942
diff changeset
7780 (defun tramp-find-host (method user host)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7781 "Return the right host string to use.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7782 This is HOST, if non-nil. Otherwise, it is `tramp-default-host'."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7783 (or (and (> (length host) 0) host)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7784 tramp-default-host))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7785
84966
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
7786 (defun tramp-dissect-file-name (name &optional nodefault)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7787 "Return a `tramp-file-name' structure.
84966
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
7788 The structure consists of remote method, remote user, remote host
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
7789 and localname (file name on remote host). If NODEFAULT is
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
7790 non-nil, the file name parts are not expanded to their default
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
7791 values."
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
7792 (save-match-data
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7793 (let ((match (string-match (nth 0 tramp-file-name-structure) name)))
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
7794 (unless match (error "Not a Tramp file name: %s" name))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7795 (let ((method (match-string (nth 1 tramp-file-name-structure) name))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7796 (user (match-string (nth 2 tramp-file-name-structure) name))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7797 (host (match-string (nth 3 tramp-file-name-structure) name))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7798 (localname (match-string (nth 4 tramp-file-name-structure) name)))
87997
13df71a98040 * net/tramp.el (tramp-dissect-file-name): Raise an error when
Michael Albinus <michael.albinus@gmx.de>
parents: 87947
diff changeset
7799 (when (member method '("multi" "multiu"))
13df71a98040 * net/tramp.el (tramp-dissect-file-name): Raise an error when
Michael Albinus <michael.albinus@gmx.de>
parents: 87947
diff changeset
7800 (error
13df71a98040 * net/tramp.el (tramp-dissect-file-name): Raise an error when
Michael Albinus <michael.albinus@gmx.de>
parents: 87947
diff changeset
7801 "`%s' method is no longer supported, see (info \"(tramp)Multi-hops\")"
13df71a98040 * net/tramp.el (tramp-dissect-file-name): Raise an error when
Michael Albinus <michael.albinus@gmx.de>
parents: 87947
diff changeset
7802 method))
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
7803 (when host
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
7804 (when (string-match tramp-prefix-ipv6-regexp host)
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
7805 (setq host (replace-match "" nil t host)))
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
7806 (when (string-match tramp-postfix-ipv6-regexp host)
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
7807 (setq host (replace-match "" nil t host))))
84966
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
7808 (if nodefault
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
7809 (vector method user host localname)
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
7810 (vector
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
7811 (tramp-find-method method user host)
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
7812 (tramp-find-user method user host)
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
7813 (tramp-find-host method user host)
fa9dd0b54e54 * net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents: 84942
diff changeset
7814 localname))))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7815
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7816 (defun tramp-equal-remote (file1 file2)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7817 "Checks, whether the remote parts of FILE1 and FILE2 are identical.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7818 The check depends on method, user and host name of the files. If
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7819 one of the components is missing, the default values are used.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7820 The local file name parts of FILE1 and FILE2 are not taken into
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7821 account.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7822
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7823 Example:
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7824
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7825 (tramp-equal-remote \"/ssh::/etc\" \"/<your host name>:/home\")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7826
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7827 would yield `t'. On the other hand, the following check results in nil:
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7828
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7829 (tramp-equal-remote \"/sudo::/etc\" \"/su::/etc\")"
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
7830 (and (stringp (file-remote-p file1))
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
7831 (stringp (file-remote-p file2))
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84985
diff changeset
7832 (string-equal (file-remote-p file1) (file-remote-p file2))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7833
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7834 (defun tramp-make-tramp-file-name (method user host localname)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7835 "Constructs a Tramp file name from METHOD, USER, HOST and LOCALNAME."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7836 (concat tramp-prefix-format
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7837 (when (not (zerop (length method)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7838 (concat method tramp-postfix-method-format))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7839 (when (not (zerop (length user)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7840 (concat user tramp-postfix-user-format))
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
7841 (when host
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
7842 (if (string-match tramp-ipv6-regexp host)
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
7843 (concat tramp-prefix-ipv6-format host tramp-postfix-ipv6-format)
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
7844 host))
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
7845 tramp-postfix-host-format
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7846 (when localname localname)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7847
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7848 (defun tramp-completion-make-tramp-file-name (method user host localname)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7849 "Constructs a Tramp file name from METHOD, USER, HOST and LOCALNAME.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7850 It must not be a complete Tramp file name, but as long as there are
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7851 necessary only. This function will be used in file name completion."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7852 (concat tramp-prefix-format
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7853 (when (not (zerop (length method)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7854 (concat method tramp-postfix-method-format))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7855 (when (not (zerop (length user)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7856 (concat user tramp-postfix-user-format))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7857 (when (not (zerop (length host)))
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
7858 (concat
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
7859 (if (string-match tramp-ipv6-regexp host)
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
7860 (concat tramp-prefix-ipv6-format host tramp-postfix-ipv6-format)
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
7861 host)
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
7862 tramp-postfix-host-format))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7863 (when localname localname)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7864
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7865 (defun tramp-make-copy-program-file-name (vec)
51177
6234a4fe96f9 Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 50494
diff changeset
7866 "Create a file name suitable to be passed to `rcp' and workalikes."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7867 (let ((user (tramp-file-name-user vec))
82808
6e5814967ffb * net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 82603
diff changeset
7868 (host (tramp-file-name-real-host vec))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7869 (localname (tramp-shell-quote-argument
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7870 (tramp-file-name-localname vec))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7871 (if (not (zerop (length user)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7872 (format "%s@%s:%s" user host localname)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7873 (format "%s:%s" host localname))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7874
104807
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
7875 (defun tramp-method-out-of-band-p (vec size)
55420
c44f9de543e3 2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 54198
diff changeset
7876 "Return t if this is an out-of-band method, nil otherwise."
104807
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
7877 (and
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
7878 ;; It shall be an out-of-band method.
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
7879 (tramp-get-method-parameter (tramp-file-name-method vec) 'tramp-copy-program)
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
7880 ;; Either the file size is large enough, or (in rare cases) there
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
7881 ;; does not exist a remote encoding.
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
7882 (or (> size tramp-copy-size-limit)
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
7883 (null (tramp-get-remote-coding vec "remote-encoding")))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7884
82808
6e5814967ffb * net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 82603
diff changeset
7885 (defun tramp-local-host-p (vec)
6e5814967ffb * net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 82603
diff changeset
7886 "Return t if this points to the local host, nil otherwise."
87748
e958bc9885ca * net/tramp.el (tramp-local-host-p): Use `tramp-file-name-host'
Michael Albinus <michael.albinus@gmx.de>
parents: 87649
diff changeset
7887 ;; We cannot use `tramp-file-name-real-host'. A port is an
e958bc9885ca * net/tramp.el (tramp-local-host-p): Use `tramp-file-name-host'
Michael Albinus <michael.albinus@gmx.de>
parents: 87649
diff changeset
7888 ;; indication for an ssh tunnel or alike.
e958bc9885ca * net/tramp.el (tramp-local-host-p): Use `tramp-file-name-host'
Michael Albinus <michael.albinus@gmx.de>
parents: 87649
diff changeset
7889 (let ((host (tramp-file-name-host vec)))
82808
6e5814967ffb * net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 82603
diff changeset
7890 (and
6e5814967ffb * net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 82603
diff changeset
7891 (stringp host)
100856
49bc8bb7a597 * net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents: 100634
diff changeset
7892 (string-match tramp-local-host-regexp host)
105549
e7c777c6e230 * net/tramp.el (tramp-local-host-p): Function shall return nil for
Michael Albinus <michael.albinus@gmx.de>
parents: 105523
diff changeset
7893 ;; The method shall be applied to one of the shell file name
e7c777c6e230 * net/tramp.el (tramp-local-host-p): Function shall return nil for
Michael Albinus <michael.albinus@gmx.de>
parents: 105523
diff changeset
7894 ;; handler. `tramp-local-host-p' is also called for "smb" and
e7c777c6e230 * net/tramp.el (tramp-local-host-p): Function shall return nil for
Michael Albinus <michael.albinus@gmx.de>
parents: 105523
diff changeset
7895 ;; alike, where it must fail.
e7c777c6e230 * net/tramp.el (tramp-local-host-p): Function shall return nil for
Michael Albinus <michael.albinus@gmx.de>
parents: 105523
diff changeset
7896 (tramp-get-method-parameter
e7c777c6e230 * net/tramp.el (tramp-local-host-p): Function shall return nil for
Michael Albinus <michael.albinus@gmx.de>
parents: 105523
diff changeset
7897 (tramp-file-name-method vec) 'tramp-login-program)
87921
c49bc2860fd0 * net/tramp.el (tramp-remote-process-environment): Set "LC_ALL=C".
Michael Albinus <michael.albinus@gmx.de>
parents: 87748
diff changeset
7898 ;; The local temp directory must be writable for the other user.
c49bc2860fd0 * net/tramp.el (tramp-remote-process-environment): Set "LC_ALL=C".
Michael Albinus <michael.albinus@gmx.de>
parents: 87748
diff changeset
7899 (file-writable-p
c49bc2860fd0 * net/tramp.el (tramp-remote-process-environment): Set "LC_ALL=C".
Michael Albinus <michael.albinus@gmx.de>
parents: 87748
diff changeset
7900 (tramp-make-tramp-file-name
c49bc2860fd0 * net/tramp.el (tramp-remote-process-environment): Set "LC_ALL=C".
Michael Albinus <michael.albinus@gmx.de>
parents: 87748
diff changeset
7901 (tramp-file-name-method vec)
c49bc2860fd0 * net/tramp.el (tramp-remote-process-environment): Set "LC_ALL=C".
Michael Albinus <michael.albinus@gmx.de>
parents: 87748
diff changeset
7902 (tramp-file-name-user vec)
c49bc2860fd0 * net/tramp.el (tramp-remote-process-environment): Set "LC_ALL=C".
Michael Albinus <michael.albinus@gmx.de>
parents: 87748
diff changeset
7903 host
103782
c5225871ee78 * net/tramp.el (tramp-set-file-uid-gid): Handle the case the
Michael Albinus <michael.albinus@gmx.de>
parents: 103735
diff changeset
7904 (tramp-compat-temporary-file-directory)))
c5225871ee78 * net/tramp.el (tramp-set-file-uid-gid): Handle the case the
Michael Albinus <michael.albinus@gmx.de>
parents: 103735
diff changeset
7905 ;; On some systems, chown runs only for root.
c5225871ee78 * net/tramp.el (tramp-set-file-uid-gid): Handle the case the
Michael Albinus <michael.albinus@gmx.de>
parents: 103735
diff changeset
7906 (or (zerop (user-uid))
c5225871ee78 * net/tramp.el (tramp-set-file-uid-gid): Handle the case the
Michael Albinus <michael.albinus@gmx.de>
parents: 103735
diff changeset
7907 (zerop (tramp-get-remote-uid vec 'integer))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7908
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7909 ;; Variables local to connection.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
7910
82603
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7911 (defun tramp-get-remote-path (vec)
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7912 (with-connection-property
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7913 ;; When `tramp-own-remote-path' is in `tramp-remote-path', we
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7914 ;; cache the result for the session only. Otherwise, the result
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7915 ;; is cached persistently.
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7916 (if (memq 'tramp-own-remote-path tramp-remote-path)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7917 (tramp-get-connection-process vec)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7918 vec)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7919 "remote-path"
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
7920 (let* ((remote-path (tramp-compat-copy-tree tramp-remote-path))
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7921 (elt1 (memq 'tramp-default-remote-path remote-path))
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7922 (elt2 (memq 'tramp-own-remote-path remote-path))
82603
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7923 (default-remote-path
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7924 (when elt1
82603
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7925 (condition-case nil
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7926 (tramp-send-command-and-read
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7927 vec "echo \\\"`getconf PATH`\\\"")
82603
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7928 ;; Default if "getconf" is not available.
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7929 (error
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7930 (tramp-message
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7931 vec 3
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7932 "`getconf PATH' not successful, using default value \"%s\"."
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7933 "/bin:/usr/bin")
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7934 "/bin:/usr/bin"))))
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7935 (own-remote-path
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7936 (when elt2
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7937 (condition-case nil
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7938 (tramp-send-command-and-read vec "echo \\\"$PATH\\\"")
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7939 ;; Default if "getconf" is not available.
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7940 (error
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7941 (tramp-message
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7942 vec 3 "$PATH not set, ignoring `tramp-own-remote-path'.")
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7943 nil)))))
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7944
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7945 ;; Replace place holder `tramp-default-remote-path'.
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7946 (when elt1
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7947 (setcdr elt1
82603
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7948 (append
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7949 (tramp-compat-split-string default-remote-path ":")
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7950 (cdr elt1)))
82603
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7951 (setq remote-path (delq 'tramp-default-remote-path remote-path)))
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7952
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7953 ;; Replace place holder `tramp-own-remote-path'.
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7954 (when elt2
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7955 (setcdr elt2
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7956 (append
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7957 (tramp-compat-split-string own-remote-path ":")
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7958 (cdr elt2)))
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7959 (setq remote-path (delq 'tramp-own-remote-path remote-path)))
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7960
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7961 ;; Remove double entries.
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7962 (setq elt1 remote-path)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7963 (while (consp elt1)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7964 (while (and (car elt1) (setq elt2 (member (car elt1) (cdr elt1))))
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7965 (setcar elt2 nil))
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7966 (setq elt1 (cdr elt1)))
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7967
82603
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7968 ;; Remove non-existing directories.
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7969 (delq
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7970 nil
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7971 (mapcar
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7972 (lambda (x)
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7973 (and
103527
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7974 (stringp x)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7975 (file-directory-p
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7976 (tramp-make-tramp-file-name
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7977 (tramp-file-name-method vec)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7978 (tramp-file-name-user vec)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7979 (tramp-file-name-host vec)
d820807ffab7 * net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents: 103333
diff changeset
7980 x))
82603
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7981 x))
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7982 remote-path)))))
d0c9cce4628c * net/tramp.el (top): Require cl.el, when `copy-tree' is not available
Michael Albinus <michael.albinus@gmx.de>
parents: 82324
diff changeset
7983
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
7984 (defun tramp-get-remote-tmpdir (vec)
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
7985 (with-connection-property vec "tmp-directory"
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
7986 (let ((dir (tramp-shell-quote-argument "/tmp")))
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
7987 (if (and (zerop
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
7988 (tramp-send-command-and-check
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
7989 vec (format "%s -d %s" (tramp-get-test-command vec) dir)))
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
7990 (zerop
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
7991 (tramp-send-command-and-check
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
7992 vec (format "%s -w %s" (tramp-get-test-command vec) dir))))
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
7993 dir
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
7994 (tramp-error vec 'file-error "Directory %s not accessible" dir)))))
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
7995
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7996 (defun tramp-get-ls-command (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
7997 (with-connection-property vec "ls"
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
7998 (tramp-message vec 5 "Finding a suitable `ls' command")
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
7999 (or
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8000 (catch 'ls-found
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8001 (dolist (cmd '("ls" "gnuls" "gls"))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8002 (let ((dl (tramp-get-remote-path vec))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8003 result)
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8004 (while (and dl (setq result (tramp-find-executable vec cmd dl t t)))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8005 ;; Check parameter.
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8006 (when (zerop (tramp-send-command-and-check
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8007 vec (format "%s -lnd /" result)))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8008 (throw 'ls-found result))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8009 (setq dl (cdr dl))))))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8010 (tramp-error vec 'file-error "Couldn't find a proper `ls' command"))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8011
104216
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
8012 (defun tramp-get-ls-command-with-dired (vec)
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
8013 (save-match-data
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
8014 (with-connection-property vec "ls-dired"
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
8015 (tramp-message vec 5 "Checking, whether `ls --dired' works")
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
8016 (zerop (tramp-send-command-and-check
104807
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
8017 vec (format "%s --dired /" (tramp-get-ls-command vec)))))))
104216
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
8018
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8019 (defun tramp-get-test-command (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8020 (with-connection-property vec "test"
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8021 (tramp-message vec 5 "Finding a suitable `test' command")
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8022 (if (zerop (tramp-send-command-and-check vec "test 0"))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8023 "test"
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8024 (tramp-find-executable vec "test" (tramp-get-remote-path vec)))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8025
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8026 (defun tramp-get-test-nt-command (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8027 ;; Does `test A -nt B' work? Use abominable `find' construct if it
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8028 ;; doesn't. BSD/OS 4.0 wants the parentheses around the command,
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8029 ;; for otherwise the shell crashes.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8030 (with-connection-property vec "test-nt"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8031 (or
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8032 (progn
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8033 (tramp-send-command
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8034 vec (format "( %s / -nt / )" (tramp-get-test-command vec)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8035 (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
8036 (goto-char (point-min))
87921
c49bc2860fd0 * net/tramp.el (tramp-remote-process-environment): Set "LC_ALL=C".
Michael Albinus <michael.albinus@gmx.de>
parents: 87748
diff changeset
8037 (when (looking-at (regexp-quote tramp-end-of-output))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8038 (format "%s %%s -nt %%s" (tramp-get-test-command vec)))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8039 (progn
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8040 (tramp-send-command
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8041 vec
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8042 (format
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8043 "tramp_test_nt () {\n%s -n \"`find $1 -prune -newer $2 -print`\"\n}"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8044 (tramp-get-test-command vec)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8045 "tramp_test_nt %s %s"))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8046
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8047 (defun tramp-get-file-exists-command (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8048 (with-connection-property vec "file-exists"
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8049 (tramp-message vec 5 "Finding command to check if file exists")
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8050 (tramp-find-file-exists-command vec)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8051
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8052 (defun tramp-get-remote-ln (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8053 (with-connection-property vec "ln"
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8054 (tramp-message vec 5 "Finding a suitable `ln' command")
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8055 (tramp-find-executable vec "ln" (tramp-get-remote-path vec))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8056
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8057 (defun tramp-get-remote-perl (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8058 (with-connection-property vec "perl"
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8059 (tramp-message vec 5 "Finding a suitable `perl' command")
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8060 (let ((result
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8061 (or (tramp-find-executable vec "perl5" (tramp-get-remote-path vec))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8062 (tramp-find-executable
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8063 vec "perl" (tramp-get-remote-path vec)))))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8064 ;; We must check also for some Perl modules.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8065 (when result
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8066 (with-connection-property vec "perl-file-spec"
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8067 (zerop
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8068 (tramp-send-command-and-check
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8069 vec (format "%s -e 'use File::Spec;'" result))))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8070 (with-connection-property vec "perl-cwd-realpath"
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8071 (zerop
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8072 (tramp-send-command-and-check
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8073 vec (format "%s -e 'use Cwd \"realpath\";'" result)))))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8074 result)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8075
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8076 (defun tramp-get-remote-stat (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8077 (with-connection-property vec "stat"
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8078 (tramp-message vec 5 "Finding a suitable `stat' command")
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8079 (let ((result (tramp-find-executable
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8080 vec "stat" (tramp-get-remote-path vec)))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8081 tmp)
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8082 ;; Check whether stat(1) returns usable syntax. %s does not
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8083 ;; work on older AIX systems.
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8084 (when result
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8085 (setq tmp
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8086 ;; We don't want to display an error message.
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8087 (with-temp-message (or (current-message) "")
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8088 (condition-case nil
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8089 (tramp-send-command-and-read
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8090 vec (format "%s -c '(\"%%N\" %%s)' /" result))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8091 (error nil))))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8092 (unless (and (listp tmp) (stringp (car tmp))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8093 (string-match "^./.$" (car tmp))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8094 (integerp (cadr tmp)))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8095 (setq result nil)))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8096 result)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8097
105767
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8098 (defun tramp-get-remote-readlink (vec)
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8099 (with-connection-property vec "readlink"
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8100 (tramp-message vec 5 "Finding a suitable `readlink' command")
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8101 (let ((result (tramp-find-executable
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8102 vec "readlink" (tramp-get-remote-path vec))))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8103 (when (and result
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8104 ;; We don't want to display an error message.
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8105 (with-temp-message (or (current-message) "")
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8106 (condition-case nil
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8107 (zerop
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8108 (tramp-send-command-and-check
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8109 vec (format "%s --canonicalize-missing /" result)))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8110 (error nil))))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8111 result))))
986f88345cba * net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents: 105718
diff changeset
8112
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8113 (defun tramp-get-remote-id (vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8114 (with-connection-property vec "id"
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8115 (tramp-message vec 5 "Finding POSIX `id' command")
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8116 (or
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8117 (catch 'id-found
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8118 (let ((dl (tramp-get-remote-path vec))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8119 result)
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8120 (while (and dl (setq result (tramp-find-executable vec "id" dl t t)))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8121 ;; Check POSIX parameter.
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8122 (when (zerop (tramp-send-command-and-check
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8123 vec (format "%s -u" result)))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8124 (throw 'id-found result))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8125 (setq dl (cdr dl)))))
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8126 (tramp-error vec 'file-error "Couldn't find a POSIX `id' command"))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8127
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8128 (defun tramp-get-remote-uid (vec id-format)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8129 (with-connection-property vec (format "uid-%s" id-format)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8130 (let ((res (tramp-send-command-and-read
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8131 vec
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8132 (format "%s -u%s %s"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8133 (tramp-get-remote-id vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8134 (if (equal id-format 'integer) "" "n")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8135 (if (equal id-format 'integer)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8136 "" "| sed -e s/^/\\\"/ -e s/\$/\\\"/")))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8137 ;; The command might not always return a number.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8138 (if (and (equal id-format 'integer) (not (integerp res))) -1 res))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8139
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8140 (defun tramp-get-remote-gid (vec id-format)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8141 (with-connection-property vec (format "gid-%s" id-format)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8142 (let ((res (tramp-send-command-and-read
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8143 vec
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8144 (format "%s -g%s %s"
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8145 (tramp-get-remote-id vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8146 (if (equal id-format 'integer) "" "n")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8147 (if (equal id-format 'integer)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8148 "" "| sed -e s/^/\\\"/ -e s/\$/\\\"/")))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8149 ;; The command might not always return a number.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8150 (if (and (equal id-format 'integer) (not (integerp res))) -1 res))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8151
82942
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
8152 (defun tramp-get-local-uid (id-format)
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
8153 (if (equal id-format 'integer) (user-uid) (user-login-name)))
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
8154
5cf3cd03cb50 * net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents: 82808
diff changeset
8155 (defun tramp-get-local-gid (id-format)
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
8156 (nth 3 (tramp-compat-file-attributes "~/" id-format)))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8157
46752
54b975949d6a New version 2.0.5.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46584
diff changeset
8158 ;; Some predefined connection properties.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8159 (defun tramp-get-remote-coding (vec prop)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8160 ;; Local coding handles properties like remote coding. So we could
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8161 ;; call it without pain.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8162 (let ((ret (tramp-get-local-coding vec prop)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8163 ;; The connection property might have been cached. So we must send
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8164 ;; the script - maybe.
99950
f803581cae44 * net/tramp.el (tramp-handle-write-region): Improve the check for
Michael Albinus <michael.albinus@gmx.de>
parents: 99615
diff changeset
8165 (when (and ret (symbolp ret))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8166 (let ((name (symbol-name ret)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8167 (while (string-match (regexp-quote "-") name)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8168 (setq name (replace-match "_" nil t name)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8169 (tramp-maybe-send-script vec (symbol-value ret) name)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8170 (setq ret name)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8171 ;; Return the value.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8172 ret))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8173
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8174 (defun tramp-get-local-coding (vec prop)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8175 (or
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8176 (tramp-get-connection-property vec prop nil)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8177 (progn
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8178 (tramp-find-inline-encoding vec)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8179 (tramp-get-connection-property vec prop nil))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8180
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8181 (defun tramp-get-method-parameter (method param)
53206
0c19f1a19b2b (tramp-chunksize): Extend docstring. Suggested by
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 52401
diff changeset
8182 "Return the method parameter PARAM.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8183 If the `tramp-methods' entry does not exist, return NIL."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8184 (let ((entry (assoc param (assoc method tramp-methods))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8185 (when entry (cadr entry))))
51968
e4c4c45ea013 Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51603
diff changeset
8186
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8187 ;; Auto saving to a special directory.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8188
65304
379e08762d65 * net/tramp.el (tramp-handle-make-auto-save-file-name): Deactivate
Michael Albinus <michael.albinus@gmx.de>
parents: 65254
diff changeset
8189 (defun tramp-exists-file-name-handler (operation &rest args)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8190 "Checks whether OPERATION runs a file name handler."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8191 ;; The file name handler is determined on base of either an
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8192 ;; argument, `buffer-file-name', or `default-directory'.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8193 (condition-case nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8194 (let* ((buffer-file-name "/")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8195 (default-directory "/")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8196 (fnha file-name-handler-alist)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8197 (check-file-name-operation operation)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8198 (file-name-handler-alist
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8199 (list
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8200 (cons "/"
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
8201 (lambda (operation &rest args)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
8202 "Returns OPERATION if it is the one to be checked."
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
8203 (if (equal check-file-name-operation operation)
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
8204 operation
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
8205 (let ((file-name-handler-alist fnha))
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
8206 (apply operation args))))))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8207 (equal (apply operation args) operation))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8208 (error nil)))
65248
0f994edbec5e Make `make-auto-save-file-name' a magic operation.
Michael Albinus <michael.albinus@gmx.de>
parents: 64772
diff changeset
8209
0f994edbec5e Make `make-auto-save-file-name' a magic operation.
Michael Albinus <michael.albinus@gmx.de>
parents: 64772
diff changeset
8210 (unless (tramp-exists-file-name-handler 'make-auto-save-file-name)
0f994edbec5e Make `make-auto-save-file-name' a magic operation.
Michael Albinus <michael.albinus@gmx.de>
parents: 64772
diff changeset
8211 (defadvice make-auto-save-file-name
0f994edbec5e Make `make-auto-save-file-name' a magic operation.
Michael Albinus <michael.albinus@gmx.de>
parents: 64772
diff changeset
8212 (around tramp-advice-make-auto-save-file-name () activate)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8213 "Invoke `tramp-handle-make-auto-save-file-name' for Tramp files."
65248
0f994edbec5e Make `make-auto-save-file-name' a magic operation.
Michael Albinus <michael.albinus@gmx.de>
parents: 64772
diff changeset
8214 (if (and (buffer-file-name) (tramp-tramp-file-p (buffer-file-name)))
104807
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
8215 ;; We cannot call `tramp-handle-make-auto-save-file-name'
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
8216 ;; directly, because this would bypass the locking mechanism.
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
8217 (setq ad-return-value
509a5b989179 * net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents: 104673
diff changeset
8218 (tramp-file-name-handler 'make-auto-save-file-name))
68335
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
8219 ad-do-it))
105907
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
8220 (add-hook
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
8221 'tramp-unload-hook
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
8222 (lambda ()
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
8223 (ad-remove-advice
9abdd578d117 * net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents: 105893
diff changeset
8224 'make-auto-save-file-name
105952
c3e434f0d02f * net/tramp.el (tramp-advice-minibuffer-electric-separator)
Michael Albinus <michael.albinus@gmx.de>
parents: 105907
diff changeset
8225 'around 'tramp-advice-make-auto-save-file-name)
c3e434f0d02f * net/tramp.el (tramp-advice-minibuffer-electric-separator)
Michael Albinus <michael.albinus@gmx.de>
parents: 105907
diff changeset
8226 (ad-activate 'make-auto-save-file-name))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8227
60763
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 60287
diff changeset
8228 ;; In Emacs < 22 and XEmacs < 21.5 autosaved remote files have
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 60287
diff changeset
8229 ;; permission 0666 minus umask. This is a security threat.
57463
40298ea4d83f Sync with Tramp 2.0.45.
Michael Albinus <michael.albinus@gmx.de>
parents: 56644
diff changeset
8230
40298ea4d83f Sync with Tramp 2.0.45.
Michael Albinus <michael.albinus@gmx.de>
parents: 56644
diff changeset
8231 (defun tramp-set-auto-save-file-modes ()
40298ea4d83f Sync with Tramp 2.0.45.
Michael Albinus <michael.albinus@gmx.de>
parents: 56644
diff changeset
8232 "Set permissions of autosaved remote files to the original permissions."
40298ea4d83f Sync with Tramp 2.0.45.
Michael Albinus <michael.albinus@gmx.de>
parents: 56644
diff changeset
8233 (let ((bfn (buffer-file-name)))
40298ea4d83f Sync with Tramp 2.0.45.
Michael Albinus <michael.albinus@gmx.de>
parents: 56644
diff changeset
8234 (when (and (stringp bfn)
40298ea4d83f Sync with Tramp 2.0.45.
Michael Albinus <michael.albinus@gmx.de>
parents: 56644
diff changeset
8235 (tramp-tramp-file-p bfn)
86204
7d7472ea9c0a * net/tramp.el (tramp-completion-reread-directory-timeout): New
Michael Albinus <michael.albinus@gmx.de>
parents: 86048
diff changeset
8236 (buffer-modified-p)
57463
40298ea4d83f Sync with Tramp 2.0.45.
Michael Albinus <michael.albinus@gmx.de>
parents: 56644
diff changeset
8237 (stringp buffer-auto-save-file-name)
60763
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 60287
diff changeset
8238 (not (equal bfn buffer-auto-save-file-name)))
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 60287
diff changeset
8239 (unless (file-exists-p buffer-auto-save-file-name)
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 60287
diff changeset
8240 (write-region "" nil buffer-auto-save-file-name))
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 60287
diff changeset
8241 ;; Permissions should be set always, because there might be an old
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 60287
diff changeset
8242 ;; auto-saved file belonging to another original file. This could
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 60287
diff changeset
8243 ;; be a security threat.
62344
5a19ff64befb Sync with Tramp 2.0.49.
Michael Albinus <michael.albinus@gmx.de>
parents: 60763
diff changeset
8244 (set-file-modes buffer-auto-save-file-name
65925
da00cdf6de37 Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents: 65792
diff changeset
8245 (or (file-modes bfn) (tramp-octal-to-decimal "0600"))))))
57463
40298ea4d83f Sync with Tramp 2.0.45.
Michael Albinus <michael.albinus@gmx.de>
parents: 56644
diff changeset
8246
40298ea4d83f Sync with Tramp 2.0.45.
Michael Albinus <michael.albinus@gmx.de>
parents: 56644
diff changeset
8247 (unless (or (> emacs-major-version 21)
40298ea4d83f Sync with Tramp 2.0.45.
Michael Albinus <michael.albinus@gmx.de>
parents: 56644
diff changeset
8248 (and (featurep 'xemacs)
40298ea4d83f Sync with Tramp 2.0.45.
Michael Albinus <michael.albinus@gmx.de>
parents: 56644
diff changeset
8249 (= emacs-major-version 21)
60763
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 60287
diff changeset
8250 (> emacs-minor-version 4)))
68335
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
8251 (add-hook 'auto-save-hook 'tramp-set-auto-save-file-modes)
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
8252 (add-hook 'tramp-unload-hook
104673
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
8253 (lambda ()
317dde5b902b * net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents: 104642
diff changeset
8254 (remove-hook 'auto-save-hook 'tramp-set-auto-save-file-modes))))
57463
40298ea4d83f Sync with Tramp 2.0.45.
Michael Albinus <michael.albinus@gmx.de>
parents: 56644
diff changeset
8255
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8256 (defun tramp-subst-strs-in-string (alist string)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8257 "Replace all occurrences of the string FROM with TO in STRING.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8258 ALIST is of the form ((FROM . TO) ...)."
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8259 (save-match-data
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8260 (while alist
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8261 (let* ((pr (car alist))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8262 (from (car pr))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8263 (to (cdr pr)))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8264 (while (string-match (regexp-quote from) string)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8265 (setq string (replace-match to t t string)))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8266 (setq alist (cdr alist))))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8267 string))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8268
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8269 ;; ------------------------------------------------------------
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8270 ;; -- Compatibility functions section --
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8271 ;; ------------------------------------------------------------
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8272
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8273 (defun tramp-read-passwd (proc &optional prompt)
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8274 "Read a password from user (compat function).
95025
bdaea36b81dd * net/tramp.el: Load auth-source library.
Michael Albinus <michael.albinus@gmx.de>
parents: 94975
diff changeset
8275 Consults the auth-source package.
54198
c1bfc266f10a Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 53206
diff changeset
8276 Invokes `password-read' if available, `read-passwd' else."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8277 (let* ((key (tramp-make-tramp-file-name
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8278 tramp-current-method tramp-current-user
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8279 tramp-current-host ""))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8280 (pw-prompt
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8281 (or prompt
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8282 (with-current-buffer (process-buffer proc)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8283 (tramp-check-for-regexp proc tramp-password-prompt-regexp)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8284 (format "%s for %s " (capitalize (match-string 1)) key)))))
101656
287ee0c13903 * net/tramp.el (tramp-process-actions, tramp-read-passwd): Allow
Michael Albinus <michael.albinus@gmx.de>
parents: 101282
diff changeset
8285 (prog1
287ee0c13903 * net/tramp.el (tramp-process-actions, tramp-read-passwd): Allow
Michael Albinus <michael.albinus@gmx.de>
parents: 101282
diff changeset
8286 (or
287ee0c13903 * net/tramp.el (tramp-process-actions, tramp-read-passwd): Allow
Michael Albinus <michael.albinus@gmx.de>
parents: 101282
diff changeset
8287 ;; See if auth-sources contains something useful, if it's bound.
287ee0c13903 * net/tramp.el (tramp-process-actions, tramp-read-passwd): Allow
Michael Albinus <michael.albinus@gmx.de>
parents: 101282
diff changeset
8288 (and (boundp 'auth-sources)
287ee0c13903 * net/tramp.el (tramp-process-actions, tramp-read-passwd): Allow
Michael Albinus <michael.albinus@gmx.de>
parents: 101282
diff changeset
8289 (tramp-get-connection-property proc "first-password-request" nil)
287ee0c13903 * net/tramp.el (tramp-process-actions, tramp-read-passwd): Allow
Michael Albinus <michael.albinus@gmx.de>
parents: 101282
diff changeset
8290 ;; Try with Tramp's current method.
287ee0c13903 * net/tramp.el (tramp-process-actions, tramp-read-passwd): Allow
Michael Albinus <michael.albinus@gmx.de>
parents: 101282
diff changeset
8291 (funcall (symbol-function 'auth-source-user-or-password)
287ee0c13903 * net/tramp.el (tramp-process-actions, tramp-read-passwd): Allow
Michael Albinus <michael.albinus@gmx.de>
parents: 101282
diff changeset
8292 "password" tramp-current-host tramp-current-method))
287ee0c13903 * net/tramp.el (tramp-process-actions, tramp-read-passwd): Allow
Michael Albinus <michael.albinus@gmx.de>
parents: 101282
diff changeset
8293 ;; Try the password cache.
101729
adfc49512fc6 * net/tramp.el (tramp-read-passwd): Cached passwords shall still be used.
Michael Albinus <michael.albinus@gmx.de>
parents: 101656
diff changeset
8294 (when (functionp 'password-read)
adfc49512fc6 * net/tramp.el (tramp-read-passwd): Cached passwords shall still be used.
Michael Albinus <michael.albinus@gmx.de>
parents: 101656
diff changeset
8295 (unless (tramp-get-connection-property
adfc49512fc6 * net/tramp.el (tramp-read-passwd): Cached passwords shall still be used.
Michael Albinus <michael.albinus@gmx.de>
parents: 101656
diff changeset
8296 proc "first-password-request" nil)
adfc49512fc6 * net/tramp.el (tramp-read-passwd): Cached passwords shall still be used.
Michael Albinus <michael.albinus@gmx.de>
parents: 101656
diff changeset
8297 (funcall (symbol-function 'password-cache-remove) key))
adfc49512fc6 * net/tramp.el (tramp-read-passwd): Cached passwords shall still be used.
Michael Albinus <michael.albinus@gmx.de>
parents: 101656
diff changeset
8298 (let ((password
adfc49512fc6 * net/tramp.el (tramp-read-passwd): Cached passwords shall still be used.
Michael Albinus <michael.albinus@gmx.de>
parents: 101656
diff changeset
8299 (funcall (symbol-function 'password-read) pw-prompt key)))
adfc49512fc6 * net/tramp.el (tramp-read-passwd): Cached passwords shall still be used.
Michael Albinus <michael.albinus@gmx.de>
parents: 101656
diff changeset
8300 (funcall (symbol-function 'password-cache-add) key password)
adfc49512fc6 * net/tramp.el (tramp-read-passwd): Cached passwords shall still be used.
Michael Albinus <michael.albinus@gmx.de>
parents: 101656
diff changeset
8301 password))
101656
287ee0c13903 * net/tramp.el (tramp-process-actions, tramp-read-passwd): Allow
Michael Albinus <michael.albinus@gmx.de>
parents: 101282
diff changeset
8302 ;; Else, get the password interactively.
287ee0c13903 * net/tramp.el (tramp-process-actions, tramp-read-passwd): Allow
Michael Albinus <michael.albinus@gmx.de>
parents: 101282
diff changeset
8303 (read-passwd pw-prompt))
287ee0c13903 * net/tramp.el (tramp-process-actions, tramp-read-passwd): Allow
Michael Albinus <michael.albinus@gmx.de>
parents: 101282
diff changeset
8304 (tramp-set-connection-property proc "first-password-request" nil))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8305
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
8306 (defun tramp-clear-passwd (vec)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
8307 "Clear password cache for connection related to VEC."
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8308 (when (functionp 'password-cache-remove)
85508
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
8309 (funcall
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
8310 (symbol-function 'password-cache-remove)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
8311 (tramp-make-tramp-file-name
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
8312 (tramp-file-name-method vec)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
8313 (tramp-file-name-user vec)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
8314 (tramp-file-name-host vec)
05c8e6a18913 * net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents: 85428
diff changeset
8315 ""))))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8316
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8317 ;; Snarfed code from time-date.el and parse-time.el
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8318
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8319 (defconst tramp-half-a-year '(241 17024)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8320 "Evaluated by \"(days-to-time 183)\".")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8321
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8322 (defconst tramp-parse-time-months
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8323 '(("jan" . 1) ("feb" . 2) ("mar" . 3)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8324 ("apr" . 4) ("may" . 5) ("jun" . 6)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8325 ("jul" . 7) ("aug" . 8) ("sep" . 9)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8326 ("oct" . 10) ("nov" . 11) ("dec" . 12))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8327 "Alist mapping month names to integers.")
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8328
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8329 (defun tramp-time-less-p (t1 t2)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8330 "Say whether time value T1 is less than time value T2."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8331 (unless t1 (setq t1 '(0 0)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8332 (unless t2 (setq t2 '(0 0)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8333 (or (< (car t1) (car t2))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8334 (and (= (car t1) (car t2))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8335 (< (nth 1 t1) (nth 1 t2)))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8336
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8337 (defun tramp-time-subtract (t1 t2)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8338 "Subtract two time values.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8339 Return the difference in the format of a time value."
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8340 (unless t1 (setq t1 '(0 0)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8341 (unless t2 (setq t2 '(0 0)))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8342 (let ((borrow (< (cadr t1) (cadr t2))))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8343 (list (- (car t1) (car t2) (if borrow 1 0))
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8344 (- (+ (if borrow 65536 0) (cadr t1)) (cadr t2)))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8345
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8346 (defun tramp-time-diff (t1 t2)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8347 "Return the difference between the two times, in seconds.
72569
7457615d594a Sync with Tramp 2.0.54.
Michael Albinus <michael.albinus@gmx.de>
parents: 71561
diff changeset
8348 T1 and T2 are time values (as returned by `current-time' for example)."
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8349 ;; Pacify byte-compiler with `symbol-function'.
51603
978e262c8f3a Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51177
diff changeset
8350 (cond ((and (fboundp 'subtract-time)
978e262c8f3a Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51177
diff changeset
8351 (fboundp 'float-time))
978e262c8f3a Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51177
diff changeset
8352 (funcall (symbol-function 'float-time)
978e262c8f3a Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51177
diff changeset
8353 (funcall (symbol-function 'subtract-time) t1 t2)))
978e262c8f3a Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51177
diff changeset
8354 ((and (fboundp 'subtract-time)
978e262c8f3a Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51177
diff changeset
8355 (fboundp 'time-to-seconds))
978e262c8f3a Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51177
diff changeset
8356 (funcall (symbol-function 'time-to-seconds)
978e262c8f3a Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51177
diff changeset
8357 (funcall (symbol-function 'subtract-time) t1 t2)))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8358 ((fboundp 'itimer-time-difference)
72569
7457615d594a Sync with Tramp 2.0.54.
Michael Albinus <michael.albinus@gmx.de>
parents: 71561
diff changeset
8359 (funcall (symbol-function 'itimer-time-difference)
7457615d594a Sync with Tramp 2.0.54.
Michael Albinus <michael.albinus@gmx.de>
parents: 71561
diff changeset
8360 (if (< (length t1) 3) (append t1 '(0)) t1)
7457615d594a Sync with Tramp 2.0.54.
Michael Albinus <michael.albinus@gmx.de>
parents: 71561
diff changeset
8361 (if (< (length t2) 3) (append t2 '(0)) t2)))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8362 (t
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8363 (let ((time (tramp-time-subtract t1 t2)))
51603
978e262c8f3a Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51177
diff changeset
8364 (+ (* (car time) 65536.0)
978e262c8f3a Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51177
diff changeset
8365 (cadr time)
978e262c8f3a Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51177
diff changeset
8366 (/ (or (nth 2 time) 0) 1000000.0))))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8367
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8368 (defun tramp-coding-system-change-eol-conversion (coding-system eol-type)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8369 "Return a coding system like CODING-SYSTEM but with given EOL-TYPE.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8370 EOL-TYPE can be one of `dos', `unix', or `mac'."
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8371 (cond ((fboundp 'coding-system-change-eol-conversion)
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
8372 (funcall (symbol-function 'coding-system-change-eol-conversion)
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
8373 coding-system eol-type))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8374 ((fboundp 'subsidiary-coding-system)
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
8375 (funcall (symbol-function 'subsidiary-coding-system)
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
8376 coding-system
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
8377 (cond ((eq eol-type 'dos) 'crlf)
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
8378 ((eq eol-type 'unix) 'lf)
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
8379 ((eq eol-type 'mac) 'cr)
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
8380 (t
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
8381 (error "Unknown EOL-TYPE `%s', must be %s"
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
8382 eol-type
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents: 84966
diff changeset
8383 "`dos', `unix', or `mac'")))))
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8384 (t (error "Can't change EOL conversion -- is MULE missing?"))))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8385
55844
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
8386 (defun tramp-set-process-query-on-exit-flag (process flag)
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
8387 "Specify if query is needed for process when Emacs is exited.
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
8388 If the second argument flag is non-nil, Emacs will query the user before
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
8389 exiting if process is running."
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
8390 (if (fboundp 'set-process-query-on-exit-flag)
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8391 (funcall (symbol-function 'set-process-query-on-exit-flag) process flag)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8392 (funcall (symbol-function 'process-kill-without-query) process flag)))
55844
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
8393
4bc6cb45c326 Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents: 55420
diff changeset
8394
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59582
diff changeset
8395 ;; ------------------------------------------------------------
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59582
diff changeset
8396 ;; -- Kludges section --
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59582
diff changeset
8397 ;; ------------------------------------------------------------
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8398
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8399 ;; Currently (as of Emacs 20.5), the function `shell-quote-argument'
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8400 ;; does not deal well with newline characters. Newline is replaced by
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8401 ;; backslash newline. But if, say, the string `a backslash newline b'
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8402 ;; is passed to a shell, the shell will expand this into "ab",
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8403 ;; completely omitting the newline. This is not what was intended.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8404 ;; It does not appear to be possible to make the function
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8405 ;; `shell-quote-argument' work with newlines without making it
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8406 ;; dependent on the shell used. But within this package, we know that
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8407 ;; we will always use a Bourne-like shell, so we use an approach which
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8408 ;; groks newlines.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8409 ;;
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8410 ;; The approach is simple: we call `shell-quote-argument', then
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8411 ;; massage the newline part of the result.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8412 ;;
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8413 ;; This function should produce a string which is grokked by a Unix
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8414 ;; shell, even if the Emacs is running on Windows. Since this is the
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8415 ;; kludges section, we bind `system-type' in such a way that
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8416 ;; `shell-quote-arguments' behaves as if on Unix.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8417 ;;
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8418 ;; Thanks to Mario DeWeerd for the hint that it is sufficient for this
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8419 ;; function to work with Bourne-like shells.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8420 ;;
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8421 ;; CCC: This function should be rewritten so that
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8422 ;; `shell-quote-argument' is not used. This way, we are safe from
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8423 ;; changes in `shell-quote-argument'.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8424 (defun tramp-shell-quote-argument (s)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8425 "Similar to `shell-quote-argument', but groks newlines.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8426 Only works for Bourne-like shells."
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8427 (let ((system-type 'not-windows))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8428 (save-match-data
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8429 (let ((result (shell-quote-argument s))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8430 (nl (regexp-quote (format "\\%s" tramp-rsh-end-of-line))))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8431 (when (and (>= (length result) 2)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8432 (string= (substring result 0 2) "\\~"))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8433 (setq result (substring result 1)))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8434 (while (string-match nl result)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8435 (setq result (replace-match (format "'%s'" tramp-rsh-end-of-line)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8436 t t result)))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8437 result))))
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8438
68335
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
8439 ;; Checklist for `tramp-unload-hook'
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
8440 ;; - Unload all `tramp-*' packages
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
8441 ;; - Reset `file-name-handler-alist'
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
8442 ;; - Cleanup hooks where Tramp functions are in
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
8443 ;; - Cleanup advised functions
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
8444 ;; - Cleanup autoloads
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
8445 ;;;###autoload
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
8446 (defun tramp-unload-tramp ()
71485
5b1bf37e044d * net/rcompile.el (remote-compile): Replace ange-ftp based
Michael Albinus <michael.albinus@gmx.de>
parents: 71350
diff changeset
8447 "Discard Tramp from loading remote files."
68335
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
8448 (interactive)
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
8449 ;; When Tramp is not loaded yet, its autoloads are still active.
70191
3a3093f77da8 * net/tramp.el (tramp-register-file-name-handlers): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 70073
diff changeset
8450 (tramp-unload-file-name-handlers)
68335
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
8451 ;; ange-ftp settings must be enabled.
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
8452 (when (functionp 'tramp-ftp-enable-ange-ftp)
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
8453 (funcall (symbol-function 'tramp-ftp-enable-ange-ftp)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8454 ;; Maybe its not loaded yet.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8455 (condition-case nil
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8456 (unload-feature 'tramp 'force)
68335
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
8457 (error nil)))
118ceefc8263 Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents: 66630
diff changeset
8458
100634
2af636c8c9d2 * net/tramp.el (tramp-rfn-eshadow-update-overlay): Move overlay to
Michael Albinus <michael.albinus@gmx.de>
parents: 100316
diff changeset
8459 (when (and load-in-progress
2af636c8c9d2 * net/tramp.el (tramp-rfn-eshadow-update-overlay): Move overlay to
Michael Albinus <michael.albinus@gmx.de>
parents: 100316
diff changeset
8460 (string-match "Loading tramp..." (or (current-message) "")))
100216
9c5b974a0a5b * net/tramp.el (top): Write a message, when loading Tramp.
Michael Albinus <michael.albinus@gmx.de>
parents: 99950
diff changeset
8461 (message "Loading tramp...done"))
9c5b974a0a5b * net/tramp.el (top): Write a message, when loading Tramp.
Michael Albinus <michael.albinus@gmx.de>
parents: 99950
diff changeset
8462
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8463 (provide 'tramp)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8464
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8465 ;;; TODO:
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8466
48973
09acf3f65bb5 * net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47771
diff changeset
8467 ;; * Handle nonlocal exits such as C-g.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8468 ;; * But it would probably be better to use with-local-quit at the
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8469 ;; place where it's actually needed: around any potentially
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8470 ;; indefinitely blocking piece of code. In this case it would be
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8471 ;; within Tramp around one of its calls to accept-process-output (or
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8472 ;; around one of the loops that calls accept-process-output)
84739
ed643c57fe39 * rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents: 84406
diff changeset
8473 ;; (Stefan Monnier).
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8474 ;; * Rewrite `tramp-shell-quote-argument' to abstain from using
46790
c217aa0214e2 Version 2.0.6.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46752
diff changeset
8475 ;; `shell-quote-argument'.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8476 ;; * In Emacs 21, `insert-directory' shows total number of bytes used
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8477 ;; by the files in that directory. Add this here.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8478 ;; * Avoid screen blanking when hitting `g' in dired. (Eli Tziperman)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8479 ;; * Make ffap.el grok Tramp filenames. (Eli Tziperman)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8480 ;; * Case-insensitive filename completion. (Norbert Goevert.)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8481 ;; * Don't use globbing for directories with many files, as this is
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8482 ;; likely to produce long command lines, and some shells choke on
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8483 ;; long command lines.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8484 ;; * `vc-directory' does not work. It never displays any files, even
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8485 ;; if it does show files when run locally.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8486 ;; * How to deal with MULE in `insert-file-contents' and `write-region'?
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8487 ;; * Test remote ksh or bash for tilde expansion in `tramp-find-shell'?
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8488 ;; * abbreviate-file-name
104216
bf65b05e8cf1 * net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104143
diff changeset
8489 ;; * Better error checking. At least whenever we see something
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8490 ;; strange when doing zerop, we should kill the process and start
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8491 ;; again. (Greg Stark)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8492 ;; * Remove unneeded parameters from methods.
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8493 ;; * Make it work for different encodings, and for different file name
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8494 ;; encodings, too. (Daniel Pittman)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8495 ;; * Progress reports while copying files. (Michael Kifer)
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8496 ;; * Don't search for perl5 and perl. Instead, only search for perl and
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8497 ;; then look if it's the right version (with `perl -v').
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8498 ;; * When editing a remote CVS controlled file as a different user, VC
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8499 ;; gets confused about the file locking status. Try to find out why
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8500 ;; the workaround doesn't work.
46992
6529728ddf05 Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 46835
diff changeset
8501 ;; * Username and hostname completion.
78887
8faf94b6c420 * net/tramp.el (tramp-completion-mode-p): Rename from
Michael Albinus <michael.albinus@gmx.de>
parents: 78489
diff changeset
8502 ;; ** Try to avoid usage of `last-input-event' in `tramp-completion-mode-p'.
49612
407d6516031a 2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 49598
diff changeset
8503 ;; ** Unify `tramp-parse-{rhosts,shosts,sconfig,hosts,passwd,netrc}'.
47576
b31c8ab7336a Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 47205
diff changeset
8504 ;; Code is nearly identical.
91486
76c777ce052a * net/tramp.el (tramp-process-sentinel): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 88072
diff changeset
8505 ;; * Allow out-of-band methods as _last_ multi-hop. Open a connection
76c777ce052a * net/tramp.el (tramp-process-sentinel): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 88072
diff changeset
8506 ;; until the last but one hop via `start-file-process'. Apply it
76c777ce052a * net/tramp.el (tramp-process-sentinel): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 88072
diff changeset
8507 ;; also for ftp and smb.
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8508 ;; * WIBNI if we had a command "trampclient"? If I was editing in
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8509 ;; some shell with root priviledges, it would be nice if I could
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8510 ;; just call
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8511 ;; trampclient filename.c
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8512 ;; as an editor, and the _current_ shell would connect to an Emacs
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8513 ;; server and would be used in an existing non-priviledged Emacs
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8514 ;; session for doing the editing in question.
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8515 ;; That way, I need not tell Emacs my password again and be afraid
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8516 ;; that it makes it into core dumps or other ugly stuff (I had Emacs
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8517 ;; once display a just typed password in the context of a keyboard
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8518 ;; sequence prompt for a question immediately following in a shell
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8519 ;; script run within Emacs -- nasty).
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8520 ;; And if I have some ssh session running to a different computer,
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8521 ;; having the possibility of passing a local file there to a local
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8522 ;; Emacs session (in case I can arrange for a connection back) would
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8523 ;; be nice.
85694
21983e7c844a * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents: 85600
diff changeset
8524 ;; Likely the corresponding Tramp server should not allow the
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8525 ;; equivalent of the emacsclient -eval option in order to make this
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8526 ;; reasonably unproblematic. And maybe trampclient should have some
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8527 ;; way of passing credentials, like by using an SSL socket or
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8528 ;; something. (David Kastrup)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8529 ;; * Reconnect directly to a compliant shell without first going
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8530 ;; through the user's default shell. (Pete Forman)
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
8531 ;; * Make `tramp-default-user' obsolete.
87368
8b57223acf6b Sync with Tramp 2.1.12.
Michael Albinus <michael.albinus@gmx.de>
parents: 87322
diff changeset
8532 ;; * Tramp shall reconnect automatically to its ssh connection when it
8b57223acf6b Sync with Tramp 2.1.12.
Michael Albinus <michael.albinus@gmx.de>
parents: 87322
diff changeset
8533 ;; detects that the process "has died". (David Reitter)
95963
a20bb74ebe03 * net/tramp.el (tramp-handle-start-file-process): Clear
Michael Albinus <michael.albinus@gmx.de>
parents: 95659
diff changeset
8534 ;; * How can I interrupt the remote process with a signal
a20bb74ebe03 * net/tramp.el (tramp-handle-start-file-process): Clear
Michael Albinus <michael.albinus@gmx.de>
parents: 95659
diff changeset
8535 ;; (interrupt-process seems not to work)? (Markus Triska)
96941
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
8536 ;; * Avoid the local shell entirely for starting remote processes. If
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
8537 ;; so, I think even a signal, when delivered directly to the local
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
8538 ;; SSH instance, would correctly be propagated to the remote process
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
8539 ;; automatically; possibly SSH would have to be started with
940a290a5646 * net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents: 96392
diff changeset
8540 ;; "-t". (Markus Triska)
100634
2af636c8c9d2 * net/tramp.el (tramp-rfn-eshadow-update-overlay): Move overlay to
Michael Albinus <michael.albinus@gmx.de>
parents: 100316
diff changeset
8541 ;; * It makes me wonder if tramp couldn't fall back to ssh when scp
2af636c8c9d2 * net/tramp.el (tramp-rfn-eshadow-update-overlay): Move overlay to
Michael Albinus <michael.albinus@gmx.de>
parents: 100316
diff changeset
8542 ;; isn't on the remote host. (Mark A. Hershberger)
103735
d3d4dbf21c9b * net/tramp.el (tramp-handle-write-region): Flush file properties
Michael Albinus <michael.albinus@gmx.de>
parents: 103642
diff changeset
8543 ;; * Use lsh instead of ssh. (Alfred M. Szmidt)
d3d4dbf21c9b * net/tramp.el (tramp-handle-write-region): Flush file properties
Michael Albinus <michael.albinus@gmx.de>
parents: 103642
diff changeset
8544 ;; * Implement a general server-local-variable mechanism, as there are
d3d4dbf21c9b * net/tramp.el (tramp-handle-write-region): Flush file properties
Michael Albinus <michael.albinus@gmx.de>
parents: 103642
diff changeset
8545 ;; probably other variables that need different values for different
d3d4dbf21c9b * net/tramp.el (tramp-handle-write-region): Flush file properties
Michael Albinus <michael.albinus@gmx.de>
parents: 103642
diff changeset
8546 ;; servers too. The user could then configure a variable (such as
d3d4dbf21c9b * net/tramp.el (tramp-handle-write-region): Flush file properties
Michael Albinus <michael.albinus@gmx.de>
parents: 103642
diff changeset
8547 ;; tramp-server-local-variable-alist) to define any such variables
d3d4dbf21c9b * net/tramp.el (tramp-handle-write-region): Flush file properties
Michael Albinus <michael.albinus@gmx.de>
parents: 103642
diff changeset
8548 ;; that they need to, which would then be let bound as appropriate
d3d4dbf21c9b * net/tramp.el (tramp-handle-write-region): Flush file properties
Michael Albinus <michael.albinus@gmx.de>
parents: 103642
diff changeset
8549 ;; in tramp functions. (Jason Rumney)
104642
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8550 ;; * Optimize out-of-band copying, when both methods are scp-like (not
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8551 ;; rsync).
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8552 ;; * Keep a second connection open for out-of-band methods like scp or
67bdc8713158 * net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents: 104314
diff changeset
8553 ;; rsync.
105462
f6c5cf0fc0c9 * net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 105351
diff changeset
8554 ;; * Support ptys in `tramp-handle-start-file-process'.
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8555
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8556 ;; Functions for file-name-handler-alist:
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8557 ;; diff-latest-backup-file -- in diff.el
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8558
93103
19a32f437b65 Fix up encoding.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93082
diff changeset
8559 ;; arch-tag: 3a21a994-182b-48fa-b0cd-c1d9fede424a
45861
7b663a89ef2a *** empty log message ***
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8560 ;;; tramp.el ends here
93040
ba82da0cb626 * net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents: 93036
diff changeset
8561
ba82da0cb626 * net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents: 93036
diff changeset
8562 ;; Local Variables:
ba82da0cb626 * net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents: 93036
diff changeset
8563 ;; mode: Emacs-Lisp
ba82da0cb626 * net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents: 93036
diff changeset
8564 ;; coding: utf-8
ba82da0cb626 * net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents: 93036
diff changeset
8565 ;; End: