Mercurial > emacs
annotate lisp/net/tramp.el @ 108297:e514622e9d11
Fix the "config msdos" step of MS-DOS build (due to removal of some cpp stuff from configury).
config.bat: Allow for 2 leading `#'s in comments in src/Makefile.in.
src/Makefile.in: Don't use Make-style comments past the
"start of cpp stuff" line.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Fri, 07 May 2010 14:21:29 +0300 |
parents | 96984953f99e |
children | 7827d5a5c826 |
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 | 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, |
106815 | 4 ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
45861 | 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 | 10 ;; Keywords: comm, processes |
11 | |
12 ;; This file is part of GNU Emacs. | |
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 | 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 | 18 |
19 ;; GNU Emacs is distributed in the hope that it will be useful, | |
20 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
22 ;; GNU General Public License for more details. | |
23 | |
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 | 26 |
27 ;;; Commentary: | |
28 | |
29 ;; This package provides remote file editing, similar to ange-ftp. | |
30 ;; The difference is that ange-ftp uses FTP to transfer files between | |
31 ;; the local and the remote host, whereas tramp.el uses a combination | |
32 ;; of rsh and rcp or other work-alike programs, such as ssh/scp. | |
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 | 35 ;; |
36 ;; Notes: | |
37 ;; ----- | |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59582
diff
changeset
|
38 ;; |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
39 ;; This package only works for Emacs 22.1 and higher, and for XEmacs 21.4 |
81758
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 | 42 ;; |
43 ;; Also see the todo list at the bottom of this file. | |
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 | 47 ;; |
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 | 52 ;; |
53 ;; For the adventurous, the current development sources are available | |
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 | 56 ;; Click on "CVS" in the navigation bar near the top. |
57 ;; | |
58 ;; Don't forget to put on your asbestos longjohns, first! | |
59 | |
60 ;;; Code: | |
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 |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
82 (require 'format-spec) |
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 | 90 (require 'shell) |
91 (require 'advice) | |
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 |
108269
96984953f99e
* net/tramp.el (top, with-progress-reporter): Use
Michael Albinus <michael.albinus@gmx.de>
parents:
108244
diff
changeset
|
148 (funcall (symbol-function 'dbus-get-unique-name) |
96984953f99e
* net/tramp.el (top, with-progress-reporter): Use
Michael Albinus <michael.albinus@gmx.de>
parents:
108244
diff
changeset
|
149 :session) |
104143
49b412e99f1e
* net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents:
104137
diff
changeset
|
150 (error nil)) |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
151 (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
|
152 'tramp-gvfs) |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
153 |
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
|
154 ;; 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
|
155 (when (functionp 'make-network-process) 'tramp-gw) |
ebd8445069df
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
104866
diff
changeset
|
156 |
ebd8445069df
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
104866
diff
changeset
|
157 ;; 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
|
158 ;; (from Emacs 23.2). |
ebd8445069df
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
104866
diff
changeset
|
159 (when (and (locate-library "epa") (locate-library "imap-hash")) |
ebd8445069df
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
104866
diff
changeset
|
160 '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
|
161 |
05c8e6a18913
* net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents:
85428
diff
changeset
|
162 (when feature |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
163 ;; 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
|
164 ;; 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
|
165 ;; 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
|
166 (catch 'tramp-loading |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
167 (require feature) |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
168 (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
|
169 `(lambda () |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
170 (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
|
171 (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
|
172 (unless (featurep feature) |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
173 (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
|
174 |
45861 | 175 ;;; User Customizable Internal Variables: |
176 | |
177 (defgroup tramp nil | |
178 "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
|
179 :group 'files |
107379
3c0cd76e49ff
Fix last change to use existing comm Custom group instead of `net'.
Chong Yidong <cyd@stupidchicken.com>
parents:
107378
diff
changeset
|
180 :group 'comm |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59582
diff
changeset
|
181 :version "22.1") |
45861 | 182 |
94436
0918f4a758d2
* net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents:
94401
diff
changeset
|
183 ;; 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
|
184 ;;;###autoload |
0918f4a758d2
* net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents:
94401
diff
changeset
|
185 (defcustom tramp-mode t |
0918f4a758d2
* net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents:
94401
diff
changeset
|
186 "*Whether Tramp is enabled. |
0918f4a758d2
* net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents:
94401
diff
changeset
|
187 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
|
188 :group 'tramp |
0918f4a758d2
* net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents:
94401
diff
changeset
|
189 :type 'boolean) |
0918f4a758d2
* net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents:
94401
diff
changeset
|
190 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
191 (defcustom tramp-verbose 3 |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
192 "*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
|
193 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
|
194 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
195 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
|
196 1 errors |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
197 2 warnings |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
198 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
|
199 4 activities |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
200 5 internal |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
201 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
|
202 7 file caching |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
203 8 connection properties |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
204 10 traces (huge)." |
45861 | 205 :group 'tramp |
206 :type 'integer) | |
207 | |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
208 ;; Emacs case. |
55420
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
209 (eval-and-compile |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
210 (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
|
211 (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
|
212 "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
|
213 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
|
214 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
|
215 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
|
216 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
|
217 |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
218 \(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
|
219 |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
220 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
|
221 policy for local files." |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
222 :group 'tramp |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
223 :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
|
224 (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
|
225 |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
226 ;; 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
|
227 ;; 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
|
228 (eval-and-compile |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
229 (when (featurep 'xemacs) |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
230 (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
|
231 "*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
|
232 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
|
233 `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
|
234 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
|
235 \(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
|
236 |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
237 \(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
|
238 |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
239 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
|
240 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
|
241 :type '(repeat |
55420
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
242 (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
|
243 (string :tag "Backup Dir") |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
244 (set :inline t |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
245 (const ok-create) |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
246 (const full-path) |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
247 (const prepend-name) |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
248 (const search-upward)))) |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
249 :group 'tramp))) |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
250 |
45861 | 251 (defcustom tramp-auto-save-directory nil |
252 "*Put auto-save files in this directory, if set. | |
253 The idea is to use a local directory so that auto-saving is faster." | |
254 :group 'tramp | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
255 :type '(choice (const nil) string)) |
45861 | 256 |
47576
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
257 (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
|
258 (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
|
259 (getenv "COMSPEC") |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
260 "/bin/sh") |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
261 "*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
|
262 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
|
263 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
|
264 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
|
265 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
|
266 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
267 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
|
268 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
269 /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
|
270 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
271 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
|
272 variable `tramp-encoding-command-switch' for the \"-c\" part. |
45861 | 273 |
274 Note that this variable is not used for remote commands. There are | |
275 mechanisms in tramp.el which automatically determine the right shell to | |
276 use for the remote host." | |
277 :group 'tramp | |
278 :type '(file :must-match t)) | |
279 | |
47576
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
280 (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
|
281 (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
|
282 "/c" |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
283 "-c") |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
284 "*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
|
285 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
|
286 :group 'tramp |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
287 :type 'string) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
288 |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
289 (defcustom tramp-inline-compress-start-size 4096 |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
290 "*The minimum size of compressing where inline transfer. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
291 When inline transfer, compress transfered data of file |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
292 whose size is this value or above (up to `tramp-copy-size-limit'). |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
293 If it is nil, no compression at all will be applied." |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
294 :group 'tramp |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
295 :type '(choice (const nil) integer)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
296 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
297 (defcustom tramp-copy-size-limit 10240 |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
298 "*The maximum file size where inline copying is preferred over an out-of-the-band copy. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
299 If it is nil, inline out-of-the-band copy will be used without a check." |
47576
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
300 :group 'tramp |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
301 :type '(choice (const nil) integer)) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
302 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
303 (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
|
304 "*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
|
305 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
|
306 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
|
307 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
|
308 :group 'tramp |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
309 :type 'string) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
310 |
106470
9e96dbbd314e
Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents:
106390
diff
changeset
|
311 ;; 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
|
312 ;; 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
|
313 ;; 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
|
314 |
9e96dbbd314e
Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents:
106390
diff
changeset
|
315 (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
|
316 (format |
9e96dbbd314e
Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents:
106390
diff
changeset
|
317 "///%s#$" |
9e96dbbd314e
Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents:
106390
diff
changeset
|
318 (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
|
319 "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
|
320 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
|
321 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
|
322 |
9e96dbbd314e
Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents:
106390
diff
changeset
|
323 (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
|
324 "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
|
325 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
326 (defvar tramp-methods |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
327 `(("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
|
328 (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
|
329 (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
|
330 (tramp-copy-program "rcp") |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
331 (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
|
332 (tramp-copy-keep-date t) |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
333 (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
|
334 (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
|
335 ("scp" (tramp-login-program "ssh") |
108236
9fd9b1a102cd
* net/tramp.el (tramp-methods): Remove "-q" from `tramp-login-args'
Michael Albinus <michael.albinus@gmx.de>
parents:
108186
diff
changeset
|
336 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
337 ("-e" "none"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
338 (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
|
339 (tramp-copy-program "scp") |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
340 (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
|
341 ("-q") ("-r"))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
342 (tramp-copy-keep-date t) |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
343 (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
|
344 (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
|
345 (tramp-gw-args (("-o" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
346 "GlobalKnownHostsFile=/dev/null") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
347 ("-o" "UserKnownHostsFile=/dev/null") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
348 ("-o" "StrictHostKeyChecking=no"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
349 (tramp-default-port 22)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
350 ("scp1" (tramp-login-program "ssh") |
108236
9fd9b1a102cd
* net/tramp.el (tramp-methods): Remove "-q" from `tramp-login-args'
Michael Albinus <michael.albinus@gmx.de>
parents:
108186
diff
changeset
|
351 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
352 ("-1" "-e" "none"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
353 (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
|
354 (tramp-copy-program "scp") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
355 (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
|
356 ("-q") ("-r"))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
357 (tramp-copy-keep-date t) |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
358 (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
|
359 (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
|
360 (tramp-gw-args (("-o" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
361 "GlobalKnownHostsFile=/dev/null") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
362 ("-o" "UserKnownHostsFile=/dev/null") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
363 ("-o" "StrictHostKeyChecking=no"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
364 (tramp-default-port 22)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
365 ("scp2" (tramp-login-program "ssh") |
108236
9fd9b1a102cd
* net/tramp.el (tramp-methods): Remove "-q" from `tramp-login-args'
Michael Albinus <michael.albinus@gmx.de>
parents:
108186
diff
changeset
|
366 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
367 ("-2" "-e" "none"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
368 (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
|
369 (tramp-copy-program "scp") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
370 (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
|
371 ("-q") ("-r"))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
372 (tramp-copy-keep-date t) |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
373 (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
|
374 (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
|
375 (tramp-gw-args (("-o" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
376 "GlobalKnownHostsFile=/dev/null") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
377 ("-o" "UserKnownHostsFile=/dev/null") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
378 ("-o" "StrictHostKeyChecking=no"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
379 (tramp-default-port 22)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
380 ("scp1_old" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
381 (tramp-login-program "ssh1") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
382 (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
|
383 ("-e" "none"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
384 (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
|
385 (tramp-copy-program "scp1") |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
386 (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
|
387 (tramp-copy-keep-date t) |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
388 (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
|
389 (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
|
390 ("scp2_old" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
391 (tramp-login-program "ssh2") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
392 (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
|
393 ("-e" "none"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
394 (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
|
395 (tramp-copy-program "scp2") |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
396 (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
|
397 (tramp-copy-keep-date t) |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
398 (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
|
399 (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
|
400 ("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
|
401 (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
|
402 ("-e" "none"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
403 (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
|
404 (tramp-copy-program "sftp") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
405 (tramp-copy-args nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
406 (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
|
407 (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
|
408 ("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
|
409 (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
|
410 ("-e" "none"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
411 (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
|
412 (tramp-copy-program "rsync") |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
413 (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
|
414 (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
|
415 (tramp-copy-keep-tmpfile t) |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
416 (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
|
417 (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
|
418 ("rsyncc" |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
419 (tramp-login-program "ssh") |
104642
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
420 (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
|
421 ("-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
|
422 ("-o" "ControlMaster=yes") |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
423 ("-e" "none"))) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
424 (tramp-remote-sh "/bin/sh") |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
425 (tramp-copy-program "rsync") |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
426 (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
|
427 (tramp-copy-env (("RSYNC_RSH") |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
428 (,(concat |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
429 "ssh" |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
430 " -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
|
431 " -o ControlMaster=auto")))) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
432 (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
|
433 (tramp-copy-keep-tmpfile t) |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
434 (tramp-copy-recursive t) |
104642
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
435 (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
|
436 ("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
|
437 (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
|
438 (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
|
439 (tramp-copy-program "rcp") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
440 (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
|
441 (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
|
442 (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
|
443 ("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
|
444 (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
|
445 (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
|
446 (tramp-copy-program nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
447 (tramp-copy-args nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
448 (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
|
449 (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
|
450 ("ssh" (tramp-login-program "ssh") |
108236
9fd9b1a102cd
* net/tramp.el (tramp-methods): Remove "-q" from `tramp-login-args'
Michael Albinus <michael.albinus@gmx.de>
parents:
108186
diff
changeset
|
451 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
452 ("-e" "none"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
453 (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
|
454 (tramp-copy-program nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
455 (tramp-copy-args nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
456 (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
|
457 (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
|
458 (tramp-gw-args (("-o" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
459 "GlobalKnownHostsFile=/dev/null") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
460 ("-o" "UserKnownHostsFile=/dev/null") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
461 ("-o" "StrictHostKeyChecking=no"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
462 (tramp-default-port 22)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
463 ("ssh1" (tramp-login-program "ssh") |
108236
9fd9b1a102cd
* net/tramp.el (tramp-methods): Remove "-q" from `tramp-login-args'
Michael Albinus <michael.albinus@gmx.de>
parents:
108186
diff
changeset
|
464 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
465 ("-1" "-e" "none"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
466 (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
|
467 (tramp-copy-program nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
468 (tramp-copy-args nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
469 (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
|
470 (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
|
471 (tramp-gw-args (("-o" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
472 "GlobalKnownHostsFile=/dev/null") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
473 ("-o" "UserKnownHostsFile=/dev/null") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
474 ("-o" "StrictHostKeyChecking=no"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
475 (tramp-default-port 22)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
476 ("ssh2" (tramp-login-program "ssh") |
108236
9fd9b1a102cd
* net/tramp.el (tramp-methods): Remove "-q" from `tramp-login-args'
Michael Albinus <michael.albinus@gmx.de>
parents:
108186
diff
changeset
|
477 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
478 ("-2" "-e" "none"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
479 (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
|
480 (tramp-copy-program nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
481 (tramp-copy-args nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
482 (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
|
483 (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
|
484 (tramp-gw-args (("-o" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
485 "GlobalKnownHostsFile=/dev/null") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
486 ("-o" "UserKnownHostsFile=/dev/null") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
487 ("-o" "StrictHostKeyChecking=no"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
488 (tramp-default-port 22)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
489 ("ssh1_old" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
490 (tramp-login-program "ssh1") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
491 (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
|
492 ("-e" "none"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
493 (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
|
494 (tramp-copy-program nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
495 (tramp-copy-args nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
496 (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
|
497 (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
|
498 ("ssh2_old" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
499 (tramp-login-program "ssh2") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
500 (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
|
501 ("-e" "none"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
502 (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
|
503 (tramp-copy-program nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
504 (tramp-copy-args nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
505 (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
|
506 (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
|
507 ("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
|
508 (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
|
509 (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
|
510 (tramp-copy-program nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
511 (tramp-copy-args nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
512 (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
|
513 (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
|
514 ("telnet" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
515 (tramp-login-program "telnet") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
516 (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
|
517 (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
|
518 (tramp-copy-program nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
519 (tramp-copy-args nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
520 (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
|
521 (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
|
522 (tramp-default-port 23)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
523 ("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
|
524 (tramp-login-args (("-") ("%u"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
525 (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
|
526 (tramp-copy-program nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
527 (tramp-copy-args nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
528 (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
|
529 (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
|
530 ("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
|
531 (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
|
532 ("-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
|
533 (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
|
534 (tramp-copy-program nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
535 (tramp-copy-args nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
536 (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
|
537 (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
|
538 ("scpc" (tramp-login-program "ssh") |
108236
9fd9b1a102cd
* net/tramp.el (tramp-methods): Remove "-q" from `tramp-login-args'
Michael Albinus <michael.albinus@gmx.de>
parents:
108186
diff
changeset
|
539 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
540 ("-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
|
541 ("-o" "ControlMaster=yes") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
542 ("-e" "none"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
543 (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
|
544 (tramp-copy-program "scp") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
545 (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
|
546 ("-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
|
547 ("-o" "ControlMaster=auto"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
548 (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
|
549 (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
|
550 (tramp-gw-args (("-o" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
551 "GlobalKnownHostsFile=/dev/null") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
552 ("-o" "UserKnownHostsFile=/dev/null") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
553 ("-o" "StrictHostKeyChecking=no"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
554 (tramp-default-port 22)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
555 ("scpx" (tramp-login-program "ssh") |
108236
9fd9b1a102cd
* net/tramp.el (tramp-methods): Remove "-q" from `tramp-login-args'
Michael Albinus <michael.albinus@gmx.de>
parents:
108186
diff
changeset
|
556 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
557 ("-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
|
558 (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
|
559 (tramp-copy-program "scp") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
560 (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
|
561 (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
|
562 (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
|
563 (tramp-gw-args (("-o" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
564 "GlobalKnownHostsFile=/dev/null") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
565 ("-o" "UserKnownHostsFile=/dev/null") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
566 ("-o" "StrictHostKeyChecking=no"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
567 (tramp-default-port 22)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
568 ("sshx" (tramp-login-program "ssh") |
108236
9fd9b1a102cd
* net/tramp.el (tramp-methods): Remove "-q" from `tramp-login-args'
Michael Albinus <michael.albinus@gmx.de>
parents:
108186
diff
changeset
|
569 (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
570 ("-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
|
571 (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
|
572 (tramp-copy-program nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
573 (tramp-copy-args nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
574 (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
|
575 (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
|
576 (tramp-gw-args (("-o" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
577 "GlobalKnownHostsFile=/dev/null") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
578 ("-o" "UserKnownHostsFile=/dev/null") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
579 ("-o" "StrictHostKeyChecking=no"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
580 (tramp-default-port 22)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
581 ("krlogin" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
582 (tramp-login-program "krlogin") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
583 (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
|
584 (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
|
585 (tramp-copy-program nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
586 (tramp-copy-args nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
587 (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
|
588 (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
|
589 ("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
|
590 (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
|
591 ("-ssh"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
592 (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
|
593 (tramp-copy-program nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
594 (tramp-copy-args nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
595 (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
|
596 (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
|
597 (tramp-default-port 22)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
598 ("plink1" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
599 (tramp-login-program "plink") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
600 (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
|
601 ("-1" "-ssh"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
602 (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
|
603 (tramp-copy-program nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
604 (tramp-copy-args nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
605 (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
|
606 (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
|
607 (tramp-default-port 22)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
608 ("plinkx" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
609 (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
|
610 ;; ("%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
|
611 ;; `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
|
612 (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
|
613 (,(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
|
614 "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
|
615 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
|
616 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
|
617 ("/bin/sh"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
618 (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
|
619 (tramp-copy-program nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
620 (tramp-copy-args nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
621 (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
|
622 (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
|
623 ("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
|
624 (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
|
625 ("-ssh"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
626 (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
|
627 (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
|
628 (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
|
629 (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
|
630 (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
|
631 (tramp-default-port 22)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
632 ("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
|
633 (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
|
634 ("-ssh"))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
635 (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
|
636 (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
|
637 (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
|
638 (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
|
639 (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
|
640 ("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
|
641 (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
|
642 (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
|
643 (tramp-copy-program "fcp") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
644 (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
|
645 (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
|
646 (tramp-password-end-of-line nil))) |
45861 | 647 "*Alist of methods for remote files. |
648 This is a list of entries of the form (NAME PARAM1 PARAM2 ...). | |
649 Each NAME stands for a remote access method. Each PARAM is a | |
650 pair of the form (KEY VALUE). The following KEYs are defined: | |
651 * `tramp-remote-sh' | |
652 This specifies the Bourne shell to use on the remote host. This | |
653 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
|
654 this to any value other than \"/bin/sh\": Tramp wants to use a shell |
45861 | 655 which groks tilde expansion, but it can search for it. Also note |
656 that \"/bin/sh\" exists on all Unixen, this might not be true for | |
657 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
|
658 * `tramp-login-program' |
6234a4fe96f9
Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
50494
diff
changeset
|
659 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
|
660 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
|
661 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
|
662 * `tramp-login-args' |
45861 | 663 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
|
664 mentioned program. Please note that this is a list of list of arguments, |
45861 | 665 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
|
666 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
|
667 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
|
668 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
|
669 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
|
670 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
|
671 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
|
672 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
|
673 \"%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
|
674 `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
|
675 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
|
676 * `tramp-copy-program' |
6234a4fe96f9
Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
50494
diff
changeset
|
677 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
|
678 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
|
679 a workalike program. |
6234a4fe96f9
Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
50494
diff
changeset
|
680 * `tramp-copy-args' |
45861 | 681 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
|
682 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
|
683 * `tramp-copy-keep-date' |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
684 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
|
685 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
|
686 * `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
|
687 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
|
688 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
|
689 * `tramp-copy-recursive' |
828d51e45d15
* net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents:
105615
diff
changeset
|
690 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
|
691 * `tramp-default-port' |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
692 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
|
693 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
|
694 passing gateways. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
695 * `tramp-gw-args' |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
696 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
|
697 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
|
698 * `tramp-password-end-of-line' |
e4c4c45ea013
Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51603
diff
changeset
|
699 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
|
700 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
|
701 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
|
702 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
|
703 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
|
704 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
|
705 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
|
706 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
|
707 |
6234a4fe96f9
Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
50494
diff
changeset
|
708 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
|
709 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
|
710 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
|
711 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
|
712 to do this, set `tramp-copy-program' in the method. |
45861 | 713 |
714 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
|
715 file is passed through the same buffer used by `tramp-login-program'. In |
45861 | 716 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
|
717 `tramp-login-program' might use escape codes or the connection might not |
45861 | 718 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
|
719 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
|
720 `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
|
721 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
722 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
|
723 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
|
724 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
|
725 are fit for gateways must have `tramp-default-port' at least. |
45861 | 726 |
727 Notes: | |
728 | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
729 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
|
730 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
|
731 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
|
732 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
|
733 `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
|
734 useful only in combination with `tramp-default-proxies-alist'.") |
45861 | 735 |
108065
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
736 (defun tramp-detect-ssh-controlmaster () |
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
737 "Call ssh to detect whether it supports the ControlMaster argument. |
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
738 This function may return nil when the argument is supported, but |
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
739 shouldn't return t when it isn't." |
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
740 (ignore-errors |
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
741 (with-temp-buffer |
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
742 (call-process "ssh" nil t nil "-o" "ControlMaster") |
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
743 (goto-char (point-min)) |
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
744 (search-forward-regexp "Missing ControlMaster argument" nil t)))) |
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
745 |
51177
6234a4fe96f9
Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
50494
diff
changeset
|
746 (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
|
747 ;; 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
|
748 ;; 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
|
749 ;; 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
|
750 ;; 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
|
751 ;; "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
|
752 ;; password-cache.el or auth-sources.el packages shall be active for |
108065
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
753 ;; password caching. "scpc" is chosen if we detect that the user is |
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
754 ;; running OpenSSH 4.0 or newer. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
755 (cond |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
756 ;; PuTTY is installed. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
757 ((executable-find "pscp") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
758 (if (or (fboundp 'password-read) |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
759 (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
|
760 ;; 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
|
761 (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
|
762 "pscp" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
763 "plink")) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
764 ;; 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
|
765 ((executable-find "scp") |
108065
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
766 (cond |
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
767 ((tramp-detect-ssh-controlmaster) "scpc") |
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
768 ((or (fboundp 'password-read) |
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
769 (fboundp 'auth-source-user-or-password) |
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
770 ;; ssh-agent is running. |
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
771 (getenv "SSH_AUTH_SOCK") |
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
772 (getenv "SSH_AGENT_PID")) |
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
773 "scp") |
186cf99d4122
Detect ssh 'ControlMaster' argument automatically in some cases.
Michael Albinus <michael.albinus@gmx.de>
parents:
108064
diff
changeset
|
774 (t "ssh"))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
775 ;; Fallback. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
776 (t "ftp")) |
45861 | 777 "*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
|
778 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
|
779 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
|
780 :group 'tramp |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
781 :type 'string) |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
782 |
46306
66cce4969490
(tramp-default-method): New default method "sm"
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46166
diff
changeset
|
783 (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
|
784 '(("\\`localhost\\'" "\\`root\\'" "su")) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
785 "*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
|
786 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
|
787 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
|
788 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
|
789 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
|
790 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
|
791 |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
792 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
|
793 empty string for the user name. |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
794 |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
795 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
|
796 :group 'tramp |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
797 :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
|
798 (regexp :tag "User regexp") |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
799 (string :tag "Method")))) |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
800 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
801 (defcustom tramp-default-user |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
802 nil |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
803 "*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
|
804 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
|
805 \"~/.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
|
806 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
807 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
|
808 :group 'tramp |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
809 :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
|
810 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
811 (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
|
812 `(("\\`su\\(do\\)?\\'" nil "root") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
813 ("\\`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
|
814 nil ,(user-login-name))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
815 "*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
|
816 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
|
817 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
|
818 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
|
819 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
|
820 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
|
821 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
822 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
|
823 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
|
824 :group 'tramp |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
825 :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
|
826 (regexp :tag "Host regexp") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
827 (string :tag "User")))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
828 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
829 (defcustom tramp-default-host |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
830 (system-name) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
831 "*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
|
832 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
|
833 :group 'tramp |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
834 :type 'string) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
835 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
836 (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
|
837 "*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
|
838 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
|
839 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
|
840 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
|
841 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
|
842 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
|
843 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
|
844 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
|
845 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
|
846 |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
847 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
|
848 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
|
849 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
|
850 :group 'tramp |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
851 :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
|
852 (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
|
853 (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
|
854 |
100856
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
855 (defconst tramp-local-host-regexp |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
856 (concat |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
857 "^" (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
|
858 "*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
|
859 |
47576
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
860 (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
|
861 '((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
|
862 (tramp-parse-rhosts "~/.rhosts")) |
51177
6234a4fe96f9
Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
50494
diff
changeset
|
863 "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
|
864 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
865 (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
|
866 '((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
|
867 (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
|
868 (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
|
869 (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
|
870 (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
|
871 (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
|
872 (tramp-parse-rhosts "~/.rhosts") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
873 (tramp-parse-rhosts "~/.shosts") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
874 (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
|
875 (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
|
876 (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
|
877 (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
|
878 "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
|
879 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
880 (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
|
881 '((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
|
882 "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
|
883 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
884 (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
|
885 '((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
|
886 "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
|
887 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
888 (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
|
889 '((tramp-parse-putty |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
890 "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
|
891 "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
|
892 |
54198
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
893 (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
|
894 "*Alist of methods for remote files. |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
895 This is a list of entries of the form \(NAME PAIR1 PAIR2 ...\). |
47576
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
896 Each NAME stands for a remote access method. Each PAIR is of the form |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
897 \(FUNCTION FILE\). FUNCTION is responsible to extract user names and host |
47576
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
898 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
|
899 |
54198
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
900 * `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
|
901 * `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
|
902 * `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
|
903 * `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
|
904 * `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
|
905 * `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
|
906 * `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
|
907 * `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
|
908 * `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
|
909 |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
910 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
|
911 the info pages.") |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
912 |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
913 (eval-after-load "tramp" |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
914 '(progn |
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 "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
|
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 "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
|
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 "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
|
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 "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
|
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 "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
|
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 "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
|
927 (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
|
928 "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
|
929 (tramp-set-completion-function |
104642
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
930 "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
|
931 (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
|
932 "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
|
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 "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
|
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 "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
|
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 "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
|
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 "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
|
941 (tramp-set-completion-function |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
942 "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
|
943 (tramp-set-completion-function |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
944 "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
|
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 "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
|
947 (tramp-set-completion-function |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
948 "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
|
949 (tramp-set-completion-function |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
950 "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
|
951 (tramp-set-completion-function |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
952 "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
|
953 (tramp-set-completion-function |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
954 "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
|
955 (tramp-set-completion-function |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
956 "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
|
957 (tramp-set-completion-function |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
958 "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
|
959 (tramp-set-completion-function |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
960 "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
|
961 (tramp-set-completion-function |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
962 "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
|
963 (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
|
964 "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
|
965 (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
|
966 "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
|
967 (tramp-set-completion-function |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
968 "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
|
969 |
94975
5bb8f7b3f835
* net/tramp.el (tramp-echo-mark): Update docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
94677
diff
changeset
|
970 (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
|
971 "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
|
972 |
106597
b0e5aae20733
* net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents:
106508
diff
changeset
|
973 (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
|
974 "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
|
975 |
b0e5aae20733
* net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents:
106508
diff
changeset
|
976 (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
|
977 (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
|
978 (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
|
979 "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
|
980 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
|
981 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
|
982 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
|
983 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
|
984 `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
|
985 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
|
986 usually suffice.") |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
987 |
106597
b0e5aae20733
* net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents:
106508
diff
changeset
|
988 (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
|
989 (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
|
990 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
|
991 "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
|
992 the remote shell.") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
993 |
45861 | 994 (defcustom tramp-rsh-end-of-line "\n" |
995 "*String used for end of line in rsh connections. | |
996 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
|
997 if you need to change this. |
51968
e4c4c45ea013
Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51603
diff
changeset
|
998 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
|
999 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
|
1000 :group 'tramp |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
1001 :type 'string) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
1002 |
51968
e4c4c45ea013
Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51603
diff
changeset
|
1003 (defcustom tramp-default-password-end-of-line |
e4c4c45ea013
Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51603
diff
changeset
|
1004 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
|
1005 "*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
|
1006 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
|
1007 `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
|
1008 |
47576
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
1009 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
|
1010 \"\\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
|
1011 \"\\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
|
1012 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
|
1013 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
1014 The default value is to use the same value as `tramp-rsh-end-of-line'." |
45861 | 1015 :group 'tramp |
1016 :type 'string) | |
1017 | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1018 ;; "getconf PATH" yields: |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1019 ;; 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
|
1020 ;; 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
|
1021 ;; 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
|
1022 ;; FreeBSD: /usr/bin:/bin:/usr/sbin:/sbin: - beware trailing ":"! |
45861 | 1023 (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
|
1024 '(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
|
1025 "/local/bin" "/local/freeware/bin" "/local/gnu/bin" |
45861 | 1026 "/usr/freeware/bin" "/usr/pkg/bin" "/usr/contrib/bin") |
1027 "*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
|
1028 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
|
1029 keeping the list of existing directories on that host. |
45861 | 1030 |
1031 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
|
1032 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
|
1033 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1034 `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
|
1035 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
|
1036 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
|
1037 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
|
1038 |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
1039 `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
|
1040 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
|
1041 :group 'tramp |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1042 :type '(repeat (choice |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1043 (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
|
1044 (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
|
1045 (string :tag "Directory")))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1046 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1047 (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
|
1048 `("HISTFILE=$HOME/.tramp_history" "HISTSIZE=1" "LC_ALL=C" |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
1049 ,(format "TERM=%s" 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
|
1050 "EMACS=t" ;; Deprecated. |
d78633cfcc28
* net/tramp.el (tramp-remote-process-environment): Add "EMACS=t"
Michael Albinus <michael.albinus@gmx.de>
parents:
97445
diff
changeset
|
1051 ,(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
|
1052 "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
|
1053 "autocorrect=" "correct=") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1054 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1055 "*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
|
1056 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1057 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
|
1058 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
|
1059 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
|
1060 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1061 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
|
1062 not be set here. Instead of, it should be set via `tramp-remote-path'." |
45861 | 1063 :group 'tramp |
1064 :type '(repeat string)) | |
1065 | |
1066 (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
|
1067 ".*ogin\\( .*\\)?: *" |
45861 | 1068 "*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
|
1069 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
|
1070 |
efa862a76bc2
* net/tramp.el (tramp-login-prompt-regexp): Expand regexp in order to
Michael Albinus <michael.albinus@gmx.de>
parents:
65359
diff
changeset
|
1071 Sometimes the prompt is reported to look like \"login as:\"." |
45861 | 1072 :group 'tramp |
1073 :type 'regexp) | |
1074 | |
46998
9d6aef07c793
Version 2.0.14 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46992
diff
changeset
|
1075 (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
|
1076 ;; 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
|
1077 ;; 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
|
1078 "\\(?:^\\|\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
|
1079 "Regexp to match prompts from remote shell. |
9d6aef07c793
Version 2.0.14 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46992
diff
changeset
|
1080 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
|
1081 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
|
1082 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
|
1083 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
|
1084 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
|
1085 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
|
1086 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
|
1087 |
9e96dbbd314e
Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphal
Michael Albinus <michael.albinus@gmx.de>
parents:
106390
diff
changeset
|
1088 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
|
1089 `tramp-end-of-output'." |
46998
9d6aef07c793
Version 2.0.14 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46992
diff
changeset
|
1090 :group 'tramp |
9d6aef07c793
Version 2.0.14 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46992
diff
changeset
|
1091 :type 'regexp) |
9d6aef07c793
Version 2.0.14 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46992
diff
changeset
|
1092 |
45861 | 1093 (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
|
1094 "^.*\\([pP]assword\\|[pP]assphrase\\).*:\^@? *" |
45861 | 1095 "*Regexp matching password-like prompts. |
46752 | 1096 The regexp should match at end of buffer. |
45861 | 1097 |
1098 The `sudo' program appears to insert a `^@' character into the prompt." | |
1099 :group 'tramp | |
1100 :type 'regexp) | |
1101 | |
1102 (defcustom tramp-wrong-passwd-regexp | |
46790 | 1103 (concat "^.*" |
1104 ;; 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
|
1105 (regexp-opt '("Permission denied" |
46790 | 1106 "Login incorrect" |
1107 "Login Incorrect" | |
1108 "Connection refused" | |
1109 "Connection closed" | |
107021
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
1110 "Timeout, server not responding." |
46790 | 1111 "Sorry, try again." |
1112 "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
|
1113 "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
|
1114 "No supported authentication methods left to try!") t) |
46790 | 1115 ".*" |
1116 "\\|" | |
1117 "^.*\\(" | |
1118 ;; Here comes a list of regexes, separated by \\| | |
1119 "Received signal [0-9]+" | |
1120 "\\).*") | |
45861 | 1121 "*Regexp matching a `login failed' message. |
46752 | 1122 The regexp should match at end of buffer." |
1123 :group 'tramp | |
1124 :type 'regexp) | |
1125 | |
1126 (defcustom tramp-yesno-prompt-regexp | |
46992
6529728ddf05
Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46835
diff
changeset
|
1127 (concat |
6529728ddf05
Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46835
diff
changeset
|
1128 (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
|
1129 "\\s-*") |
6529728ddf05
Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46835
diff
changeset
|
1130 "Regular expression matching all yes/no queries which need to be confirmed. |
46752 | 1131 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
|
1132 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
|
1133 See also `tramp-yn-prompt-regexp'." |
45861 | 1134 :group 'tramp |
1135 :type 'regexp) | |
1136 | |
46992
6529728ddf05
Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46835
diff
changeset
|
1137 (defcustom tramp-yn-prompt-regexp |
74985
155a8e75cd11
Sync with Tramp 2.0.55.
Michael Albinus <michael.albinus@gmx.de>
parents:
74777
diff
changeset
|
1138 (concat |
155a8e75cd11
Sync with Tramp 2.0.55.
Michael Albinus <michael.albinus@gmx.de>
parents:
74777
diff
changeset
|
1139 (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
|
1140 "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
|
1141 "\\s-*") |
46992
6529728ddf05
Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46835
diff
changeset
|
1142 "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
|
1143 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
|
1144 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
|
1145 See also `tramp-yesno-prompt-regexp'." |
6529728ddf05
Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46835
diff
changeset
|
1146 :group 'tramp |
6529728ddf05
Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46835
diff
changeset
|
1147 :type 'regexp) |
47771
ac3dfc909b56
Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47683
diff
changeset
|
1148 |
ac3dfc909b56
Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47683
diff
changeset
|
1149 (defcustom tramp-terminal-prompt-regexp |
ac3dfc909b56
Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47683
diff
changeset
|
1150 (concat "\\(" |
ac3dfc909b56
Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47683
diff
changeset
|
1151 "TERM = (.*)" |
ac3dfc909b56
Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47683
diff
changeset
|
1152 "\\|" |
ac3dfc909b56
Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47683
diff
changeset
|
1153 "Terminal type\\? \\[.*\\]" |
ac3dfc909b56
Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47683
diff
changeset
|
1154 "\\)\\s-*") |
ac3dfc909b56
Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47683
diff
changeset
|
1155 "Regular expression matching all terminal setting prompts. |
ac3dfc909b56
Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47683
diff
changeset
|
1156 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
|
1157 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
|
1158 :group 'tramp |
ac3dfc909b56
Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47683
diff
changeset
|
1159 :type 'regexp) |
46992
6529728ddf05
Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46835
diff
changeset
|
1160 |
59582
92796330257a
Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents:
59031
diff
changeset
|
1161 (defcustom tramp-operation-not-permitted-regexp |
92796330257a
Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents:
59031
diff
changeset
|
1162 (concat "\\(" "preserving times.*" "\\|" "set mode" "\\)" ":\\s-*" |
92796330257a
Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents:
59031
diff
changeset
|
1163 (regexp-opt '("Operation not permitted") t)) |
92796330257a
Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents:
59031
diff
changeset
|
1164 "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
|
1165 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
|
1166 be ignored safely." |
92796330257a
Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents:
59031
diff
changeset
|
1167 :group 'tramp |
92796330257a
Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents:
59031
diff
changeset
|
1168 :type 'regexp) |
92796330257a
Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents:
59031
diff
changeset
|
1169 |
74166
5b973e5dc882
(tramp-default-method): Under Windows, change from plink to pscp.
Lars Hansen <larsh@soem.dk>
parents:
74052
diff
changeset
|
1170 (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
|
1171 (concat "\\(.+: " |
5b973e5dc882
(tramp-default-method): Under Windows, change from plink to pscp.
Lars Hansen <larsh@soem.dk>
parents:
74052
diff
changeset
|
1172 (regexp-opt '("Permission denied" |
5b973e5dc882
(tramp-default-method): Under Windows, change from plink to pscp.
Lars Hansen <larsh@soem.dk>
parents:
74052
diff
changeset
|
1173 "not a regular file" |
5b973e5dc882
(tramp-default-method): Under Windows, change from plink to pscp.
Lars Hansen <larsh@soem.dk>
parents:
74052
diff
changeset
|
1174 "is a directory" |
5b973e5dc882
(tramp-default-method): Under Windows, change from plink to pscp.
Lars Hansen <larsh@soem.dk>
parents:
74052
diff
changeset
|
1175 "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
|
1176 "\\)\\s-*") |
5b973e5dc882
(tramp-default-method): Under Windows, change from plink to pscp.
Lars Hansen <larsh@soem.dk>
parents:
74052
diff
changeset
|
1177 "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
|
1178 :group 'tramp |
5b973e5dc882
(tramp-default-method): Under Windows, change from plink to pscp.
Lars Hansen <larsh@soem.dk>
parents:
74052
diff
changeset
|
1179 :type 'regexp) |
5b973e5dc882
(tramp-default-method): Under Windows, change from plink to pscp.
Lars Hansen <larsh@soem.dk>
parents:
74052
diff
changeset
|
1180 |
55844
4bc6cb45c326
Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents:
55420
diff
changeset
|
1181 (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
|
1182 "" |
55844
4bc6cb45c326
Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents:
55420
diff
changeset
|
1183 "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
|
1184 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
|
1185 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
|
1186 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
|
1187 `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
|
1188 :group 'tramp |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
1189 :type 'regexp) |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
1190 |
45861 | 1191 (defcustom tramp-temp-name-prefix "tramp." |
1192 "*Prefix to use for temporary files. | |
1193 If this is a relative file name (such as \"tramp.\"), it is considered | |
1194 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
|
1195 `tramp-compat-temporary-file-directory' (which see). It may also be an |
45861 | 1196 absolute file name; don't forget to include a prefix for the filename |
1197 part, though." | |
1198 :group 'tramp | |
1199 :type 'string) | |
1200 | |
96941
940a290a5646
* net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents:
96392
diff
changeset
|
1201 (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
|
1202 "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
|
1203 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
|
1204 |
105718
828d51e45d15
* net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents:
105615
diff
changeset
|
1205 (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
|
1206 "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
|
1207 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
|
1208 (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
|
1209 |
48973
09acf3f65bb5
* net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47771
diff
changeset
|
1210 (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
|
1211 "*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
|
1212 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
|
1213 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
|
1214 arguments. |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
1215 |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
1216 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
|
1217 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
|
1218 shell from reading its init file." |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
1219 :group 'tramp |
51968
e4c4c45ea013
Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51603
diff
changeset
|
1220 ;; 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
|
1221 ;; `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
|
1222 :type (if (get 'alist 'widget-type) |
e4c4c45ea013
Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51603
diff
changeset
|
1223 '(alist :key-type string :value-type string) |
e4c4c45ea013
Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51603
diff
changeset
|
1224 '(repeat (cons string string)))) |
46009
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
1225 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1226 ;; 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
|
1227 ;; 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
|
1228 ;; 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
|
1229 ;; 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
|
1230 ;; 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
|
1231 ;; 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
|
1232 ;; 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
|
1233 ;; the other places. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1234 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1235 ;; 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
|
1236 ;;;###autoload |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1237 (defcustom tramp-syntax |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1238 (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
|
1239 "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
|
1240 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1241 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
|
1242 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1243 '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
|
1244 '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
|
1245 '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
|
1246 :group 'tramp |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1247 :type (if (featurep 'xemacs) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1248 '(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
|
1249 (const :tag "XEmacs" sep) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1250 (const :tag "URL" url)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1251 '(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
|
1252 (const :tag "URL" url)))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1253 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1254 (defconst tramp-prefix-format |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1255 (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
|
1256 ((equal tramp-syntax 'sep) "/[") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1257 ((equal tramp-syntax 'url) "/") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1258 (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
|
1259 "*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
|
1260 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
|
1261 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1262 (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
|
1263 (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
|
1264 "*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
|
1265 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
|
1266 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1267 (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
|
1268 "[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
|
1269 "*Regexp matching methods identifiers.") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1270 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1271 (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
|
1272 (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
|
1273 ((equal tramp-syntax 'sep) "/") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1274 ((equal tramp-syntax 'url) "://") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1275 (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
|
1276 "*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
|
1277 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
|
1278 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1279 (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
|
1280 (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
|
1281 "*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
|
1282 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
|
1283 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1284 (defconst tramp-user-regexp |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1285 "[^:/ \t]+" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1286 "*Regexp matching user names.") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1287 |
100856
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1288 (defconst tramp-prefix-domain-format "%" |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1289 "*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
|
1290 |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1291 (defconst tramp-prefix-domain-regexp |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1292 (regexp-quote tramp-prefix-domain-format) |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1293 "*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
|
1294 Derived from `tramp-prefix-domain-format'.") |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1295 |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1296 (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
|
1297 "[-a-zA-Z0-9_.]+" |
100856
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1298 "*Regexp matching domain names.") |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1299 |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1300 (defconst tramp-user-with-domain-regexp |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1301 (concat "\\(" tramp-user-regexp "\\)" |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1302 tramp-prefix-domain-regexp |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1303 "\\(" tramp-domain-regexp "\\)") |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1304 "*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
|
1305 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1306 (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
|
1307 "@" |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
1308 "*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
|
1309 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
|
1310 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1311 (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
|
1312 (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
|
1313 "*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
|
1314 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
|
1315 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1316 (defconst tramp-host-regexp |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1317 "[a-zA-Z0-9_.-]+" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1318 "*Regexp matching host names.") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1319 |
100856
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1320 (defconst tramp-prefix-ipv6-format |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1321 (cond ((equal tramp-syntax 'ftp) "[") |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1322 ((equal tramp-syntax 'sep) "") |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1323 ((equal tramp-syntax 'url) "[") |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1324 (t (error "Wrong `tramp-syntax' defined"))) |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1325 "*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
|
1326 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
|
1327 |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1328 (defconst tramp-prefix-ipv6-regexp |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1329 (regexp-quote tramp-prefix-ipv6-format) |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1330 "*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
|
1331 Derived from `tramp-prefix-ipv6-format'.") |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1332 |
101282
986acdda4aac
* net/tramp.el (tramp-ipv6-regexp): The regexp shall cover also
Michael Albinus <michael.albinus@gmx.de>
parents:
101020
diff
changeset
|
1333 ;; 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
|
1334 ;; 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
|
1335 ;; "::ffff:192.168.0.1". |
100856
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1336 (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
|
1337 "\\(?:\\(?:[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
|
1338 "*Regexp matching IPv6 addresses.") |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1339 |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1340 (defconst tramp-postfix-ipv6-format |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1341 (cond ((equal tramp-syntax 'ftp) "]") |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1342 ((equal tramp-syntax 'sep) "") |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1343 ((equal tramp-syntax 'url) "]") |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1344 (t (error "Wrong `tramp-syntax' defined"))) |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1345 "*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
|
1346 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
|
1347 |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1348 (defconst tramp-postfix-ipv6-regexp |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1349 (regexp-quote tramp-postfix-ipv6-format) |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1350 "*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
|
1351 Derived from `tramp-postfix-ipv6-format'.") |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1352 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1353 (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
|
1354 (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
|
1355 ((equal tramp-syntax 'sep) "#") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1356 ((equal tramp-syntax 'url) ":") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1357 (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
|
1358 "*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
|
1359 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1360 (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
|
1361 (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
|
1362 "*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
|
1363 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
|
1364 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1365 (defconst tramp-port-regexp |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1366 "[0-9]+" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1367 "*Regexp matching port numbers.") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1368 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1369 (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
|
1370 (concat "\\(" tramp-host-regexp "\\)" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1371 tramp-prefix-port-regexp |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1372 "\\(" tramp-port-regexp "\\)") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1373 "*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
|
1374 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1375 (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
|
1376 (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
|
1377 ((equal tramp-syntax 'sep) "]") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1378 ((equal tramp-syntax 'url) "") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1379 (t (error "Wrong `tramp-syntax' defined"))) |
49995
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
1380 "*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
|
1381 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
|
1382 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1383 (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
|
1384 (regexp-quote tramp-postfix-host-format) |
49995
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
1385 "*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
|
1386 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
|
1387 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1388 (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
|
1389 ".*$" |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1390 "*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
|
1391 |
45861 | 1392 ;; File name format. |
1393 | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1394 (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
|
1395 (list |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
1396 (concat |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
1397 tramp-prefix-regexp |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1398 "\\(" "\\(" 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
|
1399 "\\(" "\\(" 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
|
1400 "\\(" "\\(" tramp-host-regexp |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1401 "\\|" |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1402 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
|
1403 tramp-postfix-ipv6-regexp "\\)" |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1404 "\\(" 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
|
1405 tramp-postfix-host-regexp |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1406 "\\(" tramp-localname-regexp "\\)") |
100856
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
1407 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
|
1408 |
45861 | 1409 "*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
|
1410 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
|
1411 |
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
1412 The first element REGEXP is a regular expression matching a Tramp file |
45861 | 1413 name. The regex should contain parentheses around the method name, |
1414 the user name, the host name, and the file name parts. | |
1415 | |
1416 The second element METHOD is a number, saying which pair of | |
1417 parentheses matches the method name. The third element USER is | |
1418 similar, but for the user name. The fourth element HOST is similar, | |
1419 but for the host name. The fifth element FILE is for the file name. | |
1420 These numbers are passed directly to `match-string', which see. That | |
1421 means the opening parentheses are counted to identify the pair. | |
1422 | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1423 See also `tramp-file-name-regexp'.") |
45861 | 1424 |
1425 ;;;###autoload | |
46306
66cce4969490
(tramp-default-method): New default method "sm"
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46166
diff
changeset
|
1426 (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
|
1427 "\\`/\\([^[/:]+\\|[^/]+]\\):" |
46306
66cce4969490
(tramp-default-method): New default method "sm"
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46166
diff
changeset
|
1428 "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
|
1429 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
|
1430 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
|
1431 |
66cce4969490
(tramp-default-method): New default method "sm"
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46166
diff
changeset
|
1432 ;;;###autoload |
66cce4969490
(tramp-default-method): New default method "sm"
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46166
diff
changeset
|
1433 (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
|
1434 "\\`/\\[.*\\]" |
66cce4969490
(tramp-default-method): New default method "sm"
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46166
diff
changeset
|
1435 "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
|
1436 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
|
1437 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
|
1438 |
66cce4969490
(tramp-default-method): New default method "sm"
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46166
diff
changeset
|
1439 ;;;###autoload |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1440 (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
|
1441 "\\`/[^/:]+://" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1442 "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
|
1443 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
|
1444 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1445 ;;;###autoload |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1446 (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
|
1447 (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
|
1448 ((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
|
1449 ((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
|
1450 (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
|
1451 "*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
|
1452 This regexp should match Tramp file names but no other file names. |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
1453 When tramp.el is loaded, this regular expression is prepended to |
45861 | 1454 `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
|
1455 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
|
1456 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
|
1457 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
|
1458 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
1459 Please note that the entry in `file-name-handler-alist' is made when |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
1460 this file \(tramp.el\) is loaded. This means that this variable must be set |
47576
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
1461 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
|
1462 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
|
1463 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1464 Also see `tramp-file-name-structure'.") |
45861 | 1465 |
47576
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
1466 ;;;###autoload |
92982
afa7a7913261
* tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents:
91689
diff
changeset
|
1467 (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
|
1468 (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
|
1469 "\\`\\([a-zA-Z]:\\)?/" |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
1470 "\\`/") |
92982
afa7a7913261
* tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents:
91689
diff
changeset
|
1471 "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
|
1472 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
|
1473 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
|
1474 |
afa7a7913261
* tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents:
91689
diff
changeset
|
1475 ;;;###autoload |
afa7a7913261
* tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents:
91689
diff
changeset
|
1476 (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
|
1477 (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
|
1478 "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
|
1479 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
|
1480 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
|
1481 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
1482 ;;;###autoload |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
1483 (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
|
1484 (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
|
1485 "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
|
1486 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
|
1487 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
|
1488 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
1489 ;;;###autoload |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1490 (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
|
1491 (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
|
1492 "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
|
1493 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
|
1494 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1495 ;;;###autoload |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1496 (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
|
1497 (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
|
1498 ((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
|
1499 ((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
|
1500 (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
|
1501 "*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
|
1502 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
|
1503 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
1504 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
|
1505 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
|
1506 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
|
1507 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
|
1508 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1509 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
|
1510 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1511 (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
|
1512 '((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
|
1513 (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
|
1514 (tramp-wrong-passwd-regexp tramp-action-permission-denied) |
46752 | 1515 (shell-prompt-pattern tramp-action-succeed) |
46998
9d6aef07c793
Version 2.0.14 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46992
diff
changeset
|
1516 (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
|
1517 (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
|
1518 (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
|
1519 (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
|
1520 (tramp-process-alive-regexp tramp-action-process-alive)) |
46752 | 1521 "List of pattern/action pairs. |
1522 Whenever a pattern matches, the corresponding action is performed. | |
1523 Each item looks like (PATTERN ACTION). | |
1524 | |
1525 The PATTERN should be a symbol, a variable. The value of this | |
1526 variable gives the regular expression to search for. Note that the | |
1527 regexp must match at the end of the buffer, \"\\'\" is implicitly | |
1528 appended to it. | |
1529 | |
1530 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
|
1531 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
|
1532 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1533 (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
|
1534 '((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
|
1535 (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
|
1536 (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
|
1537 (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
|
1538 "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
|
1539 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
|
1540 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1541 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
|
1542 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1543 ;; 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
|
1544 ;; 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
|
1545 ;; 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
|
1546 ;; 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
|
1547 ;; 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
|
1548 (defcustom tramp-chunksize |
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
1549 (when (and (not (featurep 'xemacs)) |
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
1550 (memq system-type '(hpux))) |
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
1551 500) |
66561
742e40a6bf3c
* net/tramp.el (tramp-chunksize): Escape parentheses in docstring
Michael Albinus <michael.albinus@gmx.de>
parents:
66496
diff
changeset
|
1552 ;; 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
|
1553 ;; 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
|
1554 ;; `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
|
1555 "*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
|
1556 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
|
1557 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
|
1558 checked via the following code: |
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
1559 |
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
1560 (with-temp-buffer |
65925
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1561 (let* ((user \"xxx\") (host \"yyy\") |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1562 (init 0) (step 50) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1563 (sent init) (received init)) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1564 (while (= sent received) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1565 (setq sent (+ sent step)) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1566 (erase-buffer) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1567 (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
|
1568 \"ssh\" \"-l\" user host \"wc\" \"-c\"))) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1569 (when (memq (process-status proc) '(run open)) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1570 (process-send-string proc (make-string sent ?\\ )) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1571 (process-send-eof proc) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1572 (process-send-eof proc)) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1573 (while (not (progn (goto-char (point-min)) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1574 (re-search-forward \"\\\\w+\" (point-max) t))) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1575 (accept-process-output proc 1)) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1576 (when (memq (process-status proc) '(run open)) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1577 (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
|
1578 (delete-process proc) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1579 (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
|
1580 (sit-for 0)))) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1581 (if (> sent (+ init step)) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1582 (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
|
1583 (- sent step)) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1584 (message \"Test does not work\") |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1585 (display-buffer (current-buffer)) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1586 (sit-for 30)))) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1587 |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1588 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
|
1589 \(replace \"xxx\" and \"yyy\" by the remote user and host name, |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
1590 respectively\). You can do this, for example, by pasting it into |
65925
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1591 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
|
1592 last closing parenthesis. Note that it works only if you have configured |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
1593 \"ssh\" to run without password query, see ssh-agent\(1\). |
65925
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1594 |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1595 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
|
1596 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
|
1597 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
|
1598 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1599 When it is necessary to set `tramp-chunksize', you might consider to |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
1600 use an out-of-the-band method \(like \"scp\"\) instead of an internal one |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
1601 \(like \"ssh\"\), because setting `tramp-chunksize' to non-nil decreases |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1602 performance. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1603 |
65925
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1604 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
|
1605 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
|
1606 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
|
1607 in the third line of the code. |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
1608 |
49995
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
1609 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
|
1610 this variable to be set as well." |
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
1611 :group 'tramp |
50338
155b4b78aa3b
* tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49995
diff
changeset
|
1612 :type '(choice (const nil) integer)) |
49995
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
1613 |
54198
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
1614 ;; 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
|
1615 ;; 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
|
1616 ;; 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
|
1617 ;; 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
|
1618 (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
|
1619 "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
|
1620 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
|
1621 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
|
1622 :group 'tramp |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
1623 :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
|
1624 |
86204
7d7472ea9c0a
* net/tramp.el (tramp-completion-reread-directory-timeout): New
Michael Albinus <michael.albinus@gmx.de>
parents:
86048
diff
changeset
|
1625 (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
|
1626 "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
|
1627 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
|
1628 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
|
1629 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
|
1630 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
|
1631 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
|
1632 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
|
1633 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
|
1634 :group 'tramp |
7d7472ea9c0a
* net/tramp.el (tramp-completion-reread-directory-timeout): New
Michael Albinus <michael.albinus@gmx.de>
parents:
86048
diff
changeset
|
1635 :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
|
1636 |
45861 | 1637 ;;; Internal Variables: |
1638 | |
1639 (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
|
1640 "Connection method for this *tramp* buffer.") |
45861 | 1641 |
1642 (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
|
1643 "Remote login name for this *tramp* buffer.") |
45861 | 1644 |
1645 (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
|
1646 "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
|
1647 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1648 (defconst tramp-uudecode |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1649 "(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
|
1650 cat /tmp/tramp.$$ |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1651 rm -f /tmp/tramp.$$" |
46802
10aa49b3d28a
Version 2.0.10 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46801
diff
changeset
|
1652 "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
|
1653 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
|
1654 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
|
1655 we have this shell function.") |
46802
10aa49b3d28a
Version 2.0.10 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46801
diff
changeset
|
1656 |
105767
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1657 (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
|
1658 "%s -e ' |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1659 use File::Spec; |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1660 use Cwd \"realpath\"; |
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 sub recursive { |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1663 my ($volume, @dirs) = @_; |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1664 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
|
1665 $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
|
1666 if ($real) { |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1667 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
|
1668 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
|
1669 } |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1670 else { |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1671 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
|
1672 ($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
|
1673 push(@dirs, $last); |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1674 return ($volume, @dirs); |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1675 } |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1676 } |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1677 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1678 $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
|
1679 if (!$result) { |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1680 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
|
1681 ($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
|
1682 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1683 $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
|
1684 } |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1685 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1686 if ($ARGV[0] =~ /\\/$/) { |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1687 $result = $result . \"/\"; |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1688 } |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1689 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1690 print \"\\\"$result\\\"\\n\"; |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1691 ' \"$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
|
1692 "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
|
1693 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
|
1694 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
|
1695 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
|
1696 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1697 (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
|
1698 "%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
|
1699 my $str = shift; |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1700 if ($ARGV[2]) { |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1701 return lc($str); |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1702 } |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1703 else { |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1704 return $str; |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1705 } |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1706 } |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1707 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
|
1708 @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
|
1709 foreach $f (@files) { |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1710 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
|
1711 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
|
1712 print \"$f/\\n\"; |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1713 } |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1714 else { |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1715 print \"$f\\n\"; |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1716 } |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1717 } |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1718 } |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1719 print \"ok\\n\" |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
1720 ' \"$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
|
1721 "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
|
1722 `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
|
1723 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
|
1724 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
|
1725 |
46802
10aa49b3d28a
Version 2.0.10 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46801
diff
changeset
|
1726 ;; 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
|
1727 ;; 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
|
1728 ;; 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
|
1729 ;; 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
|
1730 ;; 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
|
1731 ;; 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
|
1732 (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
|
1733 "%s -e ' |
58540
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1734 @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
|
1735 if (!@stat) { |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
1736 print \"nil\\n\"; |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
1737 exit 0; |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
1738 } |
58540
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1739 if (($stat[2] & 0170000) == 0120000) |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1740 { |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1741 $type = readlink($ARGV[0]); |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1742 $type = \"\\\"$type\\\"\"; |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1743 } |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1744 elsif (($stat[2] & 0170000) == 040000) |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1745 { |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1746 $type = \"t\"; |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1747 } |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1748 else |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1749 { |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1750 $type = \"nil\" |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1751 }; |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1752 $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
|
1753 $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
|
1754 printf( |
82064
07bb0658401d
* net/tramp.el (tramp-perl-file-attributes)
Michael Albinus <michael.albinus@gmx.de>
parents:
82025
diff
changeset
|
1755 \"(%%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
|
1756 $type, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1757 $stat[3], |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1758 $uid, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1759 $gid, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1760 $stat[8] >> 16 & 0xffff, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1761 $stat[8] & 0xffff, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1762 $stat[9] >> 16 & 0xffff, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1763 $stat[9] & 0xffff, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1764 $stat[10] >> 16 & 0xffff, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1765 $stat[10] & 0xffff, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1766 $stat[7], |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1767 $stat[2], |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1768 $stat[1] >> 16 & 0xffff, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1769 $stat[1] & 0xffff |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1770 );' \"$1\" \"$2\" \"$3\" 2>/dev/null" |
45861 | 1771 "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
|
1772 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
|
1773 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
|
1774 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
|
1775 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1776 (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
|
1777 "%s -e ' |
65926
e465f3508fd5
(tramp-perl-directory-files-and-attributes): Add error handling.
Lars Hansen <larsh@soem.dk>
parents:
65925
diff
changeset
|
1778 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
|
1779 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
|
1780 @list = readdir(DIR); |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1781 closedir(DIR); |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1782 $n = scalar(@list); |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1783 printf(\"(\\n\"); |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1784 for($i = 0; $i < $n; $i++) |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1785 { |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1786 $filename = $list[$i]; |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1787 @stat = lstat($filename); |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1788 if (($stat[2] & 0170000) == 0120000) |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1789 { |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1790 $type = readlink($filename); |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1791 $type = \"\\\"$type\\\"\"; |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1792 } |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1793 elsif (($stat[2] & 0170000) == 040000) |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1794 { |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1795 $type = \"t\"; |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1796 } |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1797 else |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1798 { |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1799 $type = \"nil\" |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1800 }; |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1801 $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
|
1802 $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
|
1803 printf( |
97052
bed318e44ebd
* net/tramp.el (tramp-perl-directory-files-and-attributes)
Michael Albinus <michael.albinus@gmx.de>
parents:
97035
diff
changeset
|
1804 \"(\\\"%%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
|
1805 $filename, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1806 $type, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1807 $stat[3], |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1808 $uid, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1809 $gid, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1810 $stat[8] >> 16 & 0xffff, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1811 $stat[8] & 0xffff, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1812 $stat[9] >> 16 & 0xffff, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1813 $stat[9] & 0xffff, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1814 $stat[10] >> 16 & 0xffff, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1815 $stat[10] & 0xffff, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1816 $stat[7], |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1817 $stat[2], |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1818 $stat[1] >> 16 & 0xffff, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1819 $stat[1] & 0xffff, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1820 $stat[0] >> 16 & 0xffff, |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1821 $stat[0] & 0xffff); |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
1822 } |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1823 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
|
1824 "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
|
1825 output. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1826 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
|
1827 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
|
1828 |
46752 | 1829 ;; ;; These two use uu encoding. |
1830 ;; (defvar tramp-perl-encode "%s -e'\ | |
1831 ;; print qq(begin 644 xxx\n); | |
1832 ;; my $s = q(); | |
1833 ;; my $res = q(); | |
1834 ;; while (read(STDIN, $s, 45)) { | |
1835 ;; print pack(q(u), $s); | |
1836 ;; } | |
1837 ;; print qq(`\n); | |
1838 ;; print qq(end\n); | |
1839 ;; '" | |
1840 ;; "Perl program to use for encoding a file. | |
1841 ;; Escape sequence %s is replaced with name of Perl binary.") | |
1842 | |
1843 ;; (defvar tramp-perl-decode "%s -ne ' | |
1844 ;; print unpack q(u), $_; | |
1845 ;; '" | |
1846 ;; "Perl program to use for decoding a file. | |
1847 ;; Escape sequence %s is replaced with name of Perl binary.") | |
1848 | |
1849 ;; 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
|
1850 (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
|
1851 "%s -MMIME::Base64 -0777 -ne 'print encode_base64($_)' 2>/dev/null" |
46790 | 1852 "Perl program to use for encoding a file. |
1853 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
|
1854 This string is passed to `format', so percent characters need to be doubled. |
46790 | 1855 This implementation requires the MIME::Base64 Perl module to be installed |
1856 on the remote host.") | |
1857 | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1858 (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
|
1859 "%s -MMIME::Base64 -0777 -ne 'print decode_base64($_)' 2>/dev/null" |
46790 | 1860 "Perl program to use for decoding a file. |
1861 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
|
1862 This string is passed to `format', so percent characters need to be doubled. |
46790 | 1863 This implementation requires the MIME::Base64 Perl module to be installed |
1864 on the remote host.") | |
1865 | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1866 (defconst tramp-perl-encode |
46790 | 1867 "%s -e ' |
1868 # This script contributed by Juanma Barranquero <lektu@terra.es>. | |
106815 | 1869 # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
75361
9cc44485654f
(tramp-perl-encode, tramp-perl-decode): Update copyrights.
Glenn Morris <rgm@gnu.org>
parents:
75194
diff
changeset
|
1870 # Free Software Foundation, Inc. |
46790 | 1871 use strict; |
1872 | |
46795 | 1873 my %%trans = do { |
46790 | 1874 my $i = 0; |
1875 map {(substr(unpack(q(B8), chr $i++), 2, 6), $_)} | |
1876 split //, q(ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/); | |
1877 }; | |
1878 | |
46797 | 1879 binmode(\\*STDIN); |
46790 | 1880 |
1881 # We read in chunks of 54 bytes, to generate output lines | |
1882 # of 72 chars (plus end of line) | |
46797 | 1883 $/ = \\54; |
46790 | 1884 |
1885 while (my $data = <STDIN>) { | |
1886 my $pad = q(); | |
1887 | |
1888 # Only for the last chunk, and only if did not fill the last three-byte packet | |
1889 if (eof) { | |
46795 | 1890 my $mod = length($data) %% 3; |
46790 | 1891 $pad = q(=) x (3 - $mod) if $mod; |
1892 } | |
1893 | |
1894 # Not the fastest method, but it is simple: unpack to binary string, split | |
1895 # by groups of 6 bits and convert back from binary to byte; then map into | |
1896 # the translation table | |
1897 print | |
1898 join q(), | |
1899 map($trans{$_}, | |
1900 (substr(unpack(q(B*), $data) . q(00000), 0, 432) =~ /....../g)), | |
1901 $pad, | |
46797 | 1902 qq(\\n); |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1903 }' 2>/dev/null" |
46752 | 1904 "Perl program to use for encoding a file. |
46795 | 1905 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
|
1906 This string is passed to `format', so percent characters need to be doubled.") |
46752 | 1907 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1908 (defconst tramp-perl-decode |
46790 | 1909 "%s -e ' |
1910 # This script contributed by Juanma Barranquero <lektu@terra.es>. | |
106815 | 1911 # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
75361
9cc44485654f
(tramp-perl-encode, tramp-perl-decode): Update copyrights.
Glenn Morris <rgm@gnu.org>
parents:
75194
diff
changeset
|
1912 # Free Software Foundation, Inc. |
46790 | 1913 use strict; |
1914 | |
46795 | 1915 my %%trans = do { |
46790 | 1916 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
|
1917 map {($_, substr(unpack(q(B8), chr $i++), 2, 6))} |
46790 | 1918 split //, q(ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/) |
1919 }; | |
1920 | |
46795 | 1921 my %%bytes = map {(unpack(q(B8), chr $_), chr $_)} 0 .. 255; |
46790 | 1922 |
46797 | 1923 binmode(\\*STDOUT); |
46790 | 1924 |
1925 # We are going to accumulate into $pending to accept any line length | |
1926 # (we do not check they are <= 76 chars as the RFC says) | |
1927 my $pending = q(); | |
1928 | |
1929 while (my $data = <STDIN>) { | |
1930 chomp $data; | |
1931 | |
1932 # If we find one or two =, we have reached the end and | |
1933 # any following data is to be discarded | |
1934 my $finished = $data =~ s/(==?).*/$1/; | |
1935 $pending .= $data; | |
1936 | |
1937 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
|
1938 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
|
1939 $pending = substr($pending, $len & ~3 + 1); |
46790 | 1940 |
1941 # Easy method: translate from chars to (pregenerated) six-bit packets, join, | |
1942 # split in 8-bit chunks and convert back to char. | |
1943 print join q(), | |
1944 map $bytes{$_}, | |
1945 ((join q(), map {$trans{$_} || q()} split //, $chunk) =~ /......../g); | |
1946 | |
1947 last if $finished; | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
1948 }' 2>/dev/null" |
46752 | 1949 "Perl program to use for decoding a file. |
46795 | 1950 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
|
1951 This string is passed to `format', so percent characters need to be doubled.") |
45861 | 1952 |
104642
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
1953 (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
|
1954 "echo \"(\" |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
1955 for file in \"$@\"; do |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
1956 if %s $file; then |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
1957 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
|
1958 else |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
1959 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
|
1960 fi |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
1961 if %s $file; then |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
1962 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
|
1963 else |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
1964 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
|
1965 fi |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
1966 done |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
1967 echo \")\"" |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
1968 "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
|
1969 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
|
1970 existence, and file readability.") |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
1971 |
84966
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
1972 (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
|
1973 '((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
|
1974 (1 . "p") ; fifo |
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
1975 (2 . "c") ; character device |
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
1976 (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
|
1977 (4 . "d") ; directory |
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
1978 (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
|
1979 (6 . "b") ; block device |
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
1980 (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
|
1981 (8 . "-") ; regular file |
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
1982 (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
|
1983 (10 . "l") ; symlink |
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
1984 (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
|
1985 (12 . "s") ; socket |
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
1986 (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
|
1987 (14 . "w")) ; whiteout (BSD) |
45861 | 1988 "A list of file types returned from the `stat' system call. |
1989 This is used to map a mode number to a permission string.") | |
1990 | |
1991 ;; 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
|
1992 ;; 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
|
1993 ;; get-file-buffer. |
45861 | 1994 (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
|
1995 '((load . tramp-handle-load) |
45861 | 1996 (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
|
1997 (file-name-as-directory . tramp-handle-file-name-as-directory) |
45861 | 1998 (file-name-directory . tramp-handle-file-name-directory) |
1999 (file-name-nondirectory . tramp-handle-file-name-nondirectory) | |
2000 (file-truename . tramp-handle-file-truename) | |
2001 (file-exists-p . tramp-handle-file-exists-p) | |
2002 (file-directory-p . tramp-handle-file-directory-p) | |
2003 (file-executable-p . tramp-handle-file-executable-p) | |
2004 (file-readable-p . tramp-handle-file-readable-p) | |
2005 (file-regular-p . tramp-handle-file-regular-p) | |
2006 (file-symlink-p . tramp-handle-file-symlink-p) | |
2007 (file-writable-p . tramp-handle-file-writable-p) | |
2008 (file-ownership-preserved-p . tramp-handle-file-ownership-preserved-p) | |
2009 (file-newer-than-file-p . tramp-handle-file-newer-than-file-p) | |
2010 (file-attributes . tramp-handle-file-attributes) | |
2011 (file-modes . tramp-handle-file-modes) | |
2012 (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
|
2013 (directory-files-and-attributes . tramp-handle-directory-files-and-attributes) |
45861 | 2014 (file-name-all-completions . tramp-handle-file-name-all-completions) |
2015 (file-name-completion . tramp-handle-file-name-completion) | |
2016 (add-name-to-file . tramp-handle-add-name-to-file) | |
2017 (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
|
2018 (copy-directory . tramp-handle-copy-directory) |
45861 | 2019 (rename-file . tramp-handle-rename-file) |
2020 (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
|
2021 (set-file-times . tramp-handle-set-file-times) |
45861 | 2022 (make-directory . tramp-handle-make-directory) |
2023 (delete-directory . tramp-handle-delete-directory) | |
2024 (delete-file . tramp-handle-delete-file) | |
2025 (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
|
2026 ;; `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
|
2027 (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
|
2028 (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
|
2029 (process-file . tramp-handle-process-file) |
45861 | 2030 (shell-command . tramp-handle-shell-command) |
2031 (insert-directory . tramp-handle-insert-directory) | |
2032 (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
|
2033 (substitute-in-file-name . tramp-handle-substitute-in-file-name) |
45861 | 2034 (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
|
2035 (file-remote-p . tramp-handle-file-remote-p) |
45861 | 2036 (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
|
2037 (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
|
2038 . tramp-handle-insert-file-contents-literally) |
45861 | 2039 (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
|
2040 (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
|
2041 (make-auto-save-file-name . tramp-handle-make-auto-save-file-name) |
45861 | 2042 (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
|
2043 (dired-compress-file . tramp-handle-dired-compress-file) |
45861 | 2044 (dired-recursive-delete-directory |
2045 . 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
|
2046 (dired-uncache . tramp-handle-dired-uncache) |
45861 | 2047 (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
|
2048 (verify-visited-file-modtime . tramp-handle-verify-visited-file-modtime) |
108077
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
2049 (file-selinux-context . tramp-handle-file-selinux-context) |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
2050 (set-file-selinux-context . tramp-handle-set-file-selinux-context) |
102907
5055f4ba592b
* net/tramp.el (tramp-file-name-handler-alist): Add
Michael Albinus <michael.albinus@gmx.de>
parents:
102851
diff
changeset
|
2051 (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
|
2052 "Alist of handler functions. |
45861 | 2053 Operations not mentioned here will be handled by the normal Emacs functions.") |
2054 | |
85694
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
2055 ;; 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
|
2056 ;; `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
|
2057 ;;;###autoload |
47576
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
2058 (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
|
2059 '((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
|
2060 (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
|
2061 "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
|
2062 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
|
2063 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
|
2064 normal Emacs functions.") |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
2065 |
48973
09acf3f65bb5
* net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47771
diff
changeset
|
2066 ;; 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
|
2067 (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
|
2068 ;; (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
|
2069 ;; 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
|
2070 '((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
|
2071 "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
|
2072 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
|
2073 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
|
2074 |
87648
7ae99e295dfd
* vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents:
87368
diff
changeset
|
2075 ;;; Internal functions which must come first: |
45861 | 2076 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2077 (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
|
2078 "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
|
2079 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
|
2080 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
|
2081 (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
|
2082 (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
|
2083 (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
|
2084 ;; Headline. |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
2085 (when (bobp) |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
2086 (insert |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
2087 (format |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
2088 ";; %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
|
2089 (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
|
2090 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
|
2091 (unless (bolp) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2092 (insert "\n")) |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
2093 ;; Timestamp. |
104125
fd4d8124e329
* net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents:
104097
diff
changeset
|
2094 (let ((now (current-time))) |
fd4d8124e329
* net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents:
104097
diff
changeset
|
2095 (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
|
2096 (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
|
2097 ;; Calling function. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2098 (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
|
2099 (while (not fn) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2100 (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
|
2101 (if (not btf) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2102 (setq fn "") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2103 (when (symbolp btf) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2104 (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
|
2105 (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
|
2106 (not (string-match |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2107 "^tramp\\(-debug\\)?\\(-message\\|-error\\)$" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2108 fn))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2109 (setq fn nil))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2110 (setq btn (1+ btn)))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2111 ;; 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
|
2112 ;; 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
|
2113 ;; consuming. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2114 ; (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
|
2115 ; (insert |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2116 ; (format |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2117 ; "%s:%d: " |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2118 ; (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
|
2119 ; (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
|
2120 ; (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
|
2121 (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
|
2122 ;; The message. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2123 (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
|
2124 |
104642
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
2125 (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
|
2126 "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
|
2127 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
|
2128 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
|
2129 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2130 (defsubst tramp-message (vec-or-proc level fmt-string &rest args) |
45861 | 2131 "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
|
2132 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
|
2133 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
|
2134 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
|
2135 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
|
2136 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2137 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
|
2138 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
|
2139 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2140 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
|
2141 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
|
2142 applicable)." |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2143 (condition-case nil |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2144 (when (<= level tramp-verbose) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2145 ;; 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
|
2146 (save-match-data |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2147 ;; 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
|
2148 (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
|
2149 (apply 'message |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2150 (concat |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2151 (cond |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2152 ((= level 0) "") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2153 ((= level 1) "") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2154 ((= level 2) "Warning: ") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2155 (t "Tramp: ")) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2156 fmt-string) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2157 args)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2158 ;; 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
|
2159 (when (>= tramp-verbose 4) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2160 (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
|
2161 (processp vec-or-proc) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2162 (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
|
2163 (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
|
2164 ;; Translate proc to vec. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2165 (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
|
2166 (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
|
2167 (apply 'tramp-debug-message |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2168 vec-or-proc |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2169 (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
|
2170 args))))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2171 ;; Suppress all errors. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2172 (error nil))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2173 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2174 (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
|
2175 "Emit an error. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2176 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
|
2177 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
|
2178 `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
|
2179 (let (tramp-message-show-message) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
2180 (tramp-message |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
2181 vec-or-proc 1 "%s" |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
2182 (error-message-string |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
2183 (list signal |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
2184 (get signal 'error-message) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
2185 (apply 'format fmt-string args)))) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
2186 (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
|
2187 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2188 (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
|
2189 (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
|
2190 "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
|
2191 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
|
2192 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
|
2193 (save-window-excursion |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2194 (unwind-protect |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2195 (apply 'tramp-error vec-or-proc signal fmt-string args) |
107870
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
2196 (when (and vec-or-proc |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
2197 (not (zerop tramp-verbose)) |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
2198 (not (tramp-completion-mode-p))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2199 (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
|
2200 (pop-to-buffer |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2201 (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
|
2202 (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
|
2203 (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
|
2204 (sit-for 30)))))) |
45861 | 2205 |
46009
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2206 (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
|
2207 "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
|
2208 |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2209 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
|
2210 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
|
2211 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
|
2212 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
|
2213 `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
|
2214 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
|
2215 |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2216 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
|
2217 `progn'). |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2218 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2219 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
|
2220 `host', `localname' to the components." |
46009
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2221 `(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
|
2222 (,(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
|
2223 (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
|
2224 (,(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
|
2225 (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
|
2226 (,(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
|
2227 (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
|
2228 (,(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
|
2229 (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
|
2230 ,@body)) |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2231 |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2232 (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
|
2233 (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
|
2234 (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
|
2235 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2236 (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
|
2237 "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
|
2238 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
|
2239 `(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
|
2240 (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
|
2241 (when (eq value 'undef) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2242 ;; 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
|
2243 ;; `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
|
2244 ;; debug messages. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2245 (setq value (progn ,@body)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2246 (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
|
2247 value) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2248 ,@body)) |
84966
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
2249 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2250 (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
|
2251 (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
|
2252 (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
|
2253 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2254 (defmacro with-connection-property (key property &rest body) |
108066
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2255 "Check in Tramp for property PROPERTY, otherwise executes BODY and set." |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2256 `(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
|
2257 (when (eq value 'undef) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2258 ;; 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
|
2259 ;; `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
|
2260 ;; messages. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2261 (setq value (progn ,@body)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2262 (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
|
2263 value)) |
84966
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
2264 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2265 (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
|
2266 (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
|
2267 (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
|
2268 |
108066
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2269 (defmacro with-progress-reporter (vec level message &rest body) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2270 "Executes BODY, spinning a progress reporter with MESSAGE." |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2271 `(let (pr tm) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2272 (tramp-message ,vec ,level "%s..." ,message) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2273 ;; We start a pulsing progress reporter after 3 seconds. Feature |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2274 ;; introduced in Emacs 24.1. |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2275 (when (<= ,level tramp-verbose) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2276 (condition-case nil |
108269
96984953f99e
* net/tramp.el (top, with-progress-reporter): Use
Michael Albinus <michael.albinus@gmx.de>
parents:
108244
diff
changeset
|
2277 (setq pr (funcall (symbol-function 'make-progress-reporter) ,message) |
108066
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2278 tm (run-at-time 3 0.1 'progress-reporter-update pr)) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2279 (error nil))) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2280 (unwind-protect |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2281 ;; Execute the body. |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2282 (progn ,@body) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2283 ;; Stop progress reporter. |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2284 (if tm (cancel-timer tm)) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2285 (tramp-message ,vec ,level "%s...done" ,message)))) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2286 |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2287 (put 'with-progress-reporter 'lisp-indent-function 3) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2288 (put 'with-progress-reporter 'edebug-form-spec t) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2289 (font-lock-add-keywords 'emacs-lisp-mode '("\\<with-progress-reporter\\>")) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2290 |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
2291 (eval-and-compile ;; Silence compiler. |
93566
61bf6b37b78d
(tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
93539
diff
changeset
|
2292 (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
|
2293 (defun tramp-drop-volume-letter (name) |
61bf6b37b78d
(tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
93539
diff
changeset
|
2294 "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
|
2295 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
|
2296 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
|
2297 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
|
2298 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
|
2299 (save-match-data |
61bf6b37b78d
(tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
93539
diff
changeset
|
2300 (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
|
2301 (replace-match "/" nil t name) |
61bf6b37b78d
(tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
93539
diff
changeset
|
2302 name))) |
61bf6b37b78d
(tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
93539
diff
changeset
|
2303 |
61bf6b37b78d
(tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
93539
diff
changeset
|
2304 (defalias 'tramp-drop-volume-letter 'identity))) |
61bf6b37b78d
(tramp-drop-volume-letter): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
93539
diff
changeset
|
2305 |
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
|
2306 (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
|
2307 "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
|
2308 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
|
2309 (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
|
2310 (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
|
2311 (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
|
2312 (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
|
2313 (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
|
2314 (tramp-drop-volume-letter |
7fd0d929f732
* net/tramp.el (tramp-make-tramp-temp-file): Use
Michael Albinus <michael.albinus@gmx.de>
parents:
93430
diff
changeset
|
2315 (expand-file-name |
7fd0d929f732
* net/tramp.el (tramp-make-tramp-temp-file): Use
Michael Albinus <michael.albinus@gmx.de>
parents:
93430
diff
changeset
|
2316 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
|
2317 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
|
2318 (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
|
2319 ;; `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
|
2320 ;; 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
|
2321 ;; 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
|
2322 ;; 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
|
2323 (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
|
2324 (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
|
2325 (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
|
2326 ;; 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
|
2327 (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
|
2328 (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
|
2329 |
05c8e6a18913
* net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents:
85428
diff
changeset
|
2330 ;; 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
|
2331 (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
|
2332 |
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
2333 |
47576
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
2334 ;;; Config Manipulation Functions: |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
2335 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
2336 (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
|
2337 "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
|
2338 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
|
2339 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
|
2340 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
|
2341 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
|
2342 `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
|
2343 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
|
2344 |
47576
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
2345 Example: |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
2346 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
2347 (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
|
2348 \"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
|
2349 '((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
|
2350 (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
|
2351 |
54198
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
2352 (let ((r function-list) |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
2353 (v function-list)) |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
2354 (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
|
2355 (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
|
2356 tramp-completion-function-alist)) |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
2357 |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
2358 (while v |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2359 ;; Remove double entries. |
54198
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
2360 (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
|
2361 (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
|
2362 ;; 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
|
2363 (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
|
2364 (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
|
2365 ;; Windows registry. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2366 (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
|
2367 (zerop |
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
2368 (tramp-local-call-process |
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
2369 "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
|
2370 ;; Configuration file. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2371 (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
|
2372 (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
|
2373 (setq v (cdr v))) |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
2374 |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
2375 (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
|
2376 (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
|
2377 (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
|
2378 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
2379 (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
|
2380 "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
|
2381 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
|
2382 (cons |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2383 ;; 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
|
2384 `(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
|
2385 ;; The method related defaults. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2386 (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
|
2387 |
84739
ed643c57fe39
* rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents:
84406
diff
changeset
|
2388 |
87648
7ae99e295dfd
* vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents:
87368
diff
changeset
|
2389 ;;; 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
|
2390 |
7ae99e295dfd
* vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents:
87368
diff
changeset
|
2391 ;; 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
|
2392 (defvar tramp-rfn-eshadow-overlay) |
ed643c57fe39
* rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents:
84406
diff
changeset
|
2393 (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
|
2394 |
ed643c57fe39
* rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents:
84406
diff
changeset
|
2395 (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
|
2396 "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
|
2397 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
|
2398 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
|
2399 (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
|
2400 (setq tramp-rfn-eshadow-overlay |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
2401 (funcall (symbol-function 'make-overlay) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
2402 (funcall (symbol-function 'minibuffer-prompt-end)) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
2403 (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
|
2404 ;; Copy rfn-eshadow-overlay properties. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
2405 (let ((props (funcall (symbol-function 'overlay-properties) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
2406 (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
|
2407 (while props |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
2408 (funcall (symbol-function 'overlay-put) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
2409 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
|
2410 |
ed643c57fe39
* rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents:
84406
diff
changeset
|
2411 (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
|
2412 (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
|
2413 'tramp-rfn-eshadow-setup-minibuffer) |
926453fe3d68
* net/tramp.el (top): Quote feature names. Remove
Michael Albinus <michael.albinus@gmx.de>
parents:
95067
diff
changeset
|
2414 (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
|
2415 (lambda () |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
2416 (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
|
2417 '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
|
2418 |
104137
974fca280203
* net/tramp.el (tramp-rfn-eshadow-update-overlay-regexp) New
Michael Albinus <michael.albinus@gmx.de>
parents:
104125
diff
changeset
|
2419 (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
|
2420 (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
|
2421 |
84739
ed643c57fe39
* rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents:
84406
diff
changeset
|
2422 (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
|
2423 "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
|
2424 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
|
2425 `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
|
2426 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
|
2427 ;; 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
|
2428 (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
|
2429 (symbol-value 'rfn-eshadow-overlay)) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
2430 (funcall (symbol-function 'minibuffer-prompt-end))))) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
2431 (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
|
2432 (save-excursion |
ad84adc0e027
From_ Johan Bockgrd, <http://article.gmane.org/gmane.emacs.devel/81056>
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
85126
diff
changeset
|
2433 (save-restriction |
ad84adc0e027
From_ Johan Bockgrd, <http://article.gmane.org/gmane.emacs.devel/81056>
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
85126
diff
changeset
|
2434 (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
|
2435 (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
|
2436 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
|
2437 end)) |
974fca280203
* net/tramp.el (tramp-rfn-eshadow-update-overlay-regexp) New
Michael Albinus <michael.albinus@gmx.de>
parents:
104125
diff
changeset
|
2438 (point-max)) |
85428
ad84adc0e027
From_ Johan Bockgrd, <http://article.gmane.org/gmane.emacs.devel/81056>
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
85126
diff
changeset
|
2439 (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
|
2440 (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
|
2441 (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
|
2442 (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
|
2443 |
ed643c57fe39
* rfn-eshadow.el (rfn-eshadow-setup-minibuffer-hook)
Michael Albinus <michael.albinus@gmx.de>
parents:
84406
diff
changeset
|
2444 (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
|
2445 (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
|
2446 '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
|
2447 (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
|
2448 (lambda () |
828d51e45d15
* net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents:
105615
diff
changeset
|
2449 (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
|
2450 '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
|
2451 |
47576
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
2452 |
106219
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2453 ;;; Integration of eshell.el: |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2454 |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2455 (eval-when-compile |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2456 (defvar eshell-path-env)) |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2457 |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2458 ;; 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
|
2459 ;; 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
|
2460 (defun tramp-eshell-directory-change () |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2461 "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
|
2462 (setq eshell-path-env |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2463 (if (file-remote-p default-directory) |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2464 (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
|
2465 (mapconcat |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2466 'identity |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2467 (tramp-get-remote-path v) |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2468 ":")) |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2469 (getenv "PATH")))) |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2470 |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2471 (eval-after-load "esh-util" |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2472 '(progn |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2473 (tramp-eshell-directory-change) |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2474 (add-hook 'eshell-directory-change-hook |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2475 'tramp-eshell-directory-change) |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2476 (add-hook 'tramp-unload-hook |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2477 (lambda () |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2478 (remove-hook 'eshell-directory-change-hook |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2479 'tramp-eshell-directory-change))))) |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2480 |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
106204
diff
changeset
|
2481 |
45861 | 2482 ;;; File Name Handler Functions: |
2483 | |
2484 (defun tramp-handle-make-symbolic-link | |
2485 (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
|
2486 "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
|
2487 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
|
2488 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
|
2489 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
|
2490 |
49995
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
2491 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
|
2492 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
|
2493 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
|
2494 target of the symlink differ." |
46009
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2495 (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
|
2496 (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
|
2497 (cwd (tramp-run-real-handler |
ed7a07d27b12
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
94395
diff
changeset
|
2498 '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
|
2499 (unless ln |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2500 (tramp-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2501 l 'file-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2502 "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
|
2503 |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2504 ;; 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
|
2505 (when (file-exists-p linkname) |
46009
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2506 ;; What to do? |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2507 (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
|
2508 (and (numberp ok-if-already-exists) |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2509 (not (yes-or-no-p |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2510 (format |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2511 "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
|
2512 l-localname))))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2513 (tramp-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2514 l 'file-already-exists "File %s already exists" l-localname) |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
2515 (tramp-compat-delete-file linkname 'force))) |
46307
a2d047d50fb9
(tramp-handle-make-symbolic-link): Implement.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46306
diff
changeset
|
2516 |
49995
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
2517 ;; 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
|
2518 (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
|
2519 (setq filename |
8fb95bcda144
* net/tramp.el (tramp-find-foreign-file-name-handler): Check also
Michael Albinus <michael.albinus@gmx.de>
parents:
85067
diff
changeset
|
2520 (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
|
2521 (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
|
2522 |
46009
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2523 ;; 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
|
2524 ;; 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
|
2525 ;; that FILENAME belongs to. |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2526 (zerop |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2527 (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
|
2528 l |
075fc4ee6c41
* net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents:
106115
diff
changeset
|
2529 (format |
075fc4ee6c41
* net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents:
106115
diff
changeset
|
2530 "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
|
2531 (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
|
2532 ln |
075fc4ee6c41
* net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents:
106115
diff
changeset
|
2533 (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
|
2534 (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
|
2535 t))))) |
45861 | 2536 |
2537 (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
|
2538 "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
|
2539 (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
|
2540 (unless nosuffix |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2541 (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
|
2542 (setq file (concat file ".elc"))) |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2543 ((file-exists-p (concat file ".el")) |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2544 (setq file (concat file ".el"))))) |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2545 (when must-suffix |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2546 ;; 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
|
2547 ;; Included for safety's sake. |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2548 (unless (or (file-name-directory file) |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2549 (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
|
2550 (tramp-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2551 v 'file-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2552 "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
|
2553 (unless noerror |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2554 (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
|
2555 (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
|
2556 (if (not (file-exists-p file)) |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2557 nil |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2558 (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
|
2559 (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
|
2560 ;; 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
|
2561 (unwind-protect |
2b84620022aa
* net/tramp.el (tramp-handle-load)
Michael Albinus <michael.albinus@gmx.de>
parents:
100903
diff
changeset
|
2562 (load local-copy noerror t t) |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
2563 (tramp-compat-delete-file local-copy 'force))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2564 (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
|
2565 t))) |
45861 | 2566 |
85694
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
2567 ;; 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
|
2568 (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
|
2569 "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
|
2570 ;; `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
|
2571 ;; 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
|
2572 (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
|
2573 ;; 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
|
2574 (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
|
2575 (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
|
2576 (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
|
2577 (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
|
2578 (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
|
2579 '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
|
2580 |
45861 | 2581 (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
|
2582 "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
|
2583 ;; 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
|
2584 ;; 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
|
2585 ;; 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
|
2586 ;; file name completion. |
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
2587 (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
|
2588 ;; 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
|
2589 (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
|
2590 (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
|
2591 (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
|
2592 (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
|
2593 (tramp-run-real-handler |
ed7a07d27b12
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
94395
diff
changeset
|
2594 'file-name-directory (list (or (tramp-file-name-localname v) "")))))) |
45861 | 2595 |
2596 (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
|
2597 "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
|
2598 (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
|
2599 (tramp-run-real-handler 'file-name-nondirectory (list localname)))) |
45861 | 2600 |
2601 (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
|
2602 "Like `file-truename' for Tramp files." |
56644
0cee455027ed
Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents:
56465
diff
changeset
|
2603 (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
|
2604 (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
|
2605 (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
|
2606 (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
|
2607 (cond |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2608 ;; 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
|
2609 ((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
|
2610 (setq result |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2611 (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
|
2612 v |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2613 (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
|
2614 (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
|
2615 (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
|
2616 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2617 ;; Use Perl implementation. |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2618 ((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
|
2619 (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
|
2620 (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
|
2621 (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
|
2622 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
|
2623 (setq result |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2624 (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
|
2625 v |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2626 (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
|
2627 (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
|
2628 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2629 ;; 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
|
2630 ;; 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
|
2631 (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
|
2632 (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
|
2633 (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
|
2634 '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
|
2635 (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
|
2636 (thisstep nil) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2637 (numchase 0) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2638 ;; 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
|
2639 ;; 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
|
2640 ;; 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
|
2641 ;; 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
|
2642 ;; 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
|
2643 (numchase-limit 20) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2644 symlink-target) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2645 (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
|
2646 (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
|
2647 (tramp-message |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2648 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
|
2649 (mapconcat 'identity |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2650 (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
|
2651 "/")) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2652 (setq symlink-target |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2653 (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
|
2654 (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
|
2655 method user host |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2656 (mapconcat 'identity |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2657 (append '("") |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2658 (reverse result) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2659 (list thisstep)) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2660 "/"))))) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2661 (cond ((string= "." thisstep) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2662 (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
|
2663 ((string= ".." thisstep) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2664 (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
|
2665 (pop result)) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2666 ((stringp symlink-target) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2667 ;; 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
|
2668 (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
|
2669 (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
|
2670 (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
|
2671 (setq result nil)) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2672 ;; 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
|
2673 ;; "/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
|
2674 ;; "/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
|
2675 (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
|
2676 (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
|
2677 (tramp-error |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2678 v 'file-error |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2679 "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
|
2680 (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
|
2681 (setq steps |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2682 (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
|
2683 symlink-target "/") |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2684 steps))) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2685 (t |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2686 ;; 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
|
2687 (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
|
2688 (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
|
2689 (tramp-error |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2690 v 'file-error |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2691 "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
|
2692 (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
|
2693 ;; 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
|
2694 (setq result |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2695 (if result |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2696 (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
|
2697 "/")) |
105767
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2698 (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
|
2699 (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
|
2700 (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
|
2701 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2702 (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
|
2703 (tramp-make-tramp-file-name method user host result))))) |
45861 | 2704 |
2705 ;; Basic functions. | |
2706 | |
2707 (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
|
2708 "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
|
2709 (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
|
2710 (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
|
2711 (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
|
2712 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
|
2713 (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
|
2714 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
|
2715 (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
|
2716 v |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2717 (format |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2718 "%s %s" |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
2719 (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
|
2720 (tramp-shell-quote-argument localname)))))))) |
45861 | 2721 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2722 ;; 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
|
2723 ;; 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
|
2724 ;; 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
|
2725 ;; 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
|
2726 ;; take time. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2727 (defvar tramp-inodes nil |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2728 "Keeps virtual inodes numbers.") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2729 |
49612
407d6516031a
2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49598
diff
changeset
|
2730 ;; 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
|
2731 ;; 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
|
2732 ;; 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
|
2733 ;; 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
|
2734 ;; (-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
|
2735 (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
|
2736 "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
|
2737 |
45861 | 2738 ;; CCC: This should check for an error condition and signal failure |
2739 ;; when something goes wrong. | |
2740 ;; Daniel Pittman <daniel@danann.net> | |
53206
0c19f1a19b2b
(tramp-chunksize): Extend docstring. Suggested by
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
52401
diff
changeset
|
2741 (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
|
2742 "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
|
2743 (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
|
2744 ;; 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
|
2745 (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
|
2746 (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
|
2747 (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
|
2748 (save-excursion |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
2749 (tramp-convert-file-attributes |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
2750 v |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
2751 (cond |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
2752 ((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
|
2753 (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
|
2754 ((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
|
2755 (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
|
2756 (t |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
2757 (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
|
2758 |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
2759 (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
|
2760 "Implement `file-attributes' for Tramp files using the ls(1) command." |
45861 | 2761 (let (symlinkp dirp |
2762 res-inode res-filemodes res-numlinks | |
2763 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
|
2764 (tramp-message vec 5 "file attributes with ls: %s" localname) |
45861 | 2765 (tramp-send-command |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2766 vec |
104866
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2767 (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
|
2768 (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
|
2769 (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
|
2770 (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
|
2771 (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
|
2772 (tramp-get-ls-command vec) |
58540
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
2773 (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
|
2774 (tramp-shell-quote-argument localname))) |
45861 | 2775 ;; 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
|
2776 (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
|
2777 (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
|
2778 (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
|
2779 ;; ... inode |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2780 (setq res-inode |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2781 (condition-case err |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2782 (read (current-buffer)) |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2783 (invalid-read-syntax |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2784 (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
|
2785 "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
|
2786 (string-match |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2787 "^[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
|
2788 (car (cddr err)))) |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2789 (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
|
2790 (match-beginning 1)))) |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2791 (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
|
2792 (twiddle (/ small 65536))) |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2793 (cons (+ big twiddle) |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2794 (- small (* twiddle 65536)))))))) |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2795 ;; ... file mode flags |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2796 (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
|
2797 ;; ... number links |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2798 (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
|
2799 ;; ... uid and gid |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2800 (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
|
2801 (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
|
2802 (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
|
2803 (progn |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2804 (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
|
2805 (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
|
2806 (progn |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2807 (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
|
2808 (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
|
2809 ;; ... size |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2810 (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
|
2811 ;; 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
|
2812 (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
|
2813 (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
|
2814 ;; 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
|
2815 (when symlinkp |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2816 (search-forward "-> ") |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2817 (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
|
2818 (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
|
2819 ;; return data gathered |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2820 (list |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2821 ;; 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
|
2822 ;; link, or nil. |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2823 (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
|
2824 ;; 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
|
2825 res-numlinks |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2826 ;; 2. File uid. |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2827 res-uid |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2828 ;; 3. File gid. |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2829 res-gid |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2830 ;; 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
|
2831 ;; 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
|
2832 ;; bits. |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2833 ;; 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
|
2834 ;; 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
|
2835 '(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
|
2836 ;; 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
|
2837 res-size |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2838 ;; 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
|
2839 res-filemodes |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2840 ;; 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
|
2841 ;; 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
|
2842 t |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2843 ;; 10. inode number. |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2844 res-inode |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2845 ;; 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
|
2846 -1 |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2847 ))))) |
45861 | 2848 |
104807
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
2849 (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
|
2850 (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
|
2851 "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
|
2852 (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
|
2853 (tramp-maybe-send-script |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2854 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
|
2855 (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
|
2856 vec |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2857 (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
|
2858 (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
|
2859 |
104807
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
2860 (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
|
2861 (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
|
2862 "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
|
2863 (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
|
2864 (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
|
2865 vec |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2866 (format |
104866
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
2867 "((%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
|
2868 (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
|
2869 (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
|
2870 (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
|
2871 (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
|
2872 (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
|
2873 (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
|
2874 (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
|
2875 (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
|
2876 |
45861 | 2877 (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
|
2878 "Like `set-visited-file-modtime' for Tramp files." |
45861 | 2879 (unless (buffer-file-name) |
2880 (error "Can't set-visited-file-modtime: buffer `%s' not visiting a file" | |
2881 (buffer-name))) | |
56644
0cee455027ed
Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents:
56465
diff
changeset
|
2882 (if time-list |
0cee455027ed
Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents:
56465
diff
changeset
|
2883 (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
|
2884 (let ((f (buffer-file-name)) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
2885 coding-system-used) |
56644
0cee455027ed
Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents:
56465
diff
changeset
|
2886 (with-parsed-tramp-file-name f nil |
0cee455027ed
Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents:
56465
diff
changeset
|
2887 (let* ((attr (file-attributes f)) |
0cee455027ed
Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents:
56465
diff
changeset
|
2888 ;; '(-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
|
2889 (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
|
2890 (when (boundp 'last-coding-system-used) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
2891 (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
|
2892 ;; 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
|
2893 ;; `tramp-do-file-attributes-with-ls'. |
56644
0cee455027ed
Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents:
56465
diff
changeset
|
2894 (if (not (equal modtime '(0 0))) |
0cee455027ed
Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents:
56465
diff
changeset
|
2895 (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
|
2896 (progn |
56644
0cee455027ed
Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents:
56465
diff
changeset
|
2897 (tramp-send-command |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2898 v |
56644
0cee455027ed
Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents:
56465
diff
changeset
|
2899 (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
|
2900 (tramp-get-ls-command v) |
56644
0cee455027ed
Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents:
56465
diff
changeset
|
2901 (tramp-shell-quote-argument localname))) |
0cee455027ed
Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents:
56465
diff
changeset
|
2902 (setq attr (buffer-substring (point) |
0cee455027ed
Sync with Tramp 2.0.44.
Michael Albinus <michael.albinus@gmx.de>
parents:
56465
diff
changeset
|
2903 (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
|
2904 (tramp-set-file-property |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2905 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
|
2906 (when (boundp 'last-coding-system-used) |
da00cdf6de37
Sync with Tramp 2.0.51.
Michael Albinus <michael.albinus@gmx.de>
parents:
65792
diff
changeset
|
2907 (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
|
2908 nil))))) |
45861 | 2909 |
46009
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2910 ;; 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
|
2911 ;; `tramp-handle-set-visited-file-modtime'. |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2912 (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
|
2913 "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
|
2914 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
|
2915 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
|
2916 `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
|
2917 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
|
2918 of." |
46009
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2919 (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
|
2920 ;; 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
|
2921 ;; 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
|
2922 (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
|
2923 (eq (visited-file-modtime) 0)) |
64772
060177e931f8
Sync with Tramp 2.0.50.
Michael Albinus <michael.albinus@gmx.de>
parents:
64701
diff
changeset
|
2924 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
|
2925 (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
|
2926 (with-parsed-tramp-file-name f nil |
82201 | 2927 (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
|
2928 (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
|
2929 (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
|
2930 (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
|
2931 |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
2932 (cond |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
2933 ;; 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
|
2934 ((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
|
2935 (< (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
|
2936 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
|
2937 ;; 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
|
2938 ;; (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
|
2939 ;; 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
|
2940 (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
|
2941 (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
|
2942 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
|
2943 2)) |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
2944 ;; 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
|
2945 (attr |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2946 (tramp-send-command |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2947 v |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2948 (format "%s -ild %s" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2949 (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
|
2950 (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
|
2951 (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
|
2952 (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
|
2953 (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
|
2954 (equal |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2955 attr |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2956 (tramp-get-file-property |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2957 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
|
2958 ;; 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
|
2959 ;; 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
|
2960 (t (equal mt '(-1 65535)))))))))) |
46009
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
2961 |
45861 | 2962 (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
|
2963 "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
|
2964 (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
|
2965 (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
|
2966 (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
|
2967 v |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2968 (format "chmod %s %s" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2969 (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
|
2970 (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
|
2971 ;; 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
|
2972 (tramp-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
2973 v 'file-error "Error while changing file's mode %s" filename)))) |
45861 | 2974 |
81938
26330ef1aa46
* net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents:
81758
diff
changeset
|
2975 (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
|
2976 "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
|
2977 (zerop |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
2978 (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
|
2979 (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
|
2980 (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
|
2981 (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
|
2982 (current-time) |
26330ef1aa46
* net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents:
81758
diff
changeset
|
2983 time)) |
26330ef1aa46
* net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents:
81758
diff
changeset
|
2984 (utc |
26330ef1aa46
* net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents:
81758
diff
changeset
|
2985 ;; 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
|
2986 ;; 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
|
2987 ;; 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
|
2988 ;; 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
|
2989 ;; local host. |
26330ef1aa46
* net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents:
81758
diff
changeset
|
2990 (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
|
2991 (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
|
2992 (= 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
|
2993 (symbol-function |
26330ef1aa46
* net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents:
81758
diff
changeset
|
2994 'format-time-string))))))) |
26330ef1aa46
* net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents:
81758
diff
changeset
|
2995 (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
|
2996 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
|
2997 (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
|
2998 (if utc |
26330ef1aa46
* net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents:
81758
diff
changeset
|
2999 (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
|
3000 (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
|
3001 (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
|
3002 |
81938
26330ef1aa46
* net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents:
81758
diff
changeset
|
3003 ;; 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
|
3004 ;; 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
|
3005 ;; 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
|
3006 (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
|
3007 "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
|
3008 (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
|
3009 (tramp-shell-quote-argument filename))))) |
45861 | 3010 |
82942
5cf3cd03cb50
* net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents:
82808
diff
changeset
|
3011 (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
|
3012 "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
|
3013 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
|
3014 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
|
3015 ;; 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
|
3016 ;; 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
|
3017 ;; 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
|
3018 ;; the majority of cases. |
104673
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
3019 ;; 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
|
3020 (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
|
3021 (if (file-remote-p filename) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
3022 (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
|
3023 (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
|
3024 ;; 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
|
3025 (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
|
3026 (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
|
3027 (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
|
3028 (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
|
3029 (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
|
3030 (tramp-send-command |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
3031 v (format |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
3032 "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
|
3033 (tramp-shell-quote-argument localname)))))) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
3034 |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
3035 ;; 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
|
3036 ;; `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
|
3037 (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
|
3038 (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
|
3039 (tramp-local-call-process |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
3040 "chown" nil nil nil |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
3041 (format "%d:%d" uid gid) (tramp-shell-quote-argument filename)))))) |
45861 | 3042 |
108158
94e4a7a7cadf
* net/tramp.el (tramp-remote-selinux-p): New defun.
Michael Albinus <albinus@detlef>
parents:
108077
diff
changeset
|
3043 (defun tramp-remote-selinux-p (vec) |
94e4a7a7cadf
* net/tramp.el (tramp-remote-selinux-p): New defun.
Michael Albinus <albinus@detlef>
parents:
108077
diff
changeset
|
3044 "Check, whether SELINUX is enabled on the remote host." |
94e4a7a7cadf
* net/tramp.el (tramp-remote-selinux-p): New defun.
Michael Albinus <albinus@detlef>
parents:
108077
diff
changeset
|
3045 (with-connection-property (tramp-get-connection-process vec) "selinux-p" |
94e4a7a7cadf
* net/tramp.el (tramp-remote-selinux-p): New defun.
Michael Albinus <albinus@detlef>
parents:
108077
diff
changeset
|
3046 (let ((result (tramp-find-executable |
94e4a7a7cadf
* net/tramp.el (tramp-remote-selinux-p): New defun.
Michael Albinus <albinus@detlef>
parents:
108077
diff
changeset
|
3047 vec "getenforce" (tramp-get-remote-path vec) t t))) |
94e4a7a7cadf
* net/tramp.el (tramp-remote-selinux-p): New defun.
Michael Albinus <albinus@detlef>
parents:
108077
diff
changeset
|
3048 (and result |
94e4a7a7cadf
* net/tramp.el (tramp-remote-selinux-p): New defun.
Michael Albinus <albinus@detlef>
parents:
108077
diff
changeset
|
3049 (string-equal |
94e4a7a7cadf
* net/tramp.el (tramp-remote-selinux-p): New defun.
Michael Albinus <albinus@detlef>
parents:
108077
diff
changeset
|
3050 (tramp-send-command-and-read |
94e4a7a7cadf
* net/tramp.el (tramp-remote-selinux-p): New defun.
Michael Albinus <albinus@detlef>
parents:
108077
diff
changeset
|
3051 vec (format "echo \\\"`%S`\\\"" result)) |
94e4a7a7cadf
* net/tramp.el (tramp-remote-selinux-p): New defun.
Michael Albinus <albinus@detlef>
parents:
108077
diff
changeset
|
3052 "Enforcing"))))) |
94e4a7a7cadf
* net/tramp.el (tramp-remote-selinux-p): New defun.
Michael Albinus <albinus@detlef>
parents:
108077
diff
changeset
|
3053 |
108077
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3054 (defun tramp-handle-file-selinux-context (filename) |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3055 "Like `file-selinux-context' for Tramp files." |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3056 (with-parsed-tramp-file-name filename nil |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3057 (with-file-property v localname "file-selinux-context" |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3058 (let ((context '(nil nil nil nil)) |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3059 (regexp (concat "\\([a-z0-9_]+\\):" "\\([a-z0-9_]+\\):" |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3060 "\\([a-z0-9_]+\\):" "\\([a-z0-9_]+\\)"))) |
108158
94e4a7a7cadf
* net/tramp.el (tramp-remote-selinux-p): New defun.
Michael Albinus <albinus@detlef>
parents:
108077
diff
changeset
|
3061 (when (and (tramp-remote-selinux-p v) |
94e4a7a7cadf
* net/tramp.el (tramp-remote-selinux-p): New defun.
Michael Albinus <albinus@detlef>
parents:
108077
diff
changeset
|
3062 (zerop (tramp-send-command-and-check |
94e4a7a7cadf
* net/tramp.el (tramp-remote-selinux-p): New defun.
Michael Albinus <albinus@detlef>
parents:
108077
diff
changeset
|
3063 v (format |
94e4a7a7cadf
* net/tramp.el (tramp-remote-selinux-p): New defun.
Michael Albinus <albinus@detlef>
parents:
108077
diff
changeset
|
3064 "%s -d -Z %s" |
94e4a7a7cadf
* net/tramp.el (tramp-remote-selinux-p): New defun.
Michael Albinus <albinus@detlef>
parents:
108077
diff
changeset
|
3065 (tramp-get-ls-command v) |
94e4a7a7cadf
* net/tramp.el (tramp-remote-selinux-p): New defun.
Michael Albinus <albinus@detlef>
parents:
108077
diff
changeset
|
3066 (tramp-shell-quote-argument localname))))) |
108077
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3067 (with-current-buffer (tramp-get-connection-buffer v) |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3068 (goto-char (point-min)) |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3069 (when (re-search-forward regexp (tramp-compat-line-end-position) t) |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3070 (setq context (list (match-string 1) (match-string 2) |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3071 (match-string 3) (match-string 4)))))) |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3072 ;; Return the context. |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3073 context)))) |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3074 |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3075 (defun tramp-handle-set-file-selinux-context (filename context) |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3076 "Like `set-file-selinux-context' for Tramp files." |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3077 (with-parsed-tramp-file-name filename nil |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3078 (if (and (consp context) |
108158
94e4a7a7cadf
* net/tramp.el (tramp-remote-selinux-p): New defun.
Michael Albinus <albinus@detlef>
parents:
108077
diff
changeset
|
3079 (tramp-remote-selinux-p v) |
108077
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3080 (zerop (tramp-send-command-and-check |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3081 v (format "chcon %s %s %s %s %s" |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3082 (if (stringp (nth 0 context)) |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3083 (format "--user=%s" (nth 0 context)) "") |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3084 (if (stringp (nth 1 context)) |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3085 (format "--role=%s" (nth 1 context)) "") |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3086 (if (stringp (nth 2 context)) |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3087 (format "--type=%s" (nth 2 context)) "") |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3088 (if (stringp (nth 3 context)) |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3089 (format "--range=%s" (nth 3 context)) "") |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3090 (tramp-shell-quote-argument localname))))) |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3091 (tramp-set-file-property v localname "file-selinux-context" context) |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3092 (tramp-set-file-property v localname "file-selinux-context" 'undef))) |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3093 ;; We always return nil. |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3094 nil) |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3095 |
45861 | 3096 ;; Simple functions using the `test' command. |
3097 | |
3098 (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
|
3099 "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
|
3100 (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
|
3101 (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
|
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 ?x) |
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 "-x" filename)))))) |
45861 | 3106 |
3107 (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
|
3108 "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
|
3109 (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
|
3110 (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
|
3111 ;; 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
|
3112 ;; 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
|
3113 (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
|
3114 (zerop (tramp-run-test "-r" filename)))))) |
45861 | 3115 |
3116 ;; When the remote shell is started, it looks for a shell which groks | |
3117 ;; tilde expansion. Here, we assume that all shells which grok tilde | |
3118 ;; expansion will also provide a `test' command which groks `-nt' (for | |
3119 ;; newer than). If this breaks, tell me about it and I'll try to do | |
3120 ;; something smarter about it. | |
3121 (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
|
3122 "Like `file-newer-than-file-p' for Tramp files." |
45861 | 3123 (cond ((not (file-exists-p file1)) |
3124 nil) | |
3125 ((not (file-exists-p file2)) | |
3126 t) | |
47577
20336ef6b20a
Version 2.0.21 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47576
diff
changeset
|
3127 ;; We are sure both files exist at this point. |
45861 | 3128 (t |
3129 (save-excursion | |
47577
20336ef6b20a
Version 2.0.21 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47576
diff
changeset
|
3130 ;; 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
|
3131 ;; 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
|
3132 ;; and obtain the result. |
20336ef6b20a
Version 2.0.21 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47576
diff
changeset
|
3133 (let ((fa1 (file-attributes file1)) |
20336ef6b20a
Version 2.0.21 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47576
diff
changeset
|
3134 (fa2 (file-attributes file2))) |
20336ef6b20a
Version 2.0.21 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47576
diff
changeset
|
3135 (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
|
3136 (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
|
3137 (> 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
|
3138 ;; 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
|
3139 ;; 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
|
3140 ;; 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
|
3141 ;; 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
|
3142 ;; host. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3143 (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
|
3144 (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
|
3145 (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
|
3146 (tramp-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3147 v 'file-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3148 "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
|
3149 file1 file2))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3150 (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
|
3151 (zerop (tramp-run-test2 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3152 (tramp-get-test-nt-command v) file1 file2))))))))) |
45861 | 3153 |
3154 ;; Functions implemented using the basic functions above. | |
3155 | |
3156 (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
|
3157 "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
|
3158 (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
|
3159 (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
|
3160 (tramp-mode-string-to-int (nth 8 (file-attributes truename)))))) |
45861 | 3161 |
102851
5cc9a4c776e8
* net/tramp.el (tramp-default-file-modes) New defun. Replace all
Michael Albinus <michael.albinus@gmx.de>
parents:
102287
diff
changeset
|
3162 (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
|
3163 "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
|
3164 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
|
3165 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
|
3166 (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
|
3167 (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
|
3168 |
45861 | 3169 (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
|
3170 "Like `file-directory-p' for Tramp files." |
45861 | 3171 ;; Care must be taken that this function returns `t' for symlinks |
3172 ;; pointing to directories. Surely the most obvious implementation | |
3173 ;; would be `test -d', but that returns false for such symlinks. | |
3174 ;; CCC: Stefan Monnier says that `test -d' follows symlinks. And | |
3175 ;; I now think he's right. So we could be using `test -d', couldn't | |
3176 ;; we? | |
3177 ;; | |
3178 ;; 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
|
3179 (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
|
3180 (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
|
3181 (zerop (tramp-run-test "-d" filename))))) |
45861 | 3182 |
3183 (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
|
3184 "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
|
3185 (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
|
3186 (eq ?- (aref (nth 8 (file-attributes filename)) 0)))) |
45861 | 3187 |
3188 (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
|
3189 "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
|
3190 (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
|
3191 (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
|
3192 (when (stringp x) |
6234a4fe96f9
Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
50494
diff
changeset
|
3193 ;; 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
|
3194 ;; might do weird things. |
6234a4fe96f9
Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
50494
diff
changeset
|
3195 (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
|
3196 (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
|
3197 x))))) |
45861 | 3198 |
3199 (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
|
3200 "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
|
3201 (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
|
3202 (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
|
3203 (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
|
3204 ;; 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
|
3205 ;; 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
|
3206 (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
|
3207 (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
|
3208 ;; 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
|
3209 (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
|
3210 "-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
|
3211 (zerop (tramp-run-test |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3212 "-w" (file-name-directory filename)))))))) |
45861 | 3213 |
3214 (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
|
3215 "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
|
3216 (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
|
3217 (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
|
3218 (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
|
3219 ;; 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
|
3220 ;; 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
|
3221 (or (null attributes) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3222 (= (nth 2 attributes) (tramp-get-remote-uid v 'integer))))))) |
45861 | 3223 |
3224 ;; Other file name ops. | |
3225 | |
3226 (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
|
3227 "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
|
3228 ;; 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
|
3229 ;; 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
|
3230 ;; 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
|
3231 ;; to avoid parsing the filename? |
46009
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
3232 (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
|
3233 (if (and (not (zerop (length localname))) |
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
3234 (eq (aref localname (1- (length localname))) ?/) |
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
3235 (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
|
3236 (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
|
3237 directory))) |
45861 | 3238 |
3239 ;; Directory listings. | |
3240 | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3241 (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
|
3242 (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
|
3243 "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
|
3244 ;; 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
|
3245 (when (file-directory-p directory) |
107190
21bb664bb922
(tramp-handle-directory-files): When FULL, do not expand "." and "..".
Michael Albinus <michael.albinus@gmx.de>
parents:
107189
diff
changeset
|
3246 (setq directory (file-name-as-directory (expand-file-name directory))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3247 (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
|
3248 result item) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3249 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3250 (while temp |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3251 (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
|
3252 (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
|
3253 (or (null files-only) |
107190
21bb664bb922
(tramp-handle-directory-files): When FULL, do not expand "." and "..".
Michael Albinus <michael.albinus@gmx.de>
parents:
107189
diff
changeset
|
3254 ;; Files only. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3255 (and (equal files-only t) (file-regular-p item)) |
107190
21bb664bb922
(tramp-handle-directory-files): When FULL, do not expand "." and "..".
Michael Albinus <michael.albinus@gmx.de>
parents:
107189
diff
changeset
|
3256 ;; Directories only. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3257 (file-directory-p item))) |
107190
21bb664bb922
(tramp-handle-directory-files): When FULL, do not expand "." and "..".
Michael Albinus <michael.albinus@gmx.de>
parents:
107189
diff
changeset
|
3258 (push (if full (concat directory item) item) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3259 result))) |
107190
21bb664bb922
(tramp-handle-directory-files): When FULL, do not expand "." and "..".
Michael Albinus <michael.albinus@gmx.de>
parents:
107189
diff
changeset
|
3260 (if nosort result (sort result 'string<))))) |
45861 | 3261 |
58540
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
3262 (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
|
3263 (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
|
3264 "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
|
3265 (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
|
3266 (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
|
3267 (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
|
3268 (let* ((temp |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
3269 (copy-tree |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3270 (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
|
3271 (with-file-property |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3272 v localname |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3273 (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
|
3274 (save-excursion |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3275 (mapcar |
104673
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
3276 (lambda (x) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
3277 (cons (car x) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
3278 (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
|
3279 (cond |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
3280 ((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
|
3281 (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
|
3282 v localname id-format)) |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
3283 ((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
|
3284 (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
|
3285 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
|
3286 result item) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3287 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3288 (while temp |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3289 (setq item (pop temp)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3290 (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
|
3291 (when full |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3292 (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
|
3293 (push item result))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3294 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3295 (if nosort |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3296 result |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3297 (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
|
3298 |
104807
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
3299 (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
|
3300 (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
|
3301 "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
|
3302 (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
|
3303 (tramp-maybe-send-script |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3304 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
|
3305 "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
|
3306 (let ((object |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3307 (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
|
3308 vec |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3309 (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
|
3310 (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
|
3311 (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
|
3312 object)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3313 |
104807
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
3314 (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
|
3315 (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
|
3316 "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
|
3317 (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
|
3318 (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
|
3319 vec |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3320 (format |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3321 (concat |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
3322 ;; 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
|
3323 ;; "-"; 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
|
3324 ;; 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
|
3325 ;; 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
|
3326 "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
|
3327 "%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
|
3328 "echo \")\"") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3329 (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
|
3330 (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
|
3331 (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
|
3332 (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
|
3333 (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
|
3334 |
45861 | 3335 ;; 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
|
3336 ;; files. |
45861 | 3337 (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
|
3338 "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
|
3339 (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
|
3340 (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
|
3341 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3342 (all-completions |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3343 filename |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3344 (mapcar |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3345 'list |
105767
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3346 (or |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3347 ;; Try cache first |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3348 (and |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3349 ;; Ignore if expired |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3350 (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
|
3351 (<= (tramp-time-diff |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3352 (current-time) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3353 (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
|
3354 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
|
3355 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
|
3356 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3357 ;; 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
|
3358 ;; 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
|
3359 ;; 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
|
3360 ;; 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
|
3361 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3362 ;; 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
|
3363 ;; `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
|
3364 (car |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3365 (apply |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3366 'append |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3367 (mapcar |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3368 (lambda (x) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3369 (let ((cache-hit |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3370 (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
|
3371 v |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3372 (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
|
3373 "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
|
3374 nil))) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3375 (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
|
3376 (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
|
3377 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3378 ;; 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
|
3379 ;; 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
|
3380 (let (result) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3381 ;; 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
|
3382 ;; 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
|
3383 ;; 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
|
3384 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3385 ;; 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
|
3386 ;; 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
|
3387 ;; 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
|
3388 ;; ignored. |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3389 (tramp-send-command |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3390 v |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3391 (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
|
3392 (progn |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3393 (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
|
3394 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
|
3395 "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
|
3396 (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
|
3397 (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
|
3398 (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
|
3399 (if (symbol-value |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
3400 ;; `read-file-name-completion-ignore-case' |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
3401 ;; is introduced with Emacs 22.1. |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
3402 (if (boundp |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
3403 'read-file-name-completion-ignore-case) |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
3404 'read-file-name-completion-ignore-case |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
3405 'completion-ignore-case)) |
105767
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3406 1 0))) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3407 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3408 (format (concat |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3409 "(\\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
|
3410 ;; `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
|
3411 ;; 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
|
3412 ;; `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
|
3413 ;; 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
|
3414 ;; 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
|
3415 ;; 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
|
3416 " || %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
|
3417 " | 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
|
3418 " 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
|
3419 " 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
|
3420 " && \\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
|
3421 (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
|
3422 (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
|
3423 ;; 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
|
3424 ;; 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
|
3425 ;; 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
|
3426 ;; `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
|
3427 ;; |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3428 ;; 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
|
3429 ;; `-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
|
3430 ;; sub-directories. |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3431 (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
|
3432 "." |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3433 (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
|
3434 (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
|
3435 (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
|
3436 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3437 ;; 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
|
3438 (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
|
3439 (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
|
3440 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3441 ;; 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
|
3442 (forward-line -1) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3443 (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
|
3444 (progn |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3445 ;; 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
|
3446 ;; (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
|
3447 (forward-line -1) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3448 (tramp-error |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3449 v 'file-error |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3450 "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
|
3451 (buffer-substring |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3452 (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
|
3453 ;; 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
|
3454 ;; 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
|
3455 ;; 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
|
3456 ;; side. |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3457 (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
|
3458 (tramp-error |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3459 v 'file-error |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3460 "\ |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3461 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
|
3462 (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
|
3463 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3464 (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
|
3465 (push (buffer-substring |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3466 (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
|
3467 result))) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3468 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3469 ;; 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
|
3470 ;; 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
|
3471 (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
|
3472 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
|
3473 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3474 ;; 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
|
3475 ;; 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
|
3476 (mapc (lambda (entry) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3477 (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
|
3478 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
|
3479 result) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3480 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3481 (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
|
3482 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
|
3483 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3484 ;; 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
|
3485 (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
|
3486 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
|
3487 "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
|
3488 result)))))))) |
45861 | 3489 |
74766
ca4412906dbd
* net/ange-ftp.el (ange-ftp-file-name-completion): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents:
74739
diff
changeset
|
3490 (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
|
3491 (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
|
3492 "Like `file-name-completion' for Tramp files." |
45861 | 3493 (unless (tramp-tramp-file-p directory) |
3494 (error | |
3495 "tramp-handle-file-name-completion invoked on non-tramp directory `%s'" | |
3496 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
|
3497 (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
|
3498 filename |
948c86bf6396
* net/tramp.el (tramp-default-method): We still need to check for
Michael Albinus <michael.albinus@gmx.de>
parents:
74766
diff
changeset
|
3499 (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
|
3500 (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
|
3501 (lambda (x) (funcall predicate (expand-file-name (car x) directory)))))) |
45861 | 3502 |
3503 ;; cp, mv and ln | |
3504 | |
3505 (defun tramp-handle-add-name-to-file | |
3506 (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
|
3507 "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
|
3508 (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
|
3509 (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
|
3510 (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
|
3511 (tramp-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3512 v 'file-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3513 "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
|
3514 "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
|
3515 (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
|
3516 (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
|
3517 (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
|
3518 (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
|
3519 (file-exists-p newname) |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
3520 (not (numberp ok-if-already-exists)) |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
3521 (y-or-n-p |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
3522 (format |
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
3523 "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
|
3524 newname))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3525 (tramp-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3526 v2 'file-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3527 "add-name-to-file: file %s already exists" newname)) |
107170
1f564d6c5e1d
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
Michael Albinus <michael.albinus@gmx.de>
parents:
107151
diff
changeset
|
3528 (tramp-flush-file-property v2 (file-name-directory v2-localname)) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3529 (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
|
3530 (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
|
3531 v1 |
49995
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
3532 (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
|
3533 (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
|
3534 "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
|
3535 (buffer-name)))))) |
45861 | 3536 |
3537 (defun tramp-handle-copy-file | |
108064
589643be353e
* net/tramp.el (tramp-handle-copy-file): Add new optional
Michael Albinus <michael.albinus@gmx.de>
parents:
108059
diff
changeset
|
3538 (filename newname &optional ok-if-already-exists keep-date |
589643be353e
* net/tramp.el (tramp-handle-copy-file): Add new optional
Michael Albinus <michael.albinus@gmx.de>
parents:
108059
diff
changeset
|
3539 preserve-uid-gid preserve-selinux-context) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3540 "Like `copy-file' for Tramp files." |
45861 | 3541 (setq filename (expand-file-name filename)) |
3542 (setq newname (expand-file-name newname)) | |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
3543 (cond |
85694
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
3544 ;; 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
|
3545 ((or (tramp-tramp-file-p filename) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
3546 (tramp-tramp-file-p newname)) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
3547 (tramp-do-copy-or-rename-file |
108077
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3548 'copy filename newname ok-if-already-exists keep-date |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3549 preserve-uid-gid preserve-selinux-context)) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
3550 ;; Compat section. |
108077
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3551 (preserve-selinux-context |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3552 (tramp-run-real-handler |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3553 'copy-file |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3554 (list filename newname ok-if-already-exists keep-date |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3555 preserve-uid-gid preserve-selinux-context))) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
3556 (preserve-uid-gid |
45861 | 3557 (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
|
3558 'copy-file |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
3559 (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
|
3560 (t |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
3561 (tramp-run-real-handler |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
3562 'copy-file (list filename newname ok-if-already-exists keep-date))))) |
45861 | 3563 |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3564 (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
|
3565 "Like `copy-directory' for Tramp files." |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3566 (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
|
3567 (t2 (tramp-tramp-file-p newname))) |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3568 (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
|
3569 (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
|
3570 ;; 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
|
3571 ;; the same method. |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3572 (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
|
3573 (string-equal |
535ef0fe1689
* net/tramp.el (tramp-handle-copy-directory): Don't use
Michael Albinus <michael.albinus@gmx.de>
parents:
105767
diff
changeset
|
3574 (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
|
3575 (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
|
3576 ;; scp or rsync DTRT. |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3577 (progn |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3578 (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
|
3579 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
|
3580 (if (and (file-directory-p newname) |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3581 (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
|
3582 (file-name-nondirectory newname)))) |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3583 (setq newname |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3584 (expand-file-name |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3585 (file-name-nondirectory dirname) newname))) |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3586 (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
|
3587 (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
|
3588 (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
|
3589 'copy dirname newname keep-date)) |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3590 ;; We must do it file-wise. |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3591 (tramp-run-real-handler |
107170
1f564d6c5e1d
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
Michael Albinus <michael.albinus@gmx.de>
parents:
107151
diff
changeset
|
3592 'copy-directory (list dirname newname keep-date parents))) |
1f564d6c5e1d
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
Michael Albinus <michael.albinus@gmx.de>
parents:
107151
diff
changeset
|
3593 |
1f564d6c5e1d
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
Michael Albinus <michael.albinus@gmx.de>
parents:
107151
diff
changeset
|
3594 ;; When newname did exist, we have wrong cached values. |
1f564d6c5e1d
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
Michael Albinus <michael.albinus@gmx.de>
parents:
107151
diff
changeset
|
3595 (when t2 |
1f564d6c5e1d
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
Michael Albinus <michael.albinus@gmx.de>
parents:
107151
diff
changeset
|
3596 (with-parsed-tramp-file-name newname nil |
1f564d6c5e1d
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
Michael Albinus <michael.albinus@gmx.de>
parents:
107151
diff
changeset
|
3597 (tramp-flush-file-property v (file-name-directory localname)) |
1f564d6c5e1d
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
Michael Albinus <michael.albinus@gmx.de>
parents:
107151
diff
changeset
|
3598 (tramp-flush-file-property v localname)))))) |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3599 |
45861 | 3600 (defun tramp-handle-rename-file |
3601 (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
|
3602 "Like `rename-file' for Tramp files." |
45861 | 3603 ;; 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
|
3604 ;; Otherwise, use Tramp from local system. |
45861 | 3605 (setq filename (expand-file-name filename)) |
3606 (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
|
3607 ;; At least one file a Tramp file? |
45861 | 3608 (if (or (tramp-tramp-file-p filename) |
3609 (tramp-tramp-file-p newname)) | |
59582
92796330257a
Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents:
59031
diff
changeset
|
3610 (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
|
3611 'rename filename newname ok-if-already-exists t t) |
45861 | 3612 (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
|
3613 'rename-file (list filename newname ok-if-already-exists)))) |
45861 | 3614 |
3615 (defun tramp-do-copy-or-rename-file | |
108077
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3616 (op filename newname &optional ok-if-already-exists keep-date |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3617 preserve-uid-gid preserve-selinux-context) |
45861 | 3618 "Copy or rename a remote file. |
3619 OP must be `copy' or `rename' and indicates the operation to perform. | |
3620 FILENAME specifies the file to copy or rename, NEWNAME is the name of | |
3621 the new file (for copy) or the new name of the file (for rename). | |
3622 OK-IF-ALREADY-EXISTS means don't barf if NEWNAME exists already. | |
3623 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
|
3624 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
|
3625 the uid and gid if both files are on the same host. |
108077
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3626 PRESERVE-SELINUX-CONTEXT activates selinux commands. |
45861 | 3627 |
3628 This function is invoked by `tramp-handle-copy-file' and | |
3629 `tramp-handle-rename-file'. It is an error if OP is neither of `copy' | |
3630 and `rename'. FILENAME and NEWNAME must be absolute file names." | |
3631 (unless (memq op '(copy rename)) | |
3632 (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
|
3633 (let ((t1 (tramp-tramp-file-p filename)) |
107822
02b5fe4a01fe
* net/tramp.el (tramp-do-copy-or-rename-file): Add progress reporter.
Michael Albinus <albinus@detlef>
parents:
107820
diff
changeset
|
3634 (t2 (tramp-tramp-file-p newname)) |
108077
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3635 (context (and preserve-selinux-context |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3636 (apply 'file-selinux-context (list filename)))) |
107822
02b5fe4a01fe
* net/tramp.el (tramp-do-copy-or-rename-file): Add progress reporter.
Michael Albinus <albinus@detlef>
parents:
107820
diff
changeset
|
3637 pr tm) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3638 |
93430
45fdb0c49e2f
* net/tramp.el (tramp-do-copy-or-rename-file): Fix check for
Michael Albinus <michael.albinus@gmx.de>
parents:
93127
diff
changeset
|
3639 (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
|
3640 (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
|
3641 (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
|
3642 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
|
3643 |
104097
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
3644 (with-parsed-tramp-file-name (if t1 filename newname) nil |
108066
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3645 (with-progress-reporter |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3646 v 0 (format "Transferring %s to %s" filename newname) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3647 |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3648 (cond |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3649 ;; Both are Tramp files. |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3650 ((and t1 t2) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3651 (with-parsed-tramp-file-name filename v1 |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3652 (with-parsed-tramp-file-name newname v2 |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3653 (cond |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3654 ;; Shortcut: if method, host, user are the same for both |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3655 ;; files, we invoke `cp' or `mv' on the remote host |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3656 ;; directly. |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3657 ((tramp-equal-remote filename newname) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3658 (tramp-do-copy-or-rename-file-directly |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3659 op filename newname |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3660 ok-if-already-exists keep-date preserve-uid-gid)) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3661 |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3662 ;; Try out-of-band operation. |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3663 ((tramp-method-out-of-band-p |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3664 v1 (nth 7 (file-attributes filename))) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3665 (tramp-do-copy-or-rename-file-out-of-band |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3666 op filename newname keep-date)) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3667 |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3668 ;; No shortcut was possible. So we copy the |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3669 ;; file first. If the operation was `rename', we go |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3670 ;; back and delete the original file (if the copy was |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3671 ;; successful). The approach is simple-minded: we |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3672 ;; create a new buffer, insert the contents of the |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3673 ;; source file into it, then write out the buffer to |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3674 ;; the target file. The advantage is that it doesn't |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3675 ;; matter which filename handlers are used for the |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3676 ;; source and target file. |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3677 (t |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3678 (tramp-do-copy-or-rename-file-via-buffer |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3679 op filename newname keep-date)))))) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3680 |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3681 ;; One file is a Tramp file, the other one is local. |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3682 ((or t1 t2) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3683 (cond |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3684 ;; Fast track on local machine. |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3685 ((tramp-local-host-p v) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3686 (tramp-do-copy-or-rename-file-directly |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3687 op filename newname |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3688 ok-if-already-exists keep-date preserve-uid-gid)) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3689 |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3690 ;; If the Tramp file has an out-of-band method, the corresponding |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3691 ;; copy-program can be invoked. |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3692 ((tramp-method-out-of-band-p v (nth 7 (file-attributes filename))) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3693 (tramp-do-copy-or-rename-file-out-of-band |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3694 op filename newname keep-date)) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3695 |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3696 ;; Use the inline method via a Tramp buffer. |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3697 (t (tramp-do-copy-or-rename-file-via-buffer |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3698 op filename newname keep-date)))) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3699 |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3700 (t |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3701 ;; One of them must be a Tramp file. |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3702 (error "Tramp implementation says this cannot happen"))) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3703 |
108077
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3704 ;; Handle `preserve-selinux-context'. |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3705 (when context (apply 'set-file-selinux-context (list newname context))) |
93125d6fab29
Implement SELINUX backends.
Michael Albinus <michael.albinus@gmx.de>
parents:
108066
diff
changeset
|
3706 |
108066
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3707 ;; In case of `rename', we must flush the cache of the source file. |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3708 (when (and t1 (eq op 'rename)) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3709 (with-parsed-tramp-file-name filename v1 |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3710 (tramp-flush-file-property v1 (file-name-directory localname)) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3711 (tramp-flush-file-property v1 localname))) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3712 |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3713 ;; When newname did exist, we have wrong cached values. |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3714 (when t2 |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3715 (with-parsed-tramp-file-name newname v2 |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3716 (tramp-flush-file-property v2 (file-name-directory localname)) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
3717 (tramp-flush-file-property v2 localname))))))) |
49995
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
3718 |
55420
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
3719 (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
|
3720 "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
|
3721 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
|
3722 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
|
3723 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
|
3724 (with-temp-buffer |
afa7a7913261
* tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents:
91689
diff
changeset
|
3725 ;; 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
|
3726 ;; converted. |
afa7a7913261
* tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents:
91689
diff
changeset
|
3727 (set-buffer-multibyte nil) |
afa7a7913261
* tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents:
91689
diff
changeset
|
3728 (let ((coding-system-for-read 'binary) |
afa7a7913261
* tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents:
91689
diff
changeset
|
3729 (jka-compr-inhibit t)) |
afa7a7913261
* tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents:
91689
diff
changeset
|
3730 (insert-file-contents-literally filename)) |
afa7a7913261
* tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents:
91689
diff
changeset
|
3731 ;; 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
|
3732 ;; `jka-compr-inhibit' to t. |
afa7a7913261
* tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents:
91689
diff
changeset
|
3733 (let ((coding-system-for-write 'binary) |
afa7a7913261
* tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents:
91689
diff
changeset
|
3734 (jka-compr-inhibit t)) |
afa7a7913261
* tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents:
91689
diff
changeset
|
3735 (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
|
3736 ;; KEEP-DATE handling. |
afa7a7913261
* tramp.el (tramp-root-regexp): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents:
91689
diff
changeset
|
3737 (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
|
3738 ;; 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
|
3739 (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
|
3740 ;; If the operation was `rename', delete the original file. |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
3741 (unless (eq op 'copy) (tramp-compat-delete-file filename 'force))) |
45861 | 3742 |
3743 (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
|
3744 (op filename newname ok-if-already-exists keep-date preserve-uid-gid) |
45861 | 3745 "Invokes `cp' or `mv' on the remote system. |
3746 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
|
3747 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
|
3748 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
|
3749 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
|
3750 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
|
3751 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
|
3752 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
|
3753 (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
|
3754 (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
|
3755 (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
|
3756 (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
|
3757 (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
|
3758 (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
|
3759 ((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
|
3760 ((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
|
3761 (t (tramp-error |
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
3762 v 'file-error |
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
3763 "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
|
3764 op)))) |
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
3765 (localname1 |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
3766 (if t1 |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
3767 (tramp-file-name-handler 'file-remote-p filename 'localname) |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
3768 filename)) |
84406
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
3769 (localname2 |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
3770 (if t2 |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
3771 (tramp-file-name-handler 'file-remote-p newname 'localname) |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
3772 newname)) |
105767
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3773 (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
|
3774 cmd-result) |
84406
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
3775 |
82942
5cf3cd03cb50
* net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents:
82808
diff
changeset
|
3776 (cond |
84406
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
3777 ;; 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
|
3778 ((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
|
3779 (setq cmd-result |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3780 (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
|
3781 v |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
3782 (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
|
3783 (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
|
3784 (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
|
3785 (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
|
3786 (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
|
3787 (unless |
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
3788 (or |
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
3789 (and keep-date |
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
3790 ;; 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
|
3791 (re-search-forward |
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
3792 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
|
3793 (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
|
3794 (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
|
3795 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
|
3796 "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
|
3797 (buffer-name))))) |
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
3798 |
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
3799 ;; 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
|
3800 ((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
|
3801 (cond |
84406
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
3802 ;; 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
|
3803 ((let (file-name-handler-alist) |
ed7a07d27b12
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
94395
diff
changeset
|
3804 (and (file-readable-p localname1) |
ed7a07d27b12
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
94395
diff
changeset
|
3805 (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
|
3806 (or (file-directory-p localname2) |
ed7a07d27b12
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
94395
diff
changeset
|
3807 (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
|
3808 (if (eq op 'copy) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
3809 (tramp-compat-copy-file |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
3810 localname1 localname2 ok-if-already-exists |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
3811 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
|
3812 (tramp-run-real-handler |
ed7a07d27b12
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
94395
diff
changeset
|
3813 '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
|
3814 |
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
3815 ;; 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
|
3816 ((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
|
3817 (file-writable-p |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
3818 (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
|
3819 (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
|
3820 (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
|
3821 (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
|
3822 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
|
3823 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
|
3824 ;; 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
|
3825 (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
|
3826 (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
|
3827 (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
|
3828 (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
|
3829 |
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
3830 ;; 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
|
3831 (t |
100933
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3832 ;; Create the temporary file. |
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3833 (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
|
3834 (unwind-protect |
100933
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3835 (progn |
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3836 (cond |
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3837 (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
|
3838 (or |
01d7b6369496
* net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents:
103328
diff
changeset
|
3839 (zerop |
01d7b6369496
* net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents:
103328
diff
changeset
|
3840 (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
|
3841 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
|
3842 "%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
|
3843 (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
|
3844 (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
|
3845 (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
|
3846 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
|
3847 "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
|
3848 (tramp-get-buffer v))) |
100933
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3849 ;; 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
|
3850 ;; 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
|
3851 ;; 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
|
3852 (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
|
3853 (concat prefix tmpfile) (tramp-octal-to-decimal "0777")) |
100933
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3854 (tramp-set-file-uid-gid |
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3855 (concat prefix tmpfile) |
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3856 (tramp-get-local-uid 'integer) |
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3857 (tramp-get-local-gid 'integer))) |
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3858 (t2 |
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3859 (if (eq op 'copy) |
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3860 (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
|
3861 localname1 tmpfile t |
100933
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3862 keep-date preserve-uid-gid) |
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3863 (tramp-run-real-handler |
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3864 'rename-file |
102940
c9dbbc9ce416
* tramp.el (tramp-do-copy-or-rename-file-directly): Overwrite
Michael Albinus <michael.albinus@gmx.de>
parents:
102907
diff
changeset
|
3865 (list localname1 tmpfile t))) |
100933
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3866 ;; 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
|
3867 ;; 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
|
3868 ;; 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
|
3869 (set-file-modes tmpfile (tramp-octal-to-decimal "0777")) |
100933
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3870 (tramp-set-file-uid-gid |
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3871 tmpfile |
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3872 (tramp-get-remote-uid v 'integer) |
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3873 (tramp-get-remote-gid v 'integer)))) |
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3874 |
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3875 ;; Move the temporary file to its destination. |
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3876 (cond |
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3877 (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
|
3878 (or |
01d7b6369496
* net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents:
103328
diff
changeset
|
3879 (zerop |
01d7b6369496
* net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents:
103328
diff
changeset
|
3880 (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
|
3881 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
|
3882 "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
|
3883 (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
|
3884 (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
|
3885 (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
|
3886 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
|
3887 "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
|
3888 (tramp-get-buffer v)))) |
100933
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3889 (t1 |
100922
2b84620022aa
* net/tramp.el (tramp-handle-load)
Michael Albinus <michael.albinus@gmx.de>
parents:
100903
diff
changeset
|
3890 (tramp-run-real-handler |
2b84620022aa
* net/tramp.el (tramp-handle-load)
Michael Albinus <michael.albinus@gmx.de>
parents:
100903
diff
changeset
|
3891 'rename-file |
100933
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3892 (list tmpfile localname2 ok-if-already-exists))))) |
cdbc9da35459
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
100930
diff
changeset
|
3893 |
103333
01d7b6369496
* net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents:
103328
diff
changeset
|
3894 ;; 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
|
3895 (condition-case nil |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
3896 (tramp-compat-delete-file tmpfile 'force) |
103333
01d7b6369496
* net/tramp.el (tramp-do-copy-or-rename-file-directly): Make direct
Michael Albinus <michael.albinus@gmx.de>
parents:
103328
diff
changeset
|
3897 (error))))))))) |
82942
5cf3cd03cb50
* net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents:
82808
diff
changeset
|
3898 |
5cf3cd03cb50
* net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents:
82808
diff
changeset
|
3899 ;; 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
|
3900 (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
|
3901 (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
|
3902 (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
|
3903 (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
|
3904 (error))))) |
5cf3cd03cb50
* net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents:
82808
diff
changeset
|
3905 |
54198
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
3906 (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
|
3907 "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
|
3908 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
|
3909 (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
|
3910 (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
|
3911 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
|
3912 source target) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3913 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
3914 (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
|
3915 (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
|
3916 |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
3917 ;; 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
|
3918 ;; methods for filename and newname are the same. |
107320
d2bfe26756ed
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix an
Michael Albinus <michael.albinus@gmx.de>
parents:
107256
diff
changeset
|
3919 (let* ((dir-flag (file-directory-p filename)) |
d2bfe26756ed
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix an
Michael Albinus <michael.albinus@gmx.de>
parents:
107256
diff
changeset
|
3920 (tmpfile (tramp-compat-make-temp-file localname dir-flag))) |
d2bfe26756ed
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix an
Michael Albinus <michael.albinus@gmx.de>
parents:
107256
diff
changeset
|
3921 (if dir-flag |
d2bfe26756ed
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix an
Michael Albinus <michael.albinus@gmx.de>
parents:
107256
diff
changeset
|
3922 (setq tmpfile |
d2bfe26756ed
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix an
Michael Albinus <michael.albinus@gmx.de>
parents:
107256
diff
changeset
|
3923 (expand-file-name |
d2bfe26756ed
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix an
Michael Albinus <michael.albinus@gmx.de>
parents:
107256
diff
changeset
|
3924 (file-name-nondirectory newname) tmpfile))) |
104097
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
3925 (unwind-protect |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
3926 (progn |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
3927 (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
|
3928 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
|
3929 (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
|
3930 '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
|
3931 ;; Save exit. |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
3932 (condition-case nil |
107320
d2bfe26756ed
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix an
Michael Albinus <michael.albinus@gmx.de>
parents:
107256
diff
changeset
|
3933 (if dir-flag |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
3934 (tramp-compat-delete-directory |
107320
d2bfe26756ed
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix an
Michael Albinus <michael.albinus@gmx.de>
parents:
107256
diff
changeset
|
3935 (expand-file-name ".." tmpfile) 'recursive) |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
3936 (tramp-compat-delete-file tmpfile 'force)) |
104097
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
3937 (error)))) |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
3938 |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
3939 ;; 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
|
3940 (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
|
3941 (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
|
3942 |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
3943 ;; 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
|
3944 (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
|
3945 target (funcall |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3946 (if (and (file-directory-p filename) |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3947 (string-equal |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3948 (file-name-nondirectory filename) |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3949 (file-name-nondirectory newname))) |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3950 'file-name-directory |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3951 'identity) |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
3952 (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
|
3953 |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
3954 ;; 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
|
3955 ;; 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
|
3956 (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
|
3957 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
|
3958 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
|
3959 |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
3960 ;; Compose copy command. |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
3961 (setq spec (format-spec-make |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
3962 ?h host ?u user ?p port |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
3963 ?t (tramp-get-connection-property |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
3964 (tramp-get-connection-process v) "temp-file" "") |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
3965 ?k (if keep-date " " "")) |
104097
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
3966 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
|
3967 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
|
3968 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
|
3969 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
|
3970 copy-args |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
3971 (delq |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
3972 nil |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
3973 (mapcar |
104673
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
3974 (lambda (x) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
3975 (setq |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
3976 x |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
3977 ;; " " 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
|
3978 (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
|
3979 (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
|
3980 (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
|
3981 copy-env |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
3982 (delq |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
3983 nil |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
3984 (mapcar |
104673
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
3985 (lambda (x) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
3986 (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
|
3987 (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
|
3988 (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
|
3989 |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
3990 ;; 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
|
3991 (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
|
3992 (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
|
3993 (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
|
3994 (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
|
3995 (tramp-error |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
3996 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
|
3997 |
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
|
3998 ;; 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
|
3999 ;; 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
|
4000 (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
|
4001 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
|
4002 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
|
4003 |
104097
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
4004 (unwind-protect |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
4005 (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
|
4006 ;; 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
|
4007 (let ((default-directory |
104642
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
4008 (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
|
4009 (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
|
4010 ;; 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
|
4011 (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
|
4012 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
|
4013 (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
|
4014 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
|
4015 (while copy-env |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
4016 (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
|
4017 (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
|
4018 |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
4019 ;; 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
|
4020 ;; 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
|
4021 ;; 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
|
4022 ;; 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
|
4023 ;; 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
|
4024 (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
|
4025 (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
|
4026 (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
|
4027 (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
|
4028 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
|
4029 (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
|
4030 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
|
4031 copy-program |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
4032 (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
|
4033 (tramp-message |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
4034 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
|
4035 (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
|
4036 (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
|
4037 |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
4038 ;; 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
|
4039 (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
|
4040 (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
|
4041 |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
4042 ;; 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
|
4043 (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
|
4044 (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
|
4045 |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
4046 ;; 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
|
4047 (unless (and keep-date copy-keep-date) |
107209
4a0ca858272e
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Protect
Michael Albinus <michael.albinus@gmx.de>
parents:
107190
diff
changeset
|
4048 (ignore-errors |
4a0ca858272e
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Protect
Michael Albinus <michael.albinus@gmx.de>
parents:
107190
diff
changeset
|
4049 (set-file-modes newname (tramp-default-file-modes filename))))) |
104097
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
4050 |
0e24538056bf
* net/tramp.el (tramp-do-copy-or-rename-file): Add messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
103934
diff
changeset
|
4051 ;; 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
|
4052 (unless (eq op 'copy) |
107170
1f564d6c5e1d
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
Michael Albinus <michael.albinus@gmx.de>
parents:
107151
diff
changeset
|
4053 (if (file-regular-p filename) |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
4054 (tramp-compat-delete-file filename 'force) |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
4055 (tramp-compat-delete-directory filename 'recursive)))))) |
49995
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
4056 |
45861 | 4057 (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
|
4058 "Like `make-directory' for Tramp files." |
46752 | 4059 (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
|
4060 (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
|
4061 (tramp-flush-directory-property v (file-name-directory localname)) |
46790 | 4062 (save-excursion |
4063 (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
|
4064 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
|
4065 (format "%s %s" |
46790 | 4066 (if parents "mkdir -p" "mkdir") |
49995
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
4067 (tramp-shell-quote-argument localname)) |
46790 | 4068 "Couldn't make directory %s" dir)))) |
45861 | 4069 |
105351
4eaec3ddca1c
* net/tramp.el (tramp-handle-make-directory): Flush upper
Michael Albinus <michael.albinus@gmx.de>
parents:
105248
diff
changeset
|
4070 (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
|
4071 "Like `delete-directory' for Tramp files." |
46752 | 4072 (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
|
4073 (with-parsed-tramp-file-name directory nil |
107170
1f564d6c5e1d
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
Michael Albinus <michael.albinus@gmx.de>
parents:
107151
diff
changeset
|
4074 (tramp-flush-file-property v (file-name-directory localname)) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4075 (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
|
4076 (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
|
4077 v |
105351
4eaec3ddca1c
* net/tramp.el (tramp-handle-make-directory): Flush upper
Michael Albinus <michael.albinus@gmx.de>
parents:
105248
diff
changeset
|
4078 (format |
4eaec3ddca1c
* net/tramp.el (tramp-handle-make-directory): Flush upper
Michael Albinus <michael.albinus@gmx.de>
parents:
105248
diff
changeset
|
4079 "%s %s" |
4eaec3ddca1c
* net/tramp.el (tramp-handle-make-directory): Flush upper
Michael Albinus <michael.albinus@gmx.de>
parents:
105248
diff
changeset
|
4080 (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
|
4081 (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
|
4082 (tramp-error v 'file-error "Couldn't delete %s" directory)))) |
45861 | 4083 |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
4084 (defun tramp-handle-delete-file (filename &optional force) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4085 "Like `delete-file' for Tramp files." |
46752 | 4086 (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
|
4087 (with-parsed-tramp-file-name filename nil |
107170
1f564d6c5e1d
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
Michael Albinus <michael.albinus@gmx.de>
parents:
107151
diff
changeset
|
4088 (tramp-flush-file-property v (file-name-directory localname)) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4089 (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
|
4090 (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
|
4091 v |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4092 (format "rm -f %s" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4093 (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
|
4094 (tramp-error v 'file-error "Couldn't delete %s" filename)))) |
45861 | 4095 |
4096 ;; Dired. | |
4097 | |
4098 ;; 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
|
4099 ;; we try and delete two directories under Tramp :/ |
45861 | 4100 (defun tramp-handle-dired-recursive-delete-directory (filename) |
4101 "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
|
4102 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
|
4103 (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
|
4104 ;; 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
|
4105 ;; 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
|
4106 (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
|
4107 (tramp-error v 'file-error "No such directory: %s" filename)) |
45861 | 4108 ;; 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
|
4109 (tramp-send-command |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4110 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
|
4111 (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
|
4112 ;; 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
|
4113 nil t) |
45861 | 4114 ;; Wait for the remote system to return to us... |
4115 ;; 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
|
4116 (tramp-wait-for-output (tramp-get-connection-process v) 120) |
45861 | 4117 ;; Make sure that it worked... |
107170
1f564d6c5e1d
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
Michael Albinus <michael.albinus@gmx.de>
parents:
107151
diff
changeset
|
4118 (tramp-flush-file-property v (file-name-directory localname)) |
105351
4eaec3ddca1c
* net/tramp.el (tramp-handle-make-directory): Flush upper
Michael Albinus <michael.albinus@gmx.de>
parents:
105248
diff
changeset
|
4119 (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
|
4120 (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
|
4121 (tramp-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4122 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
|
4123 |
54198
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
4124 (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
|
4125 "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
|
4126 ;; 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
|
4127 ;; 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
|
4128 (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
|
4129 (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
|
4130 (save-excursion |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
4131 (let ((suffixes |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
4132 (if (not (featurep 'xemacs)) |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
4133 ;; Emacs case |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
4134 (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
|
4135 ;; 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
|
4136 ;; 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
|
4137 (mapcar |
104673
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
4138 (lambda (x) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
4139 (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
|
4140 nil |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
4141 (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
|
4142 (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
|
4143 suffix) |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
4144 ;; 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
|
4145 (while suffixes |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
4146 (let (case-fold-search) |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
4147 (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
|
4148 (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
|
4149 (setq suffixes (cdr suffixes)))) |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
4150 |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
4151 (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
|
4152 nil) |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
4153 ((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
|
4154 ;; We found an uncompression rule. |
108066
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4155 (with-progress-reporter v 0 (format "Uncompressing %s..." file) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4156 (when (zerop |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4157 (tramp-send-command-and-check |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4158 v (concat (nth 2 suffix) " " |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4159 (tramp-shell-quote-argument localname)))) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4160 ;; `dired-remove-file' is not defined in XEmacs |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4161 (funcall (symbol-function 'dired-remove-file) file) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4162 (string-match (car suffix) file) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4163 (concat (substring file 0 (match-beginning 0)))))) |
54198
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
4164 (t |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
4165 ;; 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
|
4166 ;; Try gzip. |
108066
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4167 (with-progress-reporter v 0 (format "Compressing %s..." file) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4168 (when (zerop |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4169 (tramp-send-command-and-check |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4170 v (concat "gzip -f " |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4171 (tramp-shell-quote-argument localname)))) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4172 ;; `dired-remove-file' is not defined in XEmacs |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4173 (funcall (symbol-function 'dired-remove-file) file) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4174 (cond ((file-exists-p (concat file ".gz")) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4175 (concat file ".gz")) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4176 ((file-exists-p (concat file ".z")) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4177 (concat file ".z")) |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
4178 (t nil)))))))))) |
45861 | 4179 |
107085
d7831d04952b
* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents:
107044
diff
changeset
|
4180 (defun tramp-handle-dired-uncache (dir &optional dir-p) |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4181 "Like `dired-uncache' for Tramp files." |
107085
d7831d04952b
* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents:
107044
diff
changeset
|
4182 ;; DIR-P is valid for XEmacs only. |
d7831d04952b
* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents:
107044
diff
changeset
|
4183 (with-parsed-tramp-file-name |
d7831d04952b
* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents:
107044
diff
changeset
|
4184 (if (or dir-p (file-directory-p dir)) dir (file-name-directory dir)) nil |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4185 (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
|
4186 |
45861 | 4187 ;; Pacify byte-compiler. The function is needed on XEmacs only. I'm |
4188 ;; not sure at all that this is the right way to do it, but let's hope | |
4189 ;; it works for now, and wait for a guru to point out the Right Way to | |
4190 ;; achieve this. | |
4191 ;;(eval-when-compile | |
4192 ;; (unless (fboundp 'dired-insert-set-properties) | |
4193 ;; (fset 'dired-insert-set-properties 'ignore))) | |
4194 ;; Gerd suggests this: | |
4195 (eval-when-compile (require 'dired)) | |
4196 ;; Note that dired is required at run-time, too, when it is needed. | |
4197 ;; It is only needed on XEmacs for the function | |
4198 ;; `dired-insert-set-properties'. | |
4199 | |
4200 (defun tramp-handle-insert-directory | |
4201 (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
|
4202 "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
|
4203 (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
|
4204 (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
|
4205 (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
|
4206 (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
|
4207 (tramp-run-real-handler |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4208 'insert-directory (list filename switches wildcard full-directory-p)) |
107040
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4209 (when (stringp switches) |
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4210 (setq switches (split-string switches))) |
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4211 (when (and (member "--dired" switches) |
104216
bf65b05e8cf1
* net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
104143
diff
changeset
|
4212 (not (tramp-get-ls-command-with-dired v))) |
107040
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4213 (setq switches (delete "--dired" switches))) |
58540
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
4214 (when wildcard |
94401
ed7a07d27b12
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
94395
diff
changeset
|
4215 (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
|
4216 'file-name-nondirectory (list localname))) |
ed7a07d27b12
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
94395
diff
changeset
|
4217 (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
|
4218 'file-name-directory (list localname)))) |
58540
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
4219 (unless full-directory-p |
107040
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4220 (setq switches (add-to-list 'switches "-d" 'append))) |
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4221 (setq switches (mapconcat 'tramp-shell-quote-argument switches " ")) |
58540
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
4222 (when wildcard |
107040
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4223 (setq switches (concat switches " " wildcard))) |
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4224 (tramp-message |
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4225 v 4 "Inserting directory `ls %s %s', wildcard %s, fulldir %s" |
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4226 switches filename (if wildcard "yes" "no") |
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4227 (if full-directory-p "yes" "no")) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4228 ;; 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
|
4229 ;; 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
|
4230 (if full-directory-p |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4231 (tramp-send-command |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4232 v |
106508
8c836ea59444
* net/tramp.el (tramp-handle-insert-directory): Suppress error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
106470
diff
changeset
|
4233 (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
|
4234 (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
|
4235 switches |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4236 (if wildcard |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4237 localname |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4238 (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
|
4239 (tramp-barf-unless-okay |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4240 v |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4241 (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
|
4242 (tramp-run-real-handler |
ed7a07d27b12
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
94395
diff
changeset
|
4243 '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
|
4244 "Couldn't `cd %s'" |
94401
ed7a07d27b12
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
94395
diff
changeset
|
4245 (tramp-shell-quote-argument |
ed7a07d27b12
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
94395
diff
changeset
|
4246 (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
|
4247 (tramp-send-command |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4248 v |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4249 (format "%s %s %s" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4250 (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
|
4251 switches |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4252 (if (or wildcard |
94401
ed7a07d27b12
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
94395
diff
changeset
|
4253 (zerop (length |
ed7a07d27b12
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
94395
diff
changeset
|
4254 (tramp-run-real-handler |
ed7a07d27b12
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
94395
diff
changeset
|
4255 '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
|
4256 "" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4257 (tramp-shell-quote-argument |
94401
ed7a07d27b12
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
94395
diff
changeset
|
4258 (tramp-run-real-handler |
ed7a07d27b12
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
94395
diff
changeset
|
4259 '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
|
4260 (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
|
4261 ;; 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
|
4262 ;; 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
|
4263 ;; `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
|
4264 (insert |
bf65b05e8cf1
* net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
104143
diff
changeset
|
4265 (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
|
4266 (buffer-string))) |
bf65b05e8cf1
* net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
104143
diff
changeset
|
4267 |
bf65b05e8cf1
* net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
104143
diff
changeset
|
4268 ;; 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
|
4269 (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
|
4270 (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
|
4271 (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
|
4272 (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
|
4273 (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
|
4274 (linebeg (point))) |
bf65b05e8cf1
* net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
104143
diff
changeset
|
4275 ;; 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
|
4276 (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
|
4277 (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
|
4278 (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
|
4279 (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
|
4280 (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
|
4281 (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
|
4282 (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
|
4283 ;; 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
|
4284 (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
|
4285 ;; Remove trailing lines. |
8c836ea59444
* net/tramp.el (tramp-handle-insert-directory): Suppress error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
106470
diff
changeset
|
4286 (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
|
4287 (while (looking-at "//") |
8c836ea59444
* net/tramp.el (tramp-handle-insert-directory): Suppress error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
106470
diff
changeset
|
4288 (forward-line 1) |
8c836ea59444
* net/tramp.el (tramp-handle-insert-directory): Suppress error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
106470
diff
changeset
|
4289 (delete-region (match-beginning 0) (point))) |
107040
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4290 |
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4291 ;; The inserted file could be from somewhere else. |
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4292 (when (and (not wildcard) (not full-directory-p)) |
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4293 (goto-char (point-max)) |
107044
28bc861d56c5
* net/tramp.el (tramp-handle-insert-directory): Handle also
Michael Albinus <michael.albinus@gmx.de>
parents:
107040
diff
changeset
|
4294 (when (file-symlink-p filename) |
28bc861d56c5
* net/tramp.el (tramp-handle-insert-directory): Handle also
Michael Albinus <michael.albinus@gmx.de>
parents:
107040
diff
changeset
|
4295 (goto-char (search-backward "->" beg 'noerror))) |
107040
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4296 (search-backward |
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4297 (if (zerop (length (file-name-nondirectory filename))) |
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4298 "." |
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4299 (file-name-nondirectory filename)) |
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4300 beg 'noerror) |
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4301 (replace-match (file-relative-name filename) t)) |
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
4302 |
106508
8c836ea59444
* net/tramp.el (tramp-handle-insert-directory): Suppress error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
106470
diff
changeset
|
4303 (goto-char (point-max)))))) |
45861 | 4304 |
4305 (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
|
4306 "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
|
4307 ;; 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
|
4308 ;; 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
|
4309 (expand-file-name "~/")) |
45861 | 4310 |
4311 ;; Canonicalization of file names. | |
4312 | |
4313 (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
|
4314 "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
|
4315 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
|
4316 the result will be a local, non-Tramp, filename." |
45861 | 4317 ;; If DIR is not given, use DEFAULT-DIRECTORY or "/". |
4318 (setq dir (or dir default-directory "/")) | |
4319 ;; Unless NAME is absolute, concat DIR and NAME. | |
4320 (unless (file-name-absolute-p name) | |
4321 (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
|
4322 ;; If NAME is not a Tramp file, run the real handler. |
108033 | 4323 (if (not (tramp-connectable-p name)) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4324 (tramp-run-real-handler 'expand-file-name (list name nil)) |
45861 | 4325 ;; Dissect NAME. |
46009
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
4326 (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
|
4327 (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
|
4328 (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
|
4329 ;; 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
|
4330 ;; 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
|
4331 ;; 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
|
4332 ;; 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
|
4333 (when (string-match "\\`\\(~[^/]*\\)\\(.*\\)\\'" localname) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4334 (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
|
4335 (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
|
4336 ;; 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
|
4337 ;; 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
|
4338 ;; 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
|
4339 ;; 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
|
4340 ;; 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
|
4341 ;; 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
|
4342 (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
|
4343 (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
|
4344 (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
|
4345 (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
|
4346 (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
|
4347 (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
|
4348 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
|
4349 (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
|
4350 (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
|
4351 (buffer-substring |
075fc4ee6c41
* net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents:
106115
diff
changeset
|
4352 (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
|
4353 (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
|
4354 ;; 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
|
4355 ;; 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
|
4356 (while (string-match "//" localname) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4357 (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
|
4358 ;; 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
|
4359 ;; `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
|
4360 ;; `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
|
4361 ;; 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
|
4362 ;; 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
|
4363 ;; Cygwin mounts. |
93082
7e079018403b
* net/tramp.el (tramp-let-maybe): Removed.
Michael Albinus <michael.albinus@gmx.de>
parents:
93062
diff
changeset
|
4364 (let ((directory-sep-char ?/) |
7e079018403b
* net/tramp.el (tramp-let-maybe): Removed.
Michael Albinus <michael.albinus@gmx.de>
parents:
93062
diff
changeset
|
4365 (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
|
4366 (tramp-make-tramp-file-name |
7e079018403b
* net/tramp.el (tramp-let-maybe): Removed.
Michael Albinus <michael.albinus@gmx.de>
parents:
93062
diff
changeset
|
4367 method user host |
7e079018403b
* net/tramp.el (tramp-let-maybe): Removed.
Michael Albinus <michael.albinus@gmx.de>
parents:
93062
diff
changeset
|
4368 (tramp-drop-volume-letter |
94401
ed7a07d27b12
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
94395
diff
changeset
|
4369 (tramp-run-real-handler |
ed7a07d27b12
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
94395
diff
changeset
|
4370 '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
|
4371 |
94395
f020c9568544
* net/tramp.el (tramp-replace-environment-variables): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
94333
diff
changeset
|
4372 (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
|
4373 "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
|
4374 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
|
4375 (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
|
4376 (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
|
4377 ;; `$' 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
|
4378 (when (and idx |
33df72cf19f1
* net/tramp.el (tramp-replace-environment-variables): Do not fail
Michael Albinus <michael.albinus@gmx.de>
parents:
105549
diff
changeset
|
4379 (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
|
4380 (getenv (match-string 1 filename))) |
94436
0918f4a758d2
* net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents:
94401
diff
changeset
|
4381 (setq filename |
0918f4a758d2
* net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents:
94401
diff
changeset
|
4382 (replace-match |
0918f4a758d2
* net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents:
94401
diff
changeset
|
4383 (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
|
4384 t nil filename))) |
0918f4a758d2
* net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents:
94401
diff
changeset
|
4385 filename))) |
94395
f020c9568544
* net/tramp.el (tramp-replace-environment-variables): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
94333
diff
changeset
|
4386 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4387 (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
|
4388 "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
|
4389 \"//\" 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
|
4390 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
|
4391 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
|
4392 ;; 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
|
4393 (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
|
4394 (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
|
4395 (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
|
4396 ;; 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
|
4397 ;; "//" or "/~". |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4398 (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
|
4399 (or (string-match "//" localname) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4400 (string-match "/~" localname 1))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4401 (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
|
4402 (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
|
4403 (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
|
4404 (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
|
4405 (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
|
4406 (when localname |
ed7a07d27b12
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
94395
diff
changeset
|
4407 (tramp-run-real-handler |
ed7a07d27b12
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
94395
diff
changeset
|
4408 '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
|
4409 ;; 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
|
4410 (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
|
4411 (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
|
4412 (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
|
4413 (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
|
4414 ;; "/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
|
4415 (when (string-match "~$" filename) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4416 (setq filename (concat filename "/")))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4417 (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
|
4418 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4419 ;; 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
|
4420 ;; 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
|
4421 (when (fboundp 'minibuffer-electric-separator) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
4422 (mapc |
104673
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
4423 (lambda (x) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
4424 (eval |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
4425 `(defadvice ,x |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
4426 (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
|
4427 "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
|
4428 (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
|
4429 (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
|
4430 ;; 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
|
4431 ;; 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
|
4432 (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
|
4433 (string last-command-char)))) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
4434 (delete-region (point-min) (point)) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
4435 (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
|
4436 (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
|
4437 ad-do-it))) |
c3e434f0d02f
* net/tramp.el (tramp-advice-minibuffer-electric-separator)
Michael Albinus <michael.albinus@gmx.de>
parents:
105907
diff
changeset
|
4438 (eval |
c3e434f0d02f
* net/tramp.el (tramp-advice-minibuffer-electric-separator)
Michael Albinus <michael.albinus@gmx.de>
parents:
105907
diff
changeset
|
4439 `(add-hook |
c3e434f0d02f
* net/tramp.el (tramp-advice-minibuffer-electric-separator)
Michael Albinus <michael.albinus@gmx.de>
parents:
105907
diff
changeset
|
4440 'tramp-unload-hook |
c3e434f0d02f
* net/tramp.el (tramp-advice-minibuffer-electric-separator)
Michael Albinus <michael.albinus@gmx.de>
parents:
105907
diff
changeset
|
4441 (lambda () |
c3e434f0d02f
* net/tramp.el (tramp-advice-minibuffer-electric-separator)
Michael Albinus <michael.albinus@gmx.de>
parents:
105907
diff
changeset
|
4442 (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
|
4443 (ad-activate ',x))))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4444 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4445 '(minibuffer-electric-separator |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4446 minibuffer-electric-tilde))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4447 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4448 |
87648
7ae99e295dfd
* vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents:
87368
diff
changeset
|
4449 ;;; Remote commands: |
45861 | 4450 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4451 (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
|
4452 "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
|
4453 (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
|
4454 (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
|
4455 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4456 ;; 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
|
4457 ;; 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
|
4458 ;; connection has been setup. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4459 (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
|
4460 "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
|
4461 (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
|
4462 (unless (stringp program) |
cf961ce7712b
(tramp-handle-start-file-process): Move tramp-error call
Glenn Morris <rgm@gnu.org>
parents:
105462
diff
changeset
|
4463 (tramp-error |
cf961ce7712b
(tramp-handle-start-file-process): Move tramp-error call
Glenn Morris <rgm@gnu.org>
parents:
105462
diff
changeset
|
4464 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
|
4465 (unwind-protect |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
4466 (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
|
4467 (tramp-shell-quote-argument localname) |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
4468 (mapconcat 'tramp-shell-quote-argument |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
4469 (cons program args) " "))) |
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
4470 (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
|
4471 (i 0)) |
96941
940a290a5646
* net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents:
96392
diff
changeset
|
4472 (unless buffer |
97035
837d18731242
* net/tramp.el (tramp-handle-start-file-process): Set
Michael Albinus <michael.albinus@gmx.de>
parents:
96990
diff
changeset
|
4473 ;; 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
|
4474 (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
|
4475 (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
|
4476 ;; 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
|
4477 (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
|
4478 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
|
4479 (setq name name1) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4480 ;; 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
|
4481 (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
|
4482 (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
|
4483 ;; 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
|
4484 ;; 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
|
4485 ;; 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
|
4486 (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
|
4487 (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
|
4488 (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
|
4489 ;; 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
|
4490 ;; connection. |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
4491 (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
|
4492 ;; 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
|
4493 (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
|
4494 (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
|
4495 ;; Return process. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4496 (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
|
4497 ;; Save exit. |
81938
26330ef1aa46
* net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents:
81758
diff
changeset
|
4498 (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
|
4499 (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
|
4500 (progn |
837d18731242
* net/tramp.el (tramp-handle-start-file-process): Set
Michael Albinus <michael.albinus@gmx.de>
parents:
96990
diff
changeset
|
4501 (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
|
4502 (kill-buffer (current-buffer))) |
837d18731242
* net/tramp.el (tramp-handle-start-file-process): Set
Michael Albinus <michael.albinus@gmx.de>
parents:
96990
diff
changeset
|
4503 (widen) |
837d18731242
* net/tramp.el (tramp-handle-start-file-process): Set
Michael Albinus <michael.albinus@gmx.de>
parents:
96990
diff
changeset
|
4504 (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
|
4505 (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
|
4506 (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
|
4507 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4508 (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
|
4509 (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
|
4510 "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
|
4511 ;; 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
|
4512 (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
|
4513 (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
|
4514 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4515 (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
|
4516 (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
|
4517 ;; Compute command. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4518 (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
|
4519 (cons program args) " ")) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4520 ;; Determine input. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4521 (if (null infile) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4522 (setq input "/dev/null") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4523 (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
|
4524 (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
|
4525 ;; 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
|
4526 (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
|
4527 ;; 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
|
4528 (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
|
4529 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
|
4530 (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
|
4531 (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
|
4532 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4533 ;; Determine output. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4534 (cond |
103934
33e088977519
* net/tramp.el (tramp-wait-for-output): Handle the case when
Michael Albinus <michael.albinus@gmx.de>
parents:
103782
diff
changeset
|
4535 ;; Just a buffer. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4536 ((bufferp destination) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4537 (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
|
4538 ;; A buffer name. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4539 ((stringp destination) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4540 (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
|
4541 ;; (REAL-DESTINATION ERROR-DESTINATION) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4542 ((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
|
4543 ;; output. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4544 (cond |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4545 ((bufferp (car destination)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4546 (setq outbuf (car destination))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4547 ((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
|
4548 (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
|
4549 ((car destination) |
7ae99e295dfd
* vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents:
87368
diff
changeset
|
4550 (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
|
4551 ;; stderr. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4552 (cond |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4553 ((stringp (cadr destination)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4554 (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
|
4555 (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
|
4556 ;; 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
|
4557 (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
|
4558 (cadr destination) nil localname)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4559 ;; 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
|
4560 ;; 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
|
4561 (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
|
4562 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
|
4563 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
|
4564 ;; 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
|
4565 ((null (cadr destination)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4566 (setq stderr "/dev/null")))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4567 ;; 't |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4568 (destination |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4569 (setq outbuf (current-buffer)))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4570 (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
|
4571 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4572 ;; 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
|
4573 (condition-case nil |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4574 (unwind-protect |
105767
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
4575 (setq ret |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
4576 (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
|
4577 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
|
4578 (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
|
4579 command) |
075fc4ee6c41
* net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents:
106115
diff
changeset
|
4580 nil t)) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4581 ;; 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
|
4582 (when outbuf |
105767
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
4583 (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
|
4584 (insert |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
4585 (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
|
4586 (buffer-string)))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4587 (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
|
4588 ;; 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
|
4589 ;; 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
|
4590 (quit |
3f05108a52f1
* net/tramp.el (tramp-handle-dired-recursive-delete-directory):
Michael Albinus <michael.albinus@gmx.de>
parents:
102940
diff
changeset
|
4591 (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
|
4592 (setq ret -1)) |
3f05108a52f1
* net/tramp.el (tramp-handle-dired-recursive-delete-directory):
Michael Albinus <michael.albinus@gmx.de>
parents:
102940
diff
changeset
|
4593 ;; Handle errors. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4594 (error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4595 (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
|
4596 (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
|
4597 |
4636000015c5
* net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents:
85041
diff
changeset
|
4598 ;; 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
|
4599 (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
|
4600 |
102968
3f05108a52f1
* net/tramp.el (tramp-handle-dired-recursive-delete-directory):
Michael Albinus <michael.albinus@gmx.de>
parents:
102940
diff
changeset
|
4601 ;; 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
|
4602 ;; because the remote process could have changed them. |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
4603 (when tmpinput (tramp-compat-delete-file tmpinput 'force)) |
104642
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
4604 |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
4605 ;; `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
|
4606 ;; 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
|
4607 ;; 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
|
4608 ;; value 't'. |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
4609 (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
|
4610 (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
|
4611 (tramp-flush-directory-property v "")) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
4612 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4613 ;; Return exit status. |
102968
3f05108a52f1
* net/tramp.el (tramp-handle-dired-recursive-delete-directory):
Michael Albinus <michael.albinus@gmx.de>
parents:
102940
diff
changeset
|
4614 (if (equal ret -1) |
3f05108a52f1
* net/tramp.el (tramp-handle-dired-recursive-delete-directory):
Michael Albinus <michael.albinus@gmx.de>
parents:
102940
diff
changeset
|
4615 (keyboard-quit) |
3f05108a52f1
* net/tramp.el (tramp-handle-dired-recursive-delete-directory):
Michael Albinus <michael.albinus@gmx.de>
parents:
102940
diff
changeset
|
4616 ret)))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4617 |
85694
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
4618 (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
|
4619 (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
|
4620 "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
|
4621 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
|
4622 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
|
4623 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
|
4624 (let ((default-directory |
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
4625 (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
|
4626 (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
|
4627 default-directory))) |
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
4628 (if (executable-find program) |
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
4629 (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
|
4630 1))) |
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
4631 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4632 (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
|
4633 (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
|
4634 "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
|
4635 (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
|
4636 (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
|
4637 (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
|
4638 (unwind-protect |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4639 (apply 'call-process program tmpfile buffer display args) |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
4640 (tramp-compat-delete-file tmpfile 'force)))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4641 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4642 (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
|
4643 (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
|
4644 "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
|
4645 (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
|
4646 ;; 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
|
4647 ;; 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
|
4648 (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
|
4649 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
|
4650 (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
|
4651 (cond |
5399c02bfd07
* net/tramp.el (tramp-wrong-passwd-regexp): Make the regexp more
Michael Albinus <michael.albinus@gmx.de>
parents:
82201
diff
changeset
|
4652 ((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
|
4653 ((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
|
4654 (output-buffer |
85c2adddd765
(tramp-handle-shell-command): Correctly handle
Andreas Schwab <schwab@suse.de>
parents:
97052
diff
changeset
|
4655 (setq current-buffer-p t) |
85c2adddd765
(tramp-handle-shell-command): Correctly handle
Andreas Schwab <schwab@suse.de>
parents:
97052
diff
changeset
|
4656 (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
|
4657 (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
|
4658 (if asynchronous |
5399c02bfd07
* net/tramp.el (tramp-wrong-passwd-regexp): Make the regexp more
Michael Albinus <michael.albinus@gmx.de>
parents:
82201
diff
changeset
|
4659 "*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
|
4660 "*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
|
4661 (error-buffer |
5399c02bfd07
* net/tramp.el (tramp-wrong-passwd-regexp): Make the regexp more
Michael Albinus <michael.albinus@gmx.de>
parents:
82201
diff
changeset
|
4662 (cond |
5399c02bfd07
* net/tramp.el (tramp-wrong-passwd-regexp): Make the regexp more
Michael Albinus <michael.albinus@gmx.de>
parents:
82201
diff
changeset
|
4663 ((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
|
4664 ((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
|
4665 (buffer |
82324
5399c02bfd07
* net/tramp.el (tramp-wrong-passwd-regexp): Make the regexp more
Michael Albinus <michael.albinus@gmx.de>
parents:
82201
diff
changeset
|
4666 (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
|
4667 (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
|
4668 (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
|
4669 output-buffer)) |
91486
76c777ce052a
* net/tramp.el (tramp-process-sentinel): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
88072
diff
changeset
|
4670 (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
|
4671 |
948a005afe18
* net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents:
88051
diff
changeset
|
4672 ;; 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
|
4673 ;; 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
|
4674 (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
|
4675 (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
|
4676 (condition-case nil |
079f34f8306f
(tramp-drop-volume-letter): Evaluate when compiling.
Glenn Morris <rgm@gnu.org>
parents:
93047
diff
changeset
|
4677 (kill-process p) |
079f34f8306f
(tramp-drop-volume-letter): Evaluate when compiling.
Glenn Morris <rgm@gnu.org>
parents:
93047
diff
changeset
|
4678 (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
|
4679 (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
|
4680 |
97445
8f3b361fa8c1
(tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents:
97444
diff
changeset
|
4681 (if current-buffer-p |
8f3b361fa8c1
(tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents:
97444
diff
changeset
|
4682 (progn |
8f3b361fa8c1
(tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents:
97444
diff
changeset
|
4683 (barf-if-buffer-read-only) |
8f3b361fa8c1
(tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents:
97444
diff
changeset
|
4684 (push-mark nil t)) |
97444
85c2adddd765
(tramp-handle-shell-command): Correctly handle
Andreas Schwab <schwab@suse.de>
parents:
97052
diff
changeset
|
4685 (with-current-buffer output-buffer |
85c2adddd765
(tramp-handle-shell-command): Correctly handle
Andreas Schwab <schwab@suse.de>
parents:
97052
diff
changeset
|
4686 (setq buffer-read-only nil) |
85c2adddd765
(tramp-handle-shell-command): Correctly handle
Andreas Schwab <schwab@suse.de>
parents:
97052
diff
changeset
|
4687 (erase-buffer))) |
85c2adddd765
(tramp-handle-shell-command): Correctly handle
Andreas Schwab <schwab@suse.de>
parents:
97052
diff
changeset
|
4688 |
85c2adddd765
(tramp-handle-shell-command): Correctly handle
Andreas Schwab <schwab@suse.de>
parents:
97052
diff
changeset
|
4689 (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
|
4690 (prog1 |
948a005afe18
* net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents:
88051
diff
changeset
|
4691 ;; 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
|
4692 (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
|
4693 ;; Display output. |
91486
76c777ce052a
* net/tramp.el (tramp-process-sentinel): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
88072
diff
changeset
|
4694 (pop-to-buffer output-buffer) |
76c777ce052a
* net/tramp.el (tramp-process-sentinel): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
88072
diff
changeset
|
4695 (setq mode-line-process '(":%s")) |
76c777ce052a
* net/tramp.el (tramp-process-sentinel): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
88072
diff
changeset
|
4696 (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
|
4697 |
948a005afe18
* net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents:
88051
diff
changeset
|
4698 (prog1 |
948a005afe18
* net/tramp.el (tramp-methods): Use "-H" option for "sudo". Suggested
Michael Albinus <michael.albinus@gmx.de>
parents:
88051
diff
changeset
|
4699 ;; 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
|
4700 (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
|
4701 ;; 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
|
4702 (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
|
4703 (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
|
4704 (insert-file-contents (cadr buffer))) |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
4705 (tramp-compat-delete-file (cadr buffer) 'force)) |
97445
8f3b361fa8c1
(tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents:
97444
diff
changeset
|
4706 (if current-buffer-p |
8f3b361fa8c1
(tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents:
97444
diff
changeset
|
4707 ;; 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
|
4708 ;; 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
|
4709 ;; 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
|
4710 ;; because we inserted text. |
8f3b361fa8c1
(tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents:
97444
diff
changeset
|
4711 (goto-char (prog1 (mark t) |
8f3b361fa8c1
(tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents:
97444
diff
changeset
|
4712 (set-marker (mark-marker) (point) |
8f3b361fa8c1
(tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents:
97444
diff
changeset
|
4713 (current-buffer)))) |
8f3b361fa8c1
(tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents:
97444
diff
changeset
|
4714 ;; There's some output, display it. |
8f3b361fa8c1
(tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents:
97444
diff
changeset
|
4715 (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
|
4716 (if (functionp 'display-message-or-buffer) |
8f3b361fa8c1
(tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents:
97444
diff
changeset
|
4717 (funcall (symbol-function 'display-message-or-buffer) |
8f3b361fa8c1
(tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents:
97444
diff
changeset
|
4718 output-buffer) |
8f3b361fa8c1
(tramp-handle-shell-command): Handle output going
Andreas Schwab <schwab@suse.de>
parents:
97444
diff
changeset
|
4719 (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
|
4720 |
45861 | 4721 ;; File Editing. |
4722 | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4723 (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
|
4724 "Normal hook to be run at the end of `tramp-handle-file-local-copy'.") |
45861 | 4725 |
4726 (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
|
4727 "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
|
4728 |
46009
72200622ada8
(tramp-ftp-method): New user option.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
45861
diff
changeset
|
4729 (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
|
4730 (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
|
4731 (tramp-error |
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4732 v 'file-error |
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4733 "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
|
4734 |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
4735 (let* ((size (nth 7 (file-attributes filename))) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
4736 (rem-enc (tramp-get-inline-coding v "remote-encoding" size)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
4737 (loc-dec (tramp-get-inline-coding v "local-decoding" size)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
4738 (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
|
4739 |
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4740 (condition-case err |
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4741 (cond |
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4742 ;; `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
|
4743 ((or (tramp-local-host-p v) |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
4744 (tramp-method-out-of-band-p v size)) |
100930
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4745 (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
|
4746 |
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4747 ;; 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
|
4748 (rem-enc |
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4749 (save-excursion |
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4750 (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
|
4751 (tramp-barf-unless-okay |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
4752 v (format rem-enc (tramp-shell-quote-argument localname)) |
100930
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4753 "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
|
4754 (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
|
4755 |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
4756 (if (functionp loc-dec) |
100930
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4757 ;; 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
|
4758 ;; 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
|
4759 ;; `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
|
4760 ;; correctly. |
82808
6e5814967ffb
* net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
82603
diff
changeset
|
4761 (with-temp-buffer |
6e5814967ffb
* net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
82603
diff
changeset
|
4762 (set-buffer-multibyte nil) |
6e5814967ffb
* net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
82603
diff
changeset
|
4763 (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
|
4764 (tramp-message |
6e5814967ffb
* net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
82603
diff
changeset
|
4765 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
|
4766 filename loc-dec) |
6e5814967ffb
* net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
82603
diff
changeset
|
4767 (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
|
4768 ;; 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
|
4769 ;; epa-file gets confused. |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
4770 (let (file-name-handler-alist |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
4771 (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
|
4772 (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
|
4773 |
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4774 ;; 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
|
4775 ;; 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
|
4776 (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
|
4777 ;; 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
|
4778 ;; epa-file gets confused. |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
4779 (let (file-name-handler-alist |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
4780 (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
|
4781 (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
|
4782 (tramp-message |
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4783 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
|
4784 filename loc-dec) |
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4785 (unwind-protect |
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4786 (tramp-call-local-coding-command loc-dec tmpfile2 tmpfile) |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
4787 (tramp-compat-delete-file tmpfile2 'force)))) |
100930
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4788 |
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4789 (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
|
4790 ;; 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
|
4791 (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
|
4792 ;; 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
|
4793 (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
|
4794 |
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4795 ;; 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
|
4796 (t (tramp-error |
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4797 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
|
4798 |
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4799 ;; Error handling. |
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4800 ((error quit) |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
4801 (tramp-compat-delete-file tmpfile 'force) |
100930
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
4802 (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
|
4803 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
4804 (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
|
4805 tmpfile))) |
45861 | 4806 |
78460
45e0e9795cdb
* net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents:
78411
diff
changeset
|
4807 (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
|
4808 "Like `file-remote-p' for Tramp files." |
107085
d7831d04952b
* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents:
107044
diff
changeset
|
4809 (let ((tramp-verbose 3)) |
d7831d04952b
* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents:
107044
diff
changeset
|
4810 (when (tramp-tramp-file-p filename) |
d7831d04952b
* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents:
107044
diff
changeset
|
4811 (let* ((v (tramp-dissect-file-name filename)) |
d7831d04952b
* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents:
107044
diff
changeset
|
4812 (p (tramp-get-connection-process v)) |
d7831d04952b
* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents:
107044
diff
changeset
|
4813 (c (and p (processp p) (memq (process-status p) '(run open))))) |
d7831d04952b
* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents:
107044
diff
changeset
|
4814 ;; We expand the file name only, if there is already a connection. |
d7831d04952b
* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents:
107044
diff
changeset
|
4815 (with-parsed-tramp-file-name |
d7831d04952b
* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents:
107044
diff
changeset
|
4816 (if c (expand-file-name filename) filename) nil |
d7831d04952b
* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents:
107044
diff
changeset
|
4817 (and (or (not connected) c) |
d7831d04952b
* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents:
107044
diff
changeset
|
4818 (cond |
d7831d04952b
* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents:
107044
diff
changeset
|
4819 ((eq identification 'method) method) |
d7831d04952b
* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents:
107044
diff
changeset
|
4820 ((eq identification 'user) user) |
d7831d04952b
* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents:
107044
diff
changeset
|
4821 ((eq identification 'host) host) |
d7831d04952b
* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents:
107044
diff
changeset
|
4822 ((eq identification 'localname) localname) |
d7831d04952b
* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
Michael Albinus <michael.albinus@gmx.de>
parents:
107044
diff
changeset
|
4823 (t (tramp-make-tramp-file-name method user host ""))))))))) |
45861 | 4824 |
93938
3c06445e714c
* net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents:
93829
diff
changeset
|
4825 (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
|
4826 "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
|
4827 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
|
4828 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
|
4829 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
|
4830 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
|
4831 (let (result) |
3c06445e714c
* net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents:
93829
diff
changeset
|
4832 (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
|
4833 (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
|
4834 ;; 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
|
4835 ;; 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
|
4836 ;; as regexp. |
3c06445e714c
* net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents:
93829
diff
changeset
|
4837 (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
|
4838 '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
|
4839 |
45861 | 4840 (defun tramp-handle-insert-file-contents |
4841 (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
|
4842 "Like `insert-file-contents' for Tramp files." |
45861 | 4843 (barf-if-buffer-read-only) |
4844 (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
|
4845 (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
|
4846 (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
|
4847 (unwind-protect |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4848 (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
|
4849 ;; 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
|
4850 ;; 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
|
4851 (signal 'file-error |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4852 (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
|
4853 |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4854 (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
|
4855 (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
|
4856 (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
|
4857 ;; 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
|
4858 ;; run directly. |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4859 (setq result |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4860 (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
|
4861 'insert-file-contents |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4862 (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
|
4863 |
104125
fd4d8124e329
* net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents:
104097
diff
changeset
|
4864 ;; 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
|
4865 ;; this part. |
fd4d8124e329
* net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents:
104097
diff
changeset
|
4866 (when (or beg end) |
fd4d8124e329
* net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents:
104097
diff
changeset
|
4867 (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
|
4868 (tramp-send-command |
fd4d8124e329
* net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents:
104097
diff
changeset
|
4869 v |
fd4d8124e329
* net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents:
104097
diff
changeset
|
4870 (cond |
fd4d8124e329
* net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents:
104097
diff
changeset
|
4871 ((and beg end) |
fd4d8124e329
* net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents:
104097
diff
changeset
|
4872 (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
|
4873 (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
|
4874 (- end beg) remote-copy)) |
fd4d8124e329
* net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents:
104097
diff
changeset
|
4875 (beg |
fd4d8124e329
* net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents:
104097
diff
changeset
|
4876 (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
|
4877 (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
|
4878 remote-copy)) |
fd4d8124e329
* net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents:
104097
diff
changeset
|
4879 (end |
fd4d8124e329
* net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents:
104097
diff
changeset
|
4880 (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
|
4881 (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
|
4882 remote-copy))))) |
fd4d8124e329
* net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents:
104097
diff
changeset
|
4883 |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4884 ;; `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
|
4885 ;; 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
|
4886 ;; `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
|
4887 ;; 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
|
4888 (setq local-copy |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4889 (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
|
4890 (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
|
4891 'insert-file-contents) |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4892 '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
|
4893 (cond |
828d51e45d15
* net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents:
105615
diff
changeset
|
4894 ((stringp remote-copy) |
828d51e45d15
* net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents:
105615
diff
changeset
|
4895 (file-local-copy |
828d51e45d15
* net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents:
105615
diff
changeset
|
4896 (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
|
4897 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
|
4898 ((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
|
4899 (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
|
4900 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
|
4901 (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
|
4902 |
107189
a48b193e3b5f
(tramp-handle-insert-file-contents): Set always the permissions of the
Michael Albinus <michael.albinus@gmx.de>
parents:
107170
diff
changeset
|
4903 ;; When the file is not readable for the owner, it |
a48b193e3b5f
(tramp-handle-insert-file-contents): Set always the permissions of the
Michael Albinus <michael.albinus@gmx.de>
parents:
107170
diff
changeset
|
4904 ;; cannot be inserted, even it is redable for the group |
a48b193e3b5f
(tramp-handle-insert-file-contents): Set always the permissions of the
Michael Albinus <michael.albinus@gmx.de>
parents:
107170
diff
changeset
|
4905 ;; or for everybody. |
a48b193e3b5f
(tramp-handle-insert-file-contents): Set always the permissions of the
Michael Albinus <michael.albinus@gmx.de>
parents:
107170
diff
changeset
|
4906 (set-file-modes local-copy (tramp-octal-to-decimal "0600")) |
a48b193e3b5f
(tramp-handle-insert-file-contents): Set always the permissions of the
Michael Albinus <michael.albinus@gmx.de>
parents:
107170
diff
changeset
|
4907 |
105718
828d51e45d15
* net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents:
105615
diff
changeset
|
4908 (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
|
4909 (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
|
4910 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
|
4911 ;; 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
|
4912 ;; useful for "rsync". |
828d51e45d15
* net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents:
105615
diff
changeset
|
4913 (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
|
4914 (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
|
4915 |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4916 (tramp-message |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4917 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
|
4918 |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4919 ;; 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
|
4920 ;; matches `local-copy'. |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4921 (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
|
4922 (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
|
4923 filename local-copy))) |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4924 (setq result |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4925 (insert-file-contents |
104125
fd4d8124e329
* net/tramp.el (tramp-debug-message): Print also microseconds.
Michael Albinus <michael.albinus@gmx.de>
parents:
104097
diff
changeset
|
4926 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
|
4927 ;; 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
|
4928 ;; Remember it. |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4929 (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
|
4930 (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
|
4931 (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
|
4932 |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4933 (tramp-message |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4934 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
|
4935 (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
|
4936 (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
|
4937 |
49b412e99f1e
* net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents:
104137
diff
changeset
|
4938 ;; Save exit. |
49b412e99f1e
* net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents:
104137
diff
changeset
|
4939 (progn |
49b412e99f1e
* net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents:
104137
diff
changeset
|
4940 (when visit |
49b412e99f1e
* net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents:
104137
diff
changeset
|
4941 (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
|
4942 (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
|
4943 (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
|
4944 (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
|
4945 (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
|
4946 (or remote-copy (null tramp-temp-buffer-file-name))) |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
4947 (tramp-compat-delete-file local-copy 'force)) |
104143
49b412e99f1e
* net/tramp.el (top): Make check for tramp-gvfs loading more
Michael Albinus <michael.albinus@gmx.de>
parents:
104137
diff
changeset
|
4948 (when (stringp remote-copy) |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
4949 (tramp-compat-delete-file |
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
4950 (tramp-make-tramp-file-name method user host remote-copy) |
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
4951 'force))))) |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4952 |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4953 ;; Result. |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
4954 (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
|
4955 (cadr result)))) |
45861 | 4956 |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84985
diff
changeset
|
4957 ;; 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
|
4958 (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
|
4959 (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
|
4960 "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
|
4961 (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
|
4962 (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
|
4963 (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
|
4964 (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
|
4965 (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
|
4966 (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
|
4967 (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
|
4968 nil)) |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84985
diff
changeset
|
4969 (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
|
4970 (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
|
4971 (unwind-protect |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84985
diff
changeset
|
4972 (progn |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84985
diff
changeset
|
4973 (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
|
4974 (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
|
4975 ;; 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
|
4976 (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
|
4977 (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
|
4978 (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
|
4979 |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
4980 (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
|
4981 "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
|
4982 (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
|
4983 ;; We set both variables. It doesn't matter whether it is |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
4984 ;; Emacs or XEmacs. |
56460
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
4985 (let ((backup-directory-alist |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
4986 ;; Emacs case. |
56460
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
4987 (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
|
4988 (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
|
4989 (mapcar |
104673
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
4990 (lambda (x) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
4991 (cons |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
4992 (car x) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
4993 (if (and (stringp (cdr x)) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
4994 (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
|
4995 (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
|
4996 (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
|
4997 (cdr x)))) |
56460
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
4998 (symbol-value 'tramp-backup-directory-alist)) |
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
4999 (symbol-value 'backup-directory-alist)))) |
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5000 |
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5001 (bkup-backup-directory-info |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
5002 ;; XEmacs case. |
56460
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5003 (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
|
5004 (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
|
5005 (mapcar |
104673
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5006 (lambda (x) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5007 (nconc |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5008 (list (car x)) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5009 (list |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5010 (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
|
5011 (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
|
5012 (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
|
5013 (tramp-make-tramp-file-name |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5014 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
|
5015 (car (cdr x)))) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5016 (cdr (cdr x)))) |
56460
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5017 (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
|
5018 (symbol-value 'bkup-backup-directory-info))))) |
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5019 |
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5020 (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
|
5021 |
65248
0f994edbec5e
Make `make-auto-save-file-name' a magic operation.
Michael Albinus <michael.albinus@gmx.de>
parents:
64772
diff
changeset
|
5022 (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
|
5023 "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
|
5024 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
|
5025 (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
|
5026 (buffer-file-name |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5027 (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
|
5028 '(("_" . "|") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5029 ("/" . "_a") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5030 (":" . "_b") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5031 ("|" . "__") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5032 ("[" . "_l") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5033 ("]" . "_r")) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5034 (buffer-file-name)))) |
72569
7457615d594a
Sync with Tramp 2.0.54.
Michael Albinus <michael.albinus@gmx.de>
parents:
71561
diff
changeset
|
5035 ;; 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
|
5036 ;; 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
|
5037 ;; 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
|
5038 (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
|
5039 (mapc |
104673
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5040 (lambda (x) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5041 (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
|
5042 (not (car (cddr x)))) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5043 (setq tramp-auto-save-directory |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5044 (or tramp-auto-save-directory |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5045 (tramp-compat-temporary-file-directory))))) |
72569
7457615d594a
Sync with Tramp 2.0.54.
Michael Albinus <michael.albinus@gmx.de>
parents:
71561
diff
changeset
|
5046 (symbol-value 'auto-save-file-name-transforms))) |
7457615d594a
Sync with Tramp 2.0.54.
Michael Albinus <michael.albinus@gmx.de>
parents:
71561
diff
changeset
|
5047 ;; Create directory. |
7457615d594a
Sync with Tramp 2.0.54.
Michael Albinus <michael.albinus@gmx.de>
parents:
71561
diff
changeset
|
5048 (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
|
5049 (setq buffer-file-name |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5050 (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
|
5051 (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
|
5052 (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
|
5053 ;; 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
|
5054 ;; 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
|
5055 ;; 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
|
5056 (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
|
5057 (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
|
5058 ;; else |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5059 (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
|
5060 (prog1 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5061 (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
|
5062 (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
|
5063 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5064 (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
|
5065 "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
|
5066 |
105718
828d51e45d15
* net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents:
105615
diff
changeset
|
5067 ;; CCC grok LOCKNAME |
45861 | 5068 (defun tramp-handle-write-region |
5069 (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
|
5070 "Like `write-region' for Tramp files." |
45861 | 5071 (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
|
5072 (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
|
5073 ;; 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
|
5074 ;; 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
|
5075 ;; 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
|
5076 ;; (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
|
5077 ;; (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
|
5078 ;; (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
|
5079 ;; (string= lockname filename)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5080 ;; (error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5081 ;; "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
|
5082 |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84985
diff
changeset
|
5083 ;; 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
|
5084 (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
|
5085 (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
|
5086 (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
|
5087 |
85694
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
5088 (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
|
5089 (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
|
5090 (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
|
5091 (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
|
5092 |
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 (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
|
5094 ;; `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
|
5095 ;; 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
|
5096 (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
|
5097 (and |
adc57176d5f1
* net/tramp.el (tramp-handle-write-region): Fix check for short
Michael Albinus <michael.albinus@gmx.de>
parents:
95025
diff
changeset
|
5098 (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
|
5099 (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
|
5100 (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
|
5101 ;; Short track: if we are on the local host, we can run directly. |
107170
1f564d6c5e1d
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
Michael Albinus <michael.albinus@gmx.de>
parents:
107151
diff
changeset
|
5102 (tramp-run-real-handler |
1f564d6c5e1d
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
Michael Albinus <michael.albinus@gmx.de>
parents:
107151
diff
changeset
|
5103 'write-region |
1f564d6c5e1d
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
Michael Albinus <michael.albinus@gmx.de>
parents:
107151
diff
changeset
|
5104 (list start end localname append 'no-message lockname confirm)) |
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
|
5105 |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5106 (let ((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
|
5107 ;; We use this to save the value of |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5108 ;; `last-coding-system-used' after writing the tmp |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5109 ;; file. At the end of the function, we set |
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
|
5110 ;; `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
|
5111 ;; 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
|
5112 ;; 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
|
5113 ;; 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
|
5114 ;; 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
|
5115 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
|
5116 ;; 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
|
5117 ;; 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
|
5118 ;; 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
|
5119 ;; simpler. |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
5120 (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
|
5121 (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
|
5122 |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
5123 ;; 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
|
5124 ;; 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
|
5125 (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
|
5126 |
05c8e6a18913
* net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents:
85428
diff
changeset
|
5127 ;; 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
|
5128 ;; 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
|
5129 ;; 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
|
5130 ;; 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
|
5131 ;; matches `tmpfile'. |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5132 (let (file-name-handler-alist |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5133 (file-coding-system-alist |
93938
3c06445e714c
* net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents:
93829
diff
changeset
|
5134 (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
|
5135 (condition-case err |
2b84620022aa
* net/tramp.el (tramp-handle-load)
Michael Albinus <michael.albinus@gmx.de>
parents:
100903
diff
changeset
|
5136 (tramp-run-real-handler |
2b84620022aa
* net/tramp.el (tramp-handle-load)
Michael Albinus <michael.albinus@gmx.de>
parents:
100903
diff
changeset
|
5137 'write-region |
2b84620022aa
* net/tramp.el (tramp-handle-load)
Michael Albinus <michael.albinus@gmx.de>
parents:
100903
diff
changeset
|
5138 (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
|
5139 ((error quit) |
105718
828d51e45d15
* net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents:
105615
diff
changeset
|
5140 (setq tramp-temp-buffer-file-name nil) |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
5141 (tramp-compat-delete-file tmpfile 'force) |
100930
7d332b05e8ac
* net/tramp.el (tramp-do-copy-or-rename-file-directly)
Michael Albinus <michael.albinus@gmx.de>
parents:
100922
diff
changeset
|
5142 (signal (car err) (cdr err)))) |
100922
2b84620022aa
* net/tramp.el (tramp-handle-load)
Michael Albinus <michael.albinus@gmx.de>
parents:
100903
diff
changeset
|
5143 |
93938
3c06445e714c
* net/tramp.el (tramp-find-file-name-coding-system-alist): New
Michael Albinus <michael.albinus@gmx.de>
parents:
93829
diff
changeset
|
5144 ;; 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
|
5145 (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
|
5146 (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
|
5147 (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
|
5148 |
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
|
5149 ;; 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
|
5150 ;; 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
|
5151 ;; 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
|
5152 ;; handles permissions. |
107209
4a0ca858272e
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Protect
Michael Albinus <michael.albinus@gmx.de>
parents:
107190
diff
changeset
|
5153 ;; Ensure, that it is still readable. |
4a0ca858272e
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Protect
Michael Albinus <michael.albinus@gmx.de>
parents:
107190
diff
changeset
|
5154 (when modes |
4a0ca858272e
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Protect
Michael Albinus <michael.albinus@gmx.de>
parents:
107190
diff
changeset
|
5155 (set-file-modes |
4a0ca858272e
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Protect
Michael Albinus <michael.albinus@gmx.de>
parents:
107190
diff
changeset
|
5156 tmpfile (logior (or modes 0) (tramp-octal-to-decimal "0400")))) |
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
|
5157 |
05c8e6a18913
* net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents:
85428
diff
changeset
|
5158 ;; 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
|
5159 ;; 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
|
5160 ;; 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
|
5161 ;; 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
|
5162 ;; 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
|
5163 ;; 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
|
5164 ;; contents of the tmp file. |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5165 (let* ((size (nth 7 (file-attributes tmpfile))) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5166 (rem-dec (tramp-get-inline-coding v "remote-decoding" size)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5167 (loc-enc (tramp-get-inline-coding v "local-encoding" size))) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5168 (cond |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5169 ;; `copy-file' handles direct copy and out-of-band methods. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5170 ((or (tramp-local-host-p v) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5171 (tramp-method-out-of-band-p v size)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5172 (if (and (not (stringp start)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5173 (= (or end (point-max)) (point-max)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5174 (= (or start (point-min)) (point-min)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5175 (tramp-get-method-parameter |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5176 method 'tramp-copy-keep-tmpfile)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5177 (progn |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5178 (setq tramp-temp-buffer-file-name tmpfile) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5179 (condition-case err |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5180 ;; We keep the local file for performance |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5181 ;; reasons, useful for "rsync". |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5182 (copy-file tmpfile filename t) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5183 ((error quit) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5184 (setq tramp-temp-buffer-file-name nil) |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
5185 (tramp-compat-delete-file tmpfile 'force) |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5186 (signal (car err) (cdr err))))) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5187 (setq tramp-temp-buffer-file-name nil) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5188 ;; Don't rename, in order to keep context in SELinux. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5189 (unwind-protect |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5190 (copy-file tmpfile filename t) |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
5191 (tramp-compat-delete-file tmpfile 'force)))) |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5192 |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5193 ;; Use inline file transfer. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5194 (rem-dec |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5195 ;; Encode tmpfile. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5196 (tramp-message v 5 "Encoding region...") |
105907
9abdd578d117
* net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents:
105893
diff
changeset
|
5197 (unwind-protect |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5198 (with-temp-buffer |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5199 (set-buffer-multibyte nil) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5200 ;; Use encoding function or command. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5201 (if (functionp loc-enc) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5202 (progn |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5203 (tramp-message |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5204 v 5 "Encoding region using function `%s'..." loc-enc) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5205 (let ((coding-system-for-read 'binary)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5206 (insert-file-contents-literally tmpfile)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5207 ;; The following `let' is a workaround for the |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5208 ;; base64.el that comes with pgnus-0.84. If |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5209 ;; both of the following conditions are |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5210 ;; satisfied, it tries to write to a local |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5211 ;; file in default-directory, but at this |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5212 ;; point, default-directory is remote. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5213 ;; (`call-process-region' can't write to |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5214 ;; remote files, it seems.) The file in |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5215 ;; question is a tmp file anyway. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5216 (let ((default-directory |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5217 (tramp-compat-temporary-file-directory))) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5218 (funcall loc-enc (point-min) (point-max)))) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5219 |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5220 (tramp-message |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5221 v 5 "Encoding region using command `%s'..." loc-enc) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5222 (unless (zerop (tramp-call-local-coding-command |
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
|
5223 loc-enc tmpfile t)) |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5224 (tramp-error |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5225 v 'file-error |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5226 "Cannot write to `%s', local encoding command `%s' failed" |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5227 filename loc-enc))) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5228 |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5229 ;; Send buffer into remote decoding command which |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5230 ;; writes to remote file. Because this happens on |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5231 ;; the remote host, we cannot use the function. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5232 (goto-char (point-max)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5233 (unless (bolp) (newline)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5234 (tramp-message |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5235 v 5 "Decoding region into remote file %s..." filename) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5236 (tramp-send-command |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5237 v |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5238 (format |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5239 (concat rem-dec " <<'EOF'\n%sEOF") |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5240 (tramp-shell-quote-argument localname) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5241 (buffer-string))) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5242 (tramp-barf-unless-okay |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5243 v nil |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5244 "Couldn't write region to `%s', decode using `%s' failed" |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5245 filename rem-dec) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5246 ;; When `file-precious-flag' is set, the region is |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5247 ;; written to a temporary file. Check that the |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5248 ;; checksum is equal to that from the local tmpfile. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5249 (when file-precious-flag |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5250 (erase-buffer) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5251 (and |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5252 ;; cksum runs locally, if possible. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5253 (zerop (tramp-local-call-process "cksum" tmpfile t)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5254 ;; cksum runs remotely. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5255 (zerop |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5256 (tramp-send-command-and-check |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5257 v |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5258 (format |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5259 "cksum <%s" (tramp-shell-quote-argument localname)))) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5260 ;; ... they are different. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5261 (not |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5262 (string-equal |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5263 (buffer-string) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5264 (with-current-buffer (tramp-get-buffer v) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5265 (buffer-string)))) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5266 (tramp-error |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5267 v 'file-error |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5268 (concat "Couldn't write region to `%s'," |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5269 " decode using `%s' failed") |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5270 filename rem-dec))) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5271 (tramp-message |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5272 v 5 "Decoding region into remote file %s...done" filename)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5273 |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5274 ;; Save exit. |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
5275 (tramp-compat-delete-file tmpfile 'force))) |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5276 |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5277 ;; That's not expected. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5278 (t |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5279 (tramp-error |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5280 v 'file-error |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5281 (concat "Method `%s' should specify both encoding and " |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5282 "decoding command or an rcp program") |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
5283 method)))) |
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
|
5284 |
05c8e6a18913
* net/tramp.el (top): Put load of all tramp-* files into a dolist.
Michael Albinus <michael.albinus@gmx.de>
parents:
85428
diff
changeset
|
5285 ;; 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
|
5286 (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
|
5287 (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
|
5288 |
107170
1f564d6c5e1d
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
Michael Albinus <michael.albinus@gmx.de>
parents:
107151
diff
changeset
|
5289 (tramp-flush-file-property v (file-name-directory localname)) |
1f564d6c5e1d
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
Michael Albinus <michael.albinus@gmx.de>
parents:
107151
diff
changeset
|
5290 (tramp-flush-file-property v localname) |
1f564d6c5e1d
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
Michael Albinus <michael.albinus@gmx.de>
parents:
107151
diff
changeset
|
5291 |
93040
ba82da0cb626
* net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents:
93036
diff
changeset
|
5292 ;; 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
|
5293 ;; 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
|
5294 (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
|
5295 ;; Set file modification time. |
ba82da0cb626
* net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents:
93036
diff
changeset
|
5296 (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
|
5297 (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
|
5298 (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
|
5299 ;; 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
|
5300 ;; 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
|
5301 ;; `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
|
5302 (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
|
5303 (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
|
5304 (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
|
5305 (setq need-chown nil)))) |
93040
ba82da0cb626
* net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents:
93036
diff
changeset
|
5306 |
ba82da0cb626
* net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents:
93036
diff
changeset
|
5307 ;; 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
|
5308 (when need-chown |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
5309 (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
|
5310 (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
|
5311 (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
|
5312 (run-hooks 'tramp-handle-write-region-hook))))) |
45861 | 5313 |
104642
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
5314 (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
|
5315 "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
|
5316 |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
5317 ;; 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
|
5318 ;; 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
|
5319 ;; 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
|
5320 ;; 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
|
5321 ;; 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
|
5322 ;; 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
|
5323 ;; `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
|
5324 ;; 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
|
5325 ;; 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
|
5326 ;; 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
|
5327 ;; 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
|
5328 ;; `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
|
5329 ;; 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
|
5330 (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
|
5331 "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
|
5332 (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
|
5333 |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
5334 ;; 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
|
5335 ;; 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
|
5336 (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
|
5337 (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
|
5338 (file-name-handler-alist |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
5339 `((,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
|
5340 |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
5341 ;; 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
|
5342 (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
|
5343 (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
|
5344 |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
5345 ;; 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
|
5346 (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
|
5347 (tramp-maybe-send-script |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
5348 v |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
5349 (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
|
5350 (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
|
5351 (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
|
5352 "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
|
5353 |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
5354 (dolist |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
5355 (elt |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
5356 (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
|
5357 v |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
5358 (format |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
5359 "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
|
5360 (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
|
5361 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
|
5362 " ")))) |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
5363 |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
5364 (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
|
5365 |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
5366 ;; 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
|
5367 ;; 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
|
5368 ;; 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
|
5369 ;; 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
|
5370 (let (process-file-side-effects) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
5371 (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
|
5372 |
70318
77201b466c80
* net/tramp.el (tramp-completion-file-name-handler-alist)
Michael Albinus <michael.albinus@gmx.de>
parents:
70276
diff
changeset
|
5373 ;;;###autoload |
77201b466c80
* net/tramp.el (tramp-completion-file-name-handler-alist)
Michael Albinus <michael.albinus@gmx.de>
parents:
70276
diff
changeset
|
5374 (progn (defun tramp-run-real-handler (operation args) |
45861 | 5375 "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
|
5376 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
|
5377 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
|
5378 (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
|
5379 `(tramp-file-name-handler |
104642
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
5380 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
|
5381 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
|
5382 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
|
5383 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
|
5384 . |
09acf3f65bb5
* net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47771
diff
changeset
|
5385 ,(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
|
5386 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
|
5387 (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
|
5388 (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
|
5389 |
70318
77201b466c80
* net/tramp.el (tramp-completion-file-name-handler-alist)
Michael Albinus <michael.albinus@gmx.de>
parents:
70276
diff
changeset
|
5390 ;;;###autoload |
77201b466c80
* net/tramp.el (tramp-completion-file-name-handler-alist)
Michael Albinus <michael.albinus@gmx.de>
parents:
70276
diff
changeset
|
5391 (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
|
5392 "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
|
5393 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
|
5394 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
|
5395 (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
|
5396 `(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
|
5397 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
|
5398 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
|
5399 . |
09acf3f65bb5
* net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47771
diff
changeset
|
5400 ,(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
|
5401 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
|
5402 (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
|
5403 (apply operation args)))) |
45861 | 5404 |
48973
09acf3f65bb5
* net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47771
diff
changeset
|
5405 ;; 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
|
5406 ;; 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
|
5407 ;; 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
|
5408 ;; 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
|
5409 ;; 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
|
5410 ;; 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
|
5411 ;; 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
|
5412 (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
|
5413 "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
|
5414 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
|
5415 (cond |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
5416 ;; FILE resp 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
|
5417 ((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
|
5418 (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
|
5419 '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
|
5420 '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
|
5421 '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
|
5422 '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
|
5423 'file-directory-p 'file-executable-p 'file-exists-p |
108064
589643be353e
* net/tramp.el (tramp-handle-copy-file): Add new optional
Michael Albinus <michael.albinus@gmx.de>
parents:
108059
diff
changeset
|
5424 'file-local-copy 'file-remote-p 'file-modes |
55844
4bc6cb45c326
Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents:
55420
diff
changeset
|
5425 '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
|
5426 '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
|
5427 '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
|
5428 '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
|
5429 '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
|
5430 '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
|
5431 'load 'make-directory 'make-directory-internal |
4bc6cb45c326
Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents:
55420
diff
changeset
|
5432 '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
|
5433 'unhandled-file-name-directory 'vc-registered |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
5434 ;; Emacs 22+ only. |
81938
26330ef1aa46
* net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents:
81758
diff
changeset
|
5435 'set-file-times |
108064
589643be353e
* net/tramp.el (tramp-handle-copy-file): Add new optional
Michael Albinus <michael.albinus@gmx.de>
parents:
108059
diff
changeset
|
5436 ;; Emacs 24+ only. |
589643be353e
* net/tramp.el (tramp-handle-copy-file): Add new optional
Michael Albinus <michael.albinus@gmx.de>
parents:
108059
diff
changeset
|
5437 'file-selinux-context 'set-file-selinux-context |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
5438 ;; 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
|
5439 '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
|
5440 '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
|
5441 '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
|
5442 '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
|
5443 '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
|
5444 '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
|
5445 (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
|
5446 (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
|
5447 (expand-file-name (nth 0 args)))) |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
5448 ;; FILE DIRECTORY resp FILE1 FILE2. |
48973
09acf3f65bb5
* net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47771
diff
changeset
|
5449 ((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
|
5450 (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
|
5451 '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
|
5452 'file-newer-than-file-p 'make-symbolic-link 'rename-file |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
5453 ;; Emacs 23+ only. |
105462
f6c5cf0fc0c9
* net/tramp.el (tramp-verbose): Fix docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
105351
diff
changeset
|
5454 'copy-directory |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
5455 ;; 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
|
5456 '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
|
5457 '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
|
5458 (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
|
5459 (cond |
09acf3f65bb5
* net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47771
diff
changeset
|
5460 ((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
|
5461 ((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
|
5462 (t (buffer-file-name (current-buffer)))))) |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
5463 ;; START END 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
|
5464 ((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
|
5465 (nth 2 args)) |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
5466 ;; BUFFER. |
48973
09acf3f65bb5
* net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47771
diff
changeset
|
5467 ((member operation |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5468 (list 'set-visited-file-modtime 'verify-visited-file-modtime |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
5469 ;; Emacs 22+ only. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5470 'make-auto-save-file-name |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
5471 ;; 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
|
5472 '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
|
5473 (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
|
5474 (if (bufferp (nth 0 args)) (nth 0 args) (current-buffer)))) |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
5475 ;; COMMAND. |
48973
09acf3f65bb5
* net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47771
diff
changeset
|
5476 ((member operation |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
5477 (list ;; not in Emacs 23+. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5478 'dired-call-process |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
5479 ;; Emacs only. |
60287
865aec6814c3
(tramp-file-name-for-operation): Fix misapplied
Andreas Schwab <schwab@suse.de>
parents:
60156
diff
changeset
|
5480 'shell-command |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
5481 ;; 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
|
5482 'process-file |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
5483 ;; Emacs 23+ only. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5484 'start-file-process |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
5485 ;; XEmacs only. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5486 'dired-print-file 'dired-shell-call-process |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
5487 ;; nowhere yet. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5488 '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
|
5489 default-directory) |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
5490 ;; Unknown file primitive. |
48973
09acf3f65bb5
* net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47771
diff
changeset
|
5491 (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
|
5492 |
09acf3f65bb5
* net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47771
diff
changeset
|
5493 (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
|
5494 "Return foreign file name handler if exists." |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
5495 (when (tramp-tramp-file-p filename) |
84966
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
5496 (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
|
5497 (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
|
5498 elt res) |
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
5499 ;; 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
|
5500 ;; 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
|
5501 (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
|
5502 (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
|
5503 (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
|
5504 (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
|
5505 (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
|
5506 (while handler |
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
5507 (setq elt (car handler) |
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
5508 handler (cdr handler)) |
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
5509 (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
|
5510 (setq handler nil |
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
5511 res (cdr elt)))) |
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
5512 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
|
5513 |
45861 | 5514 ;; Main function. |
5515 ;;;###autoload | |
5516 (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
|
5517 "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
|
5518 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
|
5519 (if tramp-mode |
0918f4a758d2
* net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents:
94401
diff
changeset
|
5520 (save-match-data |
0918f4a758d2
* net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents:
94401
diff
changeset
|
5521 (let* ((filename |
0918f4a758d2
* net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents:
94401
diff
changeset
|
5522 (tramp-replace-environment-variables |
0918f4a758d2
* net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents:
94401
diff
changeset
|
5523 (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
|
5524 (completion (tramp-completion-mode-p)) |
0918f4a758d2
* net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents:
94401
diff
changeset
|
5525 (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
|
5526 (with-parsed-tramp-file-name filename nil |
107870
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5527 ;; Call the backend function. |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5528 (if foreign |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5529 (condition-case err |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5530 (apply foreign operation args) |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5531 (error |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5532 (cond |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5533 ;; When we are in completion mode, some failed |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5534 ;; operations shall return at least a default |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5535 ;; value in order to give the user a chance to |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5536 ;; correct the file name in the minibuffer. |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5537 ((and completion (zerop (length localname)) |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5538 (memq operation '(file-exists-p file-directory-p))) |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5539 t) |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5540 ((and completion (zerop (length localname)) |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5541 (memq operation |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5542 '(expand-file-name file-name-as-directory))) |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5543 filename) |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5544 ;; Propagate the error. |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5545 (t (signal (car err) (cdr err)))))) |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5546 ;; Nothing to do for us. |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5547 (tramp-run-real-handler operation args))))) |
973ae1d72536
* net/tramp.el (tramp-error-with-buffer): Don't show the
Michael Albinus <albinus@detlef>
parents:
107858
diff
changeset
|
5548 |
94436
0918f4a758d2
* net/tramp.el (tramp-mode): New defcustom.
Michael Albinus <michael.albinus@gmx.de>
parents:
94401
diff
changeset
|
5549 ;; 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
|
5550 (tramp-run-real-handler operation args))) |
45861 | 5551 |
56460
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5552 ;; 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
|
5553 ;; 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
|
5554 ;; 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
|
5555 ;; 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
|
5556 ;; 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
|
5557 ;; 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
|
5558 ;; 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
|
5559 ;; `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
|
5560 ;; (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
|
5561 ;; 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
|
5562 ;; 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
|
5563 ;; -- 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
|
5564 ;; 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
|
5565 ;; 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
|
5566 ;; 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
|
5567 ;; 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
|
5568 |
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5569 (defvar tramp-locked nil |
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5570 "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
|
5571 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
|
5572 preventing reentrant calls of Tramp.") |
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5573 |
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5574 (defvar tramp-locker nil |
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5575 "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
|
5576 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
|
5577 preventing reentrant calls of Tramp.") |
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5578 |
51603
978e262c8f3a
Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51177
diff
changeset
|
5579 (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
|
5580 "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
|
5581 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
|
5582 (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
|
5583 (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
|
5584 (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
|
5585 (let ((tl tramp-locked)) |
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5586 (unwind-protect |
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5587 (progn |
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5588 (setq tramp-locked t) |
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5589 (let ((tramp-locker t)) |
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5590 (save-match-data |
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5591 (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
|
5592 (if fn |
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5593 (apply (cdr fn) args) |
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5594 (tramp-run-real-handler operation args)))))) |
9459300bf43b
Sync with Tramp 2.0.43.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56424
diff
changeset
|
5595 (setq tramp-locked tl)))) |
51603
978e262c8f3a
Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51177
diff
changeset
|
5596 |
104642
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
5597 (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
|
5598 "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
|
5599 (save-match-data |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
5600 (let ((filename |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
5601 (tramp-replace-environment-variables |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
5602 (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
|
5603 (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
|
5604 (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
|
5605 (cond |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
5606 ;; 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
|
5607 ;; 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
|
5608 ;; `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
|
5609 ;; 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
|
5610 ;; 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
|
5611 ((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
|
5612 (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
|
5613 nil) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
5614 ;; 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
|
5615 ;; must still work. |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
5616 (fn |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
5617 (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
|
5618 ;; 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
|
5619 (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
|
5620 |
47576
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
5621 ;;;###autoload |
70255
d57fb8c98714
* net/tramp.el (tramp-completion-file-name-handler): Disable
Michael Albinus <michael.albinus@gmx.de>
parents:
70191
diff
changeset
|
5622 (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
|
5623 "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
|
5624 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
|
5625 ;; 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
|
5626 ;; would otherwise use backslash. |
93082
7e079018403b
* net/tramp.el (tramp-let-maybe): Removed.
Michael Albinus <michael.albinus@gmx.de>
parents:
93062
diff
changeset
|
5627 (let ((directory-sep-char ?/) |
7e079018403b
* net/tramp.el (tramp-let-maybe): Removed.
Michael Albinus <michael.albinus@gmx.de>
parents:
93062
diff
changeset
|
5628 (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
|
5629 (if (and |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5630 ;; 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
|
5631 fn tramp-mode |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5632 ;; 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
|
5633 ;; 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
|
5634 ;; 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
|
5635 ;; 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
|
5636 ;; 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
|
5637 (or (eq tramp-syntax 'sep) |
108066
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
5638 (featurep 'tramp) ;; If it's loaded, we may as well use it. |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
5639 ;; `partial-completion-mode' does not exist in XEmacs. |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
5640 ;; It is obsoleted with Emacs 24.1. |
104673
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5641 (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
|
5642 ;; 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
|
5643 ;; intended to use them. |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5644 (featurep 'ido) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5645 (featurep 'icicles))) |
93082
7e079018403b
* net/tramp.el (tramp-let-maybe): Removed.
Michael Albinus <michael.albinus@gmx.de>
parents:
93062
diff
changeset
|
5646 (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
|
5647 (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
|
5648 |
45861 | 5649 ;;;###autoload |
104673
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5650 (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
|
5651 "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
|
5652 ;; 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
|
5653 ;; 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
|
5654 (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
|
5655 (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
|
5656 (let ((a1 (rassq |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5657 '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
|
5658 (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
|
5659 ;; Add the handlers. |
70318
77201b466c80
* net/tramp.el (tramp-completion-file-name-handler-alist)
Michael Albinus <michael.albinus@gmx.de>
parents:
70276
diff
changeset
|
5660 (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
|
5661 (cons tramp-file-name-regexp 'tramp-file-name-handler)) |
107040
5555e86608c1
* net/ange-ftp.el (ange-ftp-insert-directory): Handle the case,
Michael Albinus <albinus@detlef>
parents:
107021
diff
changeset
|
5662 (put 'tramp-file-name-handler 'safe-magic t) |
104673
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5663 (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
|
5664 (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
|
5665 'tramp-completion-file-name-handler)) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5666 (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
|
5667 ;; 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
|
5668 ;; 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
|
5669 (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
|
5670 (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
|
5671 (when entry |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5672 (setq file-name-handler-alist |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
5673 (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
|
5674 |
d55ab93ab5bf
* net/tramp.el (tramp-register-file-name-handler)
Michael Albinus <michael.albinus@gmx.de>
parents:
76326
diff
changeset
|
5675 ;; `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
|
5676 ;; 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
|
5677 ;; 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
|
5678 ;;;###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
|
5679 (tramp-register-file-name-handlers) |
45861 | 5680 |
68335
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
5681 ;;;###autoload |
70191
3a3093f77da8
* net/tramp.el (tramp-register-file-name-handlers): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
70073
diff
changeset
|
5682 (defun tramp-unload-file-name-handlers () |
68335
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
5683 (setq file-name-handler-alist |
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
5684 (delete (rassoc 'tramp-file-name-handler |
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
5685 file-name-handler-alist) |
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
5686 (delete (rassoc 'tramp-completion-file-name-handler |
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
5687 file-name-handler-alist) |
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
5688 file-name-handler-alist)))) |
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
5689 |
70191
3a3093f77da8
* net/tramp.el (tramp-register-file-name-handlers): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
70073
diff
changeset
|
5690 (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
|
5691 |
87648
7ae99e295dfd
* vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents:
87368
diff
changeset
|
5692 ;;; 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
|
5693 |
66496
63563507d684
(tramp-completion-mode): defvar moved up.
Richard M. Stallman <rms@gnu.org>
parents:
66135
diff
changeset
|
5694 (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
|
5695 "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
|
5696 |
ef0a2673bf5e
* net/tramp.el (tramp-completion-mode): Extend doc-string.
Michael Albinus <michael.albinus@gmx.de>
parents:
78887
diff
changeset
|
5697 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
|
5698 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
|
5699 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
|
5700 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
|
5701 |
47576
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
5702 ;; 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
|
5703 ;; `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
|
5704 ;; 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
|
5705 ;; 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
|
5706 ;; `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
|
5707 ;; 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
|
5708 ;; 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
|
5709 ;; 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
|
5710 ;; 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
|
5711 ;; 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
|
5712 ;; 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
|
5713 (defun tramp-completion-mode-p () |
108066
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
5714 "Check, 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
|
5715 (or |
107858 | 5716 ;; Signal from outside. `non-essential' has been introduced in Emacs 24. |
5717 (and (boundp 'non-essential) (symbol-value 'non-essential)) | |
85067
4636000015c5
* net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents:
85041
diff
changeset
|
5718 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
|
5719 ;; Emacs. |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84985
diff
changeset
|
5720 (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
|
5721 (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
|
5722 (or |
85067
4636000015c5
* net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents:
85041
diff
changeset
|
5723 ;; ?\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
|
5724 (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
|
5725 (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
|
5726 (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
|
5727 (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
|
5728 ;; XEmacs. |
84833
b8f420afb6df
* net/tramp.el (tramp-completion-mode-p): Rename from
Michael Albinus <michael.albinus@gmx.de>
parents:
84739
diff
changeset
|
5729 (and (featurep 'xemacs) |
b8f420afb6df
* net/tramp.el (tramp-completion-mode-p): Rename from
Michael Albinus <michael.albinus@gmx.de>
parents:
84739
diff
changeset
|
5730 ;; `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
|
5731 (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
|
5732 ;; `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
|
5733 (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
|
5734 (or |
85067
4636000015c5
* net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents:
85041
diff
changeset
|
5735 ;; ?\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
|
5736 (equal |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84985
diff
changeset
|
5737 (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
|
5738 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
|
5739 (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
|
5740 (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
|
5741 (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
|
5742 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
|
5743 (equal |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84985
diff
changeset
|
5744 (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
|
5745 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
|
5746 |
108033 | 5747 (defun tramp-connectable-p (filename) |
5748 "Check, whether it is possible to connect the remote host w/o side-effects. | |
5749 This is true, if either the remote host is already connected, or if we are | |
5750 not in completion mode." | |
5751 (and (tramp-tramp-file-p filename) | |
5752 (with-parsed-tramp-file-name filename nil | |
5753 (or (get-buffer (tramp-buffer-name v)) | |
5754 (not (tramp-completion-mode-p)))))) | |
5755 | |
47576
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
5756 ;; 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
|
5757 ;; `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
|
5758 ;; 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
|
5759 ;;;###autoload |
47576
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
5760 (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
|
5761 "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
|
5762 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5763 (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
|
5764 (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
|
5765 ;; Possible completion structures. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5766 (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
|
5767 result result1) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5768 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5769 (while v |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5770 (let* ((car (car v)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5771 (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
|
5772 (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
|
5773 (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
|
5774 (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
|
5775 (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
|
5776 (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
|
5777 all-user-hosts) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5778 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5779 (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
|
5780 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5781 (if (or user host) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5782 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5783 ;; 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
|
5784 (progn |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
5785 (mapc |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5786 (lambda (x) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5787 (setq all-user-hosts |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5788 (append all-user-hosts |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5789 (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
|
5790 (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
|
5791 |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
5792 (setq result |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
5793 (append result |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
5794 (mapcar |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
5795 (lambda (x) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
5796 (tramp-get-completion-user-host |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
5797 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
|
5798 (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
|
5799 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5800 ;; Possible methods. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5801 (setq result |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5802 (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
|
5803 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5804 (setq v (cdr v)))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5805 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5806 ;; 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
|
5807 (while result |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5808 (let ((car (car result))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5809 (when car |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5810 (add-to-list |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5811 'result1 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5812 (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
|
5813 (setq result (cdr result)))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5814 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5815 ;; Complete local parts. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5816 (append |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5817 result1 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5818 (condition-case nil |
108059
6469bf1a3a10
* net/tramp.el(tramp-completion-handle-file-name-all-completions):
Michael Albinus <albinus@detlef>
parents:
108033
diff
changeset
|
5819 (apply (if (tramp-connectable-p fullname) |
6469bf1a3a10
* net/tramp.el(tramp-completion-handle-file-name-all-completions):
Michael Albinus <albinus@detlef>
parents:
108033
diff
changeset
|
5820 'tramp-completion-run-real-handler |
6469bf1a3a10
* net/tramp.el(tramp-completion-handle-file-name-all-completions):
Michael Albinus <albinus@detlef>
parents:
108033
diff
changeset
|
5821 'tramp-run-real-handler) |
6469bf1a3a10
* net/tramp.el(tramp-completion-handle-file-name-all-completions):
Michael Albinus <albinus@detlef>
parents:
108033
diff
changeset
|
5822 'file-name-all-completions (list (list filename directory))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5823 (error nil))))) |
47576
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
5824 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
5825 ;; 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
|
5826 ;;;###autoload |
74766
ca4412906dbd
* net/ange-ftp.el (ange-ftp-file-name-completion): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents:
74739
diff
changeset
|
5827 (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
|
5828 (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
|
5829 "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
|
5830 (try-completion |
ca4412906dbd
* net/ange-ftp.el (ange-ftp-file-name-completion): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents:
74739
diff
changeset
|
5831 filename |
ca4412906dbd
* net/ange-ftp.el (ange-ftp-file-name-completion): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents:
74739
diff
changeset
|
5832 (mapcar 'list (file-name-all-completions filename directory)) |
108033 | 5833 (when (and predicate |
5834 (tramp-connectable-p (expand-file-name 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
|
5835 (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
|
5836 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
5837 ;; 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
|
5838 ;; 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
|
5839 ;; 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
|
5840 ;; 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
|
5841 ;; 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
|
5842 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
5843 ;; Expected results: |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
5844 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5845 ;; "/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
|
5846 ;; [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
|
5847 ;; [nil "x" nil nil] |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5848 ;; ["x" nil nil nil] |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5849 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5850 ;; "/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
|
5851 ;; [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
|
5852 ;; "/[x/" "/[x/y" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5853 ;; ["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
|
5854 ;; ["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
|
5855 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5856 ;; "/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
|
5857 ;; [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
|
5858 ;; "/[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
|
5859 ;; ["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
|
5860 (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
|
5861 "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
|
5862 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
|
5863 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
5864 (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
|
5865 (x-nil "\\|\\(\\)") |
100856
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5866 (tramp-completion-ipv6-regexp |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5867 (format |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5868 "[^%s]*" |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5869 (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
|
5870 tramp-postfix-host-format |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5871 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
|
5872 ;; "/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
|
5873 (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
|
5874 (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
|
5875 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
|
5876 ;; "/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
|
5877 (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
|
5878 (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
|
5879 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
|
5880 ;; "/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
|
5881 (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
|
5882 (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
|
5883 nil nil 1 nil)) |
100856
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5884 ;; "/[ipv6" "/[ipv6" |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5885 (tramp-completion-file-name-structure4 |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5886 (list (concat tramp-prefix-regexp |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5887 tramp-prefix-ipv6-regexp |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5888 "\\(" tramp-completion-ipv6-regexp x-nil "\\)$") |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5889 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
|
5890 ;; "/user@host" "/[user@host" |
100856
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5891 (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
|
5892 (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
|
5893 "\\(" 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
|
5894 "\\(" 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
|
5895 nil 1 2 nil)) |
100856
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5896 ;; "/user@[ipv6" "/[user@ipv6" |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5897 (tramp-completion-file-name-structure6 |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5898 (list (concat tramp-prefix-regexp |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5899 "\\(" 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
|
5900 tramp-prefix-ipv6-regexp |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5901 "\\(" tramp-completion-ipv6-regexp x-nil "\\)$") |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5902 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
|
5903 ;; "/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
|
5904 (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
|
5905 (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
|
5906 "\\(" 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
|
5907 "\\(" 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
|
5908 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
|
5909 ;; "/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
|
5910 (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
|
5911 (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
|
5912 "\\(" 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
|
5913 "\\(" 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
|
5914 1 nil 2 nil)) |
100856
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5915 ;; "/method:[ipv6" "/[method/ipv6" "/method://[ipv6" |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5916 (tramp-completion-file-name-structure9 |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5917 (list (concat tramp-prefix-regexp |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5918 "\\(" 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
|
5919 tramp-prefix-ipv6-regexp |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5920 "\\(" tramp-completion-ipv6-regexp x-nil "\\)$") |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5921 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
|
5922 ;; "/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
|
5923 (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
|
5924 (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
|
5925 "\\(" 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
|
5926 "\\(" 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
|
5927 "\\(" 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
|
5928 1 2 3 nil)) |
100856
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5929 ;; "/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
|
5930 (tramp-completion-file-name-structure11 |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5931 (list (concat tramp-prefix-regexp |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5932 "\\(" 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
|
5933 "\\(" 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
|
5934 tramp-prefix-ipv6-regexp |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5935 "\\(" tramp-completion-ipv6-regexp x-nil "\\)$") |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5936 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
|
5937 ;; "/method: "/method:/" |
100856
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5938 (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
|
5939 (list |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5940 (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
|
5941 (concat tramp-prefix-regexp |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5942 "\\(" tramp-method-regexp "\\)" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5943 "\\(" (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
|
5944 "\\|" (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
|
5945 "\\(" "\\)$") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5946 ;; 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
|
5947 (concat tramp-prefix-regexp "/$")) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5948 1 3 nil nil)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5949 ;; "/method: "/method:/" |
100856
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5950 (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
|
5951 (list |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5952 (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
|
5953 (concat tramp-prefix-regexp |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5954 "\\(" tramp-method-regexp "\\)" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5955 "\\(" (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
|
5956 "\\|" (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
|
5957 "\\(" "\\)$") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5958 ;; 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
|
5959 (concat tramp-prefix-regexp "/$")) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5960 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
|
5961 |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
5962 (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
|
5963 (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
|
5964 (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
|
5965 (list |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
5966 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
|
5967 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
|
5968 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
|
5969 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
|
5970 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
|
5971 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
|
5972 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
|
5973 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
|
5974 tramp-completion-file-name-structure9 |
100856
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5975 tramp-completion-file-name-structure10 |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5976 tramp-completion-file-name-structure11 |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5977 tramp-completion-file-name-structure12 |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
5978 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
|
5979 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
|
5980 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
5981 (delq nil result))) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
5982 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
5983 (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
|
5984 "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
|
5985 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
|
5986 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
|
5987 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5988 (save-match-data |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
5989 (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
|
5990 (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
|
5991 (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
|
5992 (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
|
5993 (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
|
5994 (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
|
5995 (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
|
5996 (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
|
5997 (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
|
5998 (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
|
5999 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6000 ;; 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
|
6001 ;; trailing method delimeter. |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6002 (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
|
6003 "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
|
6004 (mapcar |
09acf3f65bb5
* net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47771
diff
changeset
|
6005 (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
|
6006 (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
|
6007 (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
|
6008 (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
|
6009 (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
|
6010 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6011 ;; 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
|
6012 (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
|
6013 "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
|
6014 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
|
6015 (cond |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6016 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6017 ((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
|
6018 (if (and host |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6019 (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
|
6020 (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
|
6021 (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
|
6022 (setq user nil |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6023 host nil))) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6024 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6025 (partial-user |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6026 (setq host nil) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6027 (unless |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6028 (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
|
6029 (setq user nil))) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6030 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6031 (partial-host |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6032 (setq user nil) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6033 (unless |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6034 (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
|
6035 (setq host nil))) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6036 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6037 (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
|
6038 host nil))) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6039 |
47578
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6040 (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
|
6041 (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
|
6042 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6043 (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
|
6044 "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
|
6045 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
|
6046 ;; 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
|
6047 ;; `default-directory' is remote. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
6048 (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
|
6049 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
|
6050 (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
|
6051 (with-temp-buffer |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6052 (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
|
6053 (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
|
6054 (while (not (eobp)) |
47578
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6055 (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
|
6056 res)) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6057 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6058 (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
|
6059 "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
|
6060 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
|
6061 (let ((result) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6062 (regexp |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6063 (concat |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6064 "^\\(" tramp-host-regexp "\\)" |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6065 "\\([ \t]+" "\\(" tramp-user-regexp "\\)" "\\)?"))) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
6066 (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
|
6067 (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
|
6068 (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
|
6069 (widen) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6070 (forward-line 1) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6071 result)) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6072 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6073 (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
|
6074 "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
|
6075 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
|
6076 ;; 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
|
6077 ;; `default-directory' is remote. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
6078 (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
|
6079 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
|
6080 (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
|
6081 (with-temp-buffer |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6082 (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
|
6083 (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
|
6084 (while (not (eobp)) |
47578
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6085 (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
|
6086 res)) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6087 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6088 (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
|
6089 "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
|
6090 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
|
6091 (let ((result) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6092 (regexp (concat "^\\(" tramp-host-regexp "\\)"))) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
6093 (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
|
6094 (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
|
6095 (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
|
6096 (widen) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6097 (or |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6098 (> (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
|
6099 (forward-line 1)) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6100 result)) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6101 |
49612
407d6516031a
2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49598
diff
changeset
|
6102 (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
|
6103 "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
|
6104 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
|
6105 ;; 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
|
6106 ;; `default-directory' is remote. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
6107 (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
|
6108 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
|
6109 (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
|
6110 (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
|
6111 (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
|
6112 (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
|
6113 (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
|
6114 (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
|
6115 res)) |
407d6516031a
2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49598
diff
changeset
|
6116 |
407d6516031a
2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49598
diff
changeset
|
6117 (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
|
6118 "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
|
6119 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
|
6120 (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
|
6121 (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
|
6122 (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
|
6123 (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
|
6124 (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
|
6125 (widen) |
407d6516031a
2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49598
diff
changeset
|
6126 (or |
407d6516031a
2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49598
diff
changeset
|
6127 (> (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
|
6128 (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
|
6129 result)) |
407d6516031a
2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49598
diff
changeset
|
6130 |
54198
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
6131 (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
|
6132 "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
|
6133 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
|
6134 ;; 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
|
6135 ;; `default-directory' is remote. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
6136 (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
|
6137 (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
|
6138 (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
|
6139 result) |
54198
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
6140 (while files |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
6141 (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
|
6142 (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
|
6143 (setq files (cdr files))) |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
6144 result)) |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
6145 |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
6146 (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
|
6147 "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
|
6148 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
|
6149 ;; 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
|
6150 ;; `default-directory' is remote. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
6151 (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
|
6152 (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
|
6153 "\\)\\.ssh-\\(dss\\|rsa\\)\\.pub$")) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6154 (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
|
6155 result) |
54198
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
6156 (while files |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
6157 (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
|
6158 (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
|
6159 (setq files (cdr files))) |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
6160 result)) |
c1bfc266f10a
Tramp: sync with upstream version 2.0.39.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
53206
diff
changeset
|
6161 |
47576
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6162 (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
|
6163 "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
|
6164 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
|
6165 ;; 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
|
6166 ;; `default-directory' is remote. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
6167 (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
|
6168 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
|
6169 (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
|
6170 (with-temp-buffer |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6171 (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
|
6172 (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
|
6173 (while (not (eobp)) |
47578
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6174 (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
|
6175 res)) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6176 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6177 (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
|
6178 "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
|
6179 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
|
6180 (let ((result) |
100856
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
6181 (regexp |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
6182 (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
|
6183 (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
|
6184 (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
|
6185 (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
|
6186 (widen) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6187 (or |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6188 (> (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
|
6189 (forward-line 1)) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6190 result)) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6191 |
49612
407d6516031a
2003-02-05 Kai Gro?ohann <kai.grossjohann@uni-duisburg.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49598
diff
changeset
|
6192 ;; 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
|
6193 ;; 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
|
6194 ;; 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
|
6195 ;; 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
|
6196 (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
|
6197 "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
|
6198 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
|
6199 ;; 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
|
6200 ;; `default-directory' is remote. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
6201 (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
|
6202 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
|
6203 (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
|
6204 '(("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
|
6205 (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
|
6206 (with-temp-buffer |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6207 (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
|
6208 (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
|
6209 (while (not (eobp)) |
47578
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6210 (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
|
6211 res))) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6212 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6213 (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
|
6214 "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
|
6215 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
|
6216 (let ((result) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6217 (regexp (concat "^\\(" tramp-user-regexp "\\):"))) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
6218 (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
|
6219 (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
|
6220 (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
|
6221 (widen) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6222 (forward-line 1) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6223 result)) |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
6224 |
47578
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6225 (defun tramp-parse-netrc (filename) |
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6226 "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
|
6227 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
|
6228 ;; 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
|
6229 ;; `default-directory' is remote. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
6230 (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
|
6231 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
|
6232 (when (file-readable-p filename) |
47578
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6233 (with-temp-buffer |
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6234 (insert-file-contents filename) |
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6235 (goto-char (point-min)) |
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6236 (while (not (eobp)) |
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6237 (push (tramp-parse-netrc-group) res)))) |
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6238 res)) |
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6239 |
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6240 (defun tramp-parse-netrc-group () |
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6241 "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
|
6242 User may be nil." |
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6243 (let ((result) |
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6244 (regexp |
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6245 (concat |
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6246 "^[ \t]*machine[ \t]+" "\\(" tramp-host-regexp "\\)" |
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6247 "\\([ \t]+login[ \t]+" "\\(" tramp-user-regexp "\\)" "\\)?"))) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
6248 (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
|
6249 (when (re-search-forward regexp nil t) |
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6250 (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
|
6251 (widen) |
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6252 (forward-line 1) |
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6253 result)) |
6e910ba94c42
Version 2.0.22 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47577
diff
changeset
|
6254 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6255 (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
|
6256 "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
|
6257 User is always nil." |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6258 ;; 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
|
6259 ;; `default-directory' is remote. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
6260 (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
|
6261 res) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6262 (with-temp-buffer |
85694
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
6263 (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
|
6264 (goto-char (point-min)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6265 (while (not (eobp)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6266 (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
|
6267 res)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6268 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6269 (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
|
6270 "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
|
6271 User is always nil." |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6272 (let ((result) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6273 (regexp (concat (regexp-quote registry) "\\\\\\(.+\\)"))) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
6274 (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
|
6275 (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
|
6276 (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
|
6277 (widen) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6278 (forward-line 1) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6279 result)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6280 |
45861 | 6281 ;;; Internal Functions: |
6282 | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6283 (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
|
6284 "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
|
6285 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
|
6286 (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
|
6287 (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
|
6288 (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
|
6289 (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
|
6290 ;; 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
|
6291 (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
|
6292 vec |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6293 (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
|
6294 (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
|
6295 (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
|
6296 (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
|
6297 |
45861 | 6298 (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
|
6299 (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
|
6300 (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
|
6301 'tramp-sh-file-name-handler) |
45861 | 6302 auto-save-default) |
6303 (auto-save-mode 1))) | |
6304 (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
|
6305 (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
|
6306 (lambda () |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
6307 (remove-hook 'find-file-hooks 'tramp-set-auto-save))) |
45861 | 6308 |
6309 (defun tramp-run-test (switch filename) | |
6310 "Run `test' on the remote system, given a SWITCH and a FILENAME. | |
6311 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
|
6312 (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
|
6313 (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
|
6314 v |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6315 (format |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6316 "%s %s %s" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6317 (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
|
6318 switch |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6319 (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
|
6320 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6321 (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
|
6322 "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
|
6323 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
|
6324 Returns the exit code of the `test' program. Barfs if the methods, |
45861 | 6325 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
|
6326 (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
|
6327 (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
|
6328 (tramp-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6329 v 'file-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6330 "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
|
6331 (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
|
6332 (with-parsed-tramp-file-name file1 v2 |
45861 | 6333 (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
|
6334 v1 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6335 (format format-string |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6336 (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
|
6337 (tramp-shell-quote-argument v2-localname)))))) |
45861 | 6338 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6339 (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
|
6340 "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
|
6341 ;; 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
|
6342 ;; 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
|
6343 ;; tamper the name. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6344 (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
|
6345 (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
|
6346 (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
|
6347 (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
|
6348 (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
|
6349 (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
|
6350 |
105718
828d51e45d15
* net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents:
105615
diff
changeset
|
6351 (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
|
6352 "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
|
6353 (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
|
6354 (condition-case nil |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
108236
diff
changeset
|
6355 (tramp-compat-delete-file tramp-temp-buffer-file-name 'force) |
105718
828d51e45d15
* net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents:
105615
diff
changeset
|
6356 (error nil)))) |
828d51e45d15
* net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents:
105615
diff
changeset
|
6357 |
828d51e45d15
* net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents:
105615
diff
changeset
|
6358 (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
|
6359 (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
|
6360 (lambda () |
828d51e45d15
* net/tramp.el (top): Remove `tramp-rfn-eshadow-update-overlay'
Michael Albinus <michael.albinus@gmx.de>
parents:
105615
diff
changeset
|
6361 (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
|
6362 '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
|
6363 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6364 (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
|
6365 "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
|
6366 (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
|
6367 (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
|
6368 (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
|
6369 (setq default-directory |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6370 (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
|
6371 (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
|
6372 (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
|
6373 (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
|
6374 "/")) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6375 (current-buffer)))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6376 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6377 (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
|
6378 "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
|
6379 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
|
6380 from `tramp-get-buffer'." |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6381 (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
|
6382 (tramp-get-buffer vec))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6383 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6384 (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
|
6385 "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
|
6386 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
|
6387 from the default one." |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6388 (get-process |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6389 (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
|
6390 (tramp-buffer-name vec)))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6391 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6392 (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
|
6393 "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
|
6394 ;; 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
|
6395 ;; 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
|
6396 ;; tamper the name. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6397 (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
|
6398 (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
|
6399 (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
|
6400 (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
|
6401 (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
|
6402 (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
|
6403 |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
6404 (defconst tramp-debug-outline-regexp |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
6405 "[0-9]+:[0-9]+:[0-9]+\\.[0-9]+ [a-z0-9-]+ (\\([0-9]+\\)) #") |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
6406 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6407 (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
|
6408 "Get the debug buffer for VEC." |
59582
92796330257a
Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents:
59031
diff
changeset
|
6409 (with-current-buffer |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6410 (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
|
6411 (when (bobp) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6412 (setq buffer-undo-list t) |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
6413 ;; Activate `outline-mode'. This runs `text-mode-hook' and |
84966
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
6414 ;; `outline-mode-hook'. We must prevent that local processes |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
6415 ;; die. Yes: I've seen `flyspell-mode', which starts "ispell". |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
6416 ;; Furthermore, `outline-regexp' must have the correct value |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
6417 ;; already, because it is used by `font-lock-compile-keywords'. |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
6418 (let ((default-directory (tramp-compat-temporary-file-directory)) |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
6419 (outline-regexp tramp-debug-outline-regexp)) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6420 (outline-mode)) |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
6421 (set (make-local-variable 'outline-regexp) tramp-debug-outline-regexp) |
84966
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
6422 (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
|
6423 (current-buffer))) |
45861 | 6424 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6425 (defun tramp-outline-level () |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6426 "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
|
6427 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
|
6428 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6429 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
|
6430 (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
|
6431 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6432 (defun tramp-find-executable |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6433 (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
|
6434 "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
|
6435 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
|
6436 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
|
6437 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
|
6438 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
|
6439 only in DIRLIST. |
45861 | 6440 |
49995
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
6441 Returns the absolute file name of PROGNAME, if found, and nil otherwise. |
45861 | 6442 |
6443 This function expects to be in the right *tramp* buffer." | |
107498
40467a8dcd6c
* net/tramp.el (tramp-find-executable): Use
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
6444 (with-current-buffer (tramp-get-connection-buffer vec) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6445 (let (result) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6446 ;; 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
|
6447 ;; 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
|
6448 ;; 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
|
6449 (unless ignore-path |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6450 (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
|
6451 (goto-char (point-min)) |
107498
40467a8dcd6c
* net/tramp.el (tramp-find-executable): Use
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
6452 (if (looking-at "^\\s-*1$") |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6453 (setq result (concat "\\" progname)))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6454 (unless result |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6455 (when ignore-tilde |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
6456 ;; Remove all ~/foo directories from dirlist. In XEmacs, |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6457 ;; `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
|
6458 (let (newdl d) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6459 (while dirlist |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6460 (setq d (car dirlist)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6461 (setq dirlist (cdr dirlist)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6462 (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
|
6463 (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
|
6464 (setq dirlist (nreverse newdl)))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6465 (tramp-send-command |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6466 vec |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6467 (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
|
6468 "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
|
6469 "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
|
6470 "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
|
6471 "%s\nEOF") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6472 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
|
6473 (goto-char (point-max)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6474 (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
|
6475 (skip-chars-forward "^ ") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6476 (skip-chars-forward " ") |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
6477 (setq result (buffer-substring |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
6478 (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
|
6479 result))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6480 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6481 (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
|
6482 "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
|
6483 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
|
6484 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
|
6485 variable PATH." |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6486 (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
|
6487 (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
|
6488 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
|
6489 (mapconcat 'identity (tramp-get-remote-path vec) ":")))) |
45861 | 6490 |
91486
76c777ce052a
* net/tramp.el (tramp-process-sentinel): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
88072
diff
changeset
|
6491 ;; ------------------------------------------------------------ |
76c777ce052a
* net/tramp.el (tramp-process-sentinel): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
88072
diff
changeset
|
6492 ;; -- Communication with external shell -- |
76c777ce052a
* net/tramp.el (tramp-process-sentinel): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
88072
diff
changeset
|
6493 ;; ------------------------------------------------------------ |
45861 | 6494 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6495 (defun tramp-find-file-exists-command (vec) |
45861 | 6496 "Find a command on the remote host for checking if a file exists. |
6497 Here, we are looking for a command which has zero exit status if the | |
6498 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
|
6499 (let ((existing "/") |
45861 | 6500 (nonexisting |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6501 (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
|
6502 result) |
45861 | 6503 ;; The algorithm is as follows: we try a list of several commands. |
6504 ;; For each command, we first run `$cmd /' -- this should return | |
6505 ;; 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
|
6506 ;; `$cmd /this\ file\ does\ not\ exist ', hoping that the file indeed |
45861 | 6507 ;; does not exist. This should return false. We use the first |
6508 ;; command we find that seems to work. | |
6509 ;; 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
|
6510 ;; `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
|
6511 ;; 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
|
6512 ;; 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
|
6513 ;; `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
|
6514 ;; 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
|
6515 ;; `/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
|
6516 ;; 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
|
6517 ;; 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
|
6518 ;; `/usr/bin/test'. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6519 ;; `/usr/bin/test -e' In case `/bin/test' does not exist. |
45861 | 6520 (unless (or |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6521 (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
|
6522 (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
|
6523 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
|
6524 (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
|
6525 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
|
6526 (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
|
6527 (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
|
6528 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
|
6529 (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
|
6530 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
|
6531 (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
|
6532 (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
|
6533 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
|
6534 (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
|
6535 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
|
6536 (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
|
6537 (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
|
6538 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
|
6539 (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
|
6540 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
|
6541 (tramp-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6542 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
|
6543 result)) |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59582
diff
changeset
|
6544 |
45861 | 6545 ;; 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
|
6546 (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
|
6547 "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
|
6548 (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
|
6549 (let (shell) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6550 (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
|
6551 (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
|
6552 (cond |
107498
40467a8dcd6c
* net/tramp.el (tramp-find-executable): Use
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
6553 ((or (string-match "^~root$" (buffer-string)) |
40467a8dcd6c
* net/tramp.el (tramp-find-executable): Use
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
6554 ;; The default shell (ksh93) of OpenSolaris is buggy. |
40467a8dcd6c
* net/tramp.el (tramp-find-executable): Use
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
6555 (string-equal (tramp-get-connection-property vec "uname" "") |
40467a8dcd6c
* net/tramp.el (tramp-find-executable): Use
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
6556 "SunOS 5.11")) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6557 (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
|
6558 (or (tramp-find-executable |
107498
40467a8dcd6c
* net/tramp.el (tramp-find-executable): Use
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
6559 vec "bash" (tramp-get-remote-path vec) t t) |
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
|
6560 (tramp-find-executable |
107498
40467a8dcd6c
* net/tramp.el (tramp-find-executable): Use
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
6561 vec "ksh" (tramp-get-remote-path vec) t t))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6562 (unless shell |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6563 (tramp-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6564 vec 'file-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6565 "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
|
6566 ;; 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
|
6567 (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
|
6568 item extra-args) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6569 (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
|
6570 (setq item (pop alist)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6571 (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
|
6572 (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
|
6573 (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
|
6574 (tramp-message |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6575 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
|
6576 (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
|
6577 (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
|
6578 vec |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
6579 (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
|
6580 (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
|
6581 t)) |
87921
c49bc2860fd0
* net/tramp.el (tramp-remote-process-environment): Set "LC_ALL=C".
Michael Albinus <michael.albinus@gmx.de>
parents:
87748
diff
changeset
|
6582 ;; Setting prompts. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6583 (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
|
6584 (tramp-send-command |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
6585 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
|
6586 (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
|
6587 (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
|
6588 (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
|
6589 (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
|
6590 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6591 (t (tramp-message |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6592 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
|
6593 (tramp-get-method-parameter |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6594 (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
|
6595 (tramp-set-connection-property |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6596 vec "remote-shell" |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6597 (tramp-get-method-parameter |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6598 (tramp-file-name-method vec) 'tramp-remote-sh)))))))) |
45861 | 6599 |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59582
diff
changeset
|
6600 ;; ------------------------------------------------------------ |
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59582
diff
changeset
|
6601 ;; -- 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
|
6602 ;; ------------------------------------------------------------ |
45861 | 6603 |
46752 | 6604 ;; The following functions are actions to be taken when seeing certain |
6605 ;; prompts from the remote host. See the variable | |
6606 ;; `tramp-actions-before-shell' for usage of these functions. | |
6607 | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6608 (defun tramp-action-login (proc vec) |
46752 | 6609 "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
|
6610 (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
|
6611 (save-window-excursion |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6612 (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
|
6613 (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
|
6614 (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
|
6615 (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
|
6616 (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
|
6617 (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
|
6618 (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
|
6619 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6620 (defun tramp-action-password (proc vec) |
46752 | 6621 "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
|
6622 (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
|
6623 (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
|
6624 (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
|
6625 (tramp-enter-password proc)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6626 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6627 (defun tramp-action-succeed (proc vec) |
46752 | 6628 "Signal success in finding shell prompt." |
6629 (throw 'tramp-action 'ok)) | |
6630 | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6631 (defun tramp-action-permission-denied (proc vec) |
46752 | 6632 "Signal permission denied." |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6633 (kill-process proc) |
46752 | 6634 (throw 'tramp-action 'permission-denied)) |
6635 | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6636 (defun tramp-action-yesno (proc vec) |
46992
6529728ddf05
Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46835
diff
changeset
|
6637 "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
|
6638 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
|
6639 See also `tramp-action-yn'." |
46752 | 6640 (save-window-excursion |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6641 (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
|
6642 (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
|
6643 (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
|
6644 (kill-process proc) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6645 (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
|
6646 (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
|
6647 (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
|
6648 (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
|
6649 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6650 (defun tramp-action-yn (proc vec) |
46992
6529728ddf05
Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46835
diff
changeset
|
6651 "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
|
6652 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
|
6653 See also `tramp-action-yesno'." |
6529728ddf05
Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46835
diff
changeset
|
6654 (save-window-excursion |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6655 (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
|
6656 (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
|
6657 (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
|
6658 (kill-process proc) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6659 (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
|
6660 (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
|
6661 (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
|
6662 (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
|
6663 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6664 (defun tramp-action-terminal (proc vec) |
47771
ac3dfc909b56
Version 2.0.25 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47683
diff
changeset
|
6665 "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
|
6666 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
|
6667 (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
|
6668 (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
|
6669 (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
|
6670 (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
|
6671 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6672 (defun tramp-action-process-alive (proc vec) |
108066
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
6673 "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
|
6674 (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
|
6675 (throw 'tramp-action 'process-died))) |
4bc6cb45c326
Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents:
55420
diff
changeset
|
6676 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6677 (defun tramp-action-out-of-band (proc vec) |
108066
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
6678 "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
|
6679 (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
|
6680 (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
|
6681 (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
|
6682 (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
|
6683 ((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
|
6684 (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
|
6685 (memq (process-status proc) '(signal))) |
59582
92796330257a
Sync with Tramp 2.0.47.
Michael Albinus <michael.albinus@gmx.de>
parents:
59031
diff
changeset
|
6686 ;; `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
|
6687 ;; 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
|
6688 (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
|
6689 (goto-char (point-min)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6690 (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
|
6691 (progn |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6692 (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
|
6693 (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
|
6694 (throw 'tramp-action 'ok)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6695 (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
|
6696 (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
|
6697 (t nil))) |
c44f9de543e3
2004-05-07 Kai Grossjohann <kai@emptydomain.de>
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
54198
diff
changeset
|
6698 |
46752 | 6699 ;; Functions for processing the actions. |
6700 | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6701 (defun tramp-process-one-action (proc vec actions) |
46752 | 6702 "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
|
6703 (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
|
6704 (while (not found) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6705 ;; 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
|
6706 ;; 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
|
6707 (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
|
6708 (setq todo actions) |
bdffb0038313
* net/tramp.el: (tramp-process-one-action): Remove `with-timeout'.
Michael Albinus <michael.albinus@gmx.de>
parents:
75007
diff
changeset
|
6709 (while todo |
bdffb0038313
* net/tramp.el: (tramp-process-one-action): Remove `with-timeout'.
Michael Albinus <michael.albinus@gmx.de>
parents:
75007
diff
changeset
|
6710 (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
|
6711 (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
|
6712 (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
|
6713 (tramp-message |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6714 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
|
6715 (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
|
6716 (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
|
6717 (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
|
6718 found)) |
bdffb0038313
* net/tramp.el: (tramp-process-one-action): Remove `with-timeout'.
Michael Albinus <michael.albinus@gmx.de>
parents:
75007
diff
changeset
|
6719 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6720 (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
|
6721 "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
|
6722 ;; Enable auth-source and password-cache. |
107151
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
6723 (tramp-set-connection-property vec "first-password-request" t) |
46752 | 6724 (let (exit) |
6725 (while (not exit) | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6726 (tramp-message proc 3 "Waiting for prompts from remote shell") |
46752 | 6727 (setq exit |
6728 (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
|
6729 (if timeout |
bdffb0038313
* net/tramp.el: (tramp-process-one-action): Remove `with-timeout'.
Michael Albinus <michael.albinus@gmx.de>
parents:
75007
diff
changeset
|
6730 (with-timeout (timeout) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6731 (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
|
6732 (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
|
6733 (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
|
6734 (tramp-message vec 6 "\n%s" (buffer-string))) |
46752 | 6735 (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
|
6736 (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
|
6737 (tramp-error-with-buffer |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6738 nil vec 'file-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6739 (cond |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6740 ((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
|
6741 ((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
|
6742 (t "Login failed")))))) |
45861 | 6743 |
6744 ;; Utility functions. | |
6745 | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6746 (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
|
6747 "Like `accept-process-output' for Tramp processes. |
060177e931f8
Sync with Tramp 2.0.50.
Michael Albinus <michael.albinus@gmx.de>
parents:
64701
diff
changeset
|
6748 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
|
6749 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
|
6750 (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
|
6751 (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
|
6752 (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
|
6753 ;; 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
|
6754 ;; 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
|
6755 (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
|
6756 (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
|
6757 (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
|
6758 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6759 (defun tramp-check-for-regexp (proc regexp) |
108066
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
6760 "Check, whether REGEXP is contained in process buffer of PROC. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6761 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
|
6762 (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
|
6763 (goto-char (point-min)) |
94975
5bb8f7b3f835
* net/tramp.el (tramp-echo-mark): Update docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
94677
diff
changeset
|
6764 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6765 ;; 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
|
6766 (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
|
6767 (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
|
6768 (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
|
6769 (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
|
6770 ;; 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
|
6771 (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
|
6772 (tramp-message proc 5 "echo-mark found") |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
6773 (forward-line 1) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6774 (delete-region begin (point)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6775 (goto-char (point-min))))) |
94975
5bb8f7b3f835
* net/tramp.el (tramp-echo-mark): Update docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
94677
diff
changeset
|
6776 |
106597
b0e5aae20733
* net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents:
106508
diff
changeset
|
6777 (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
|
6778 ;; 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
|
6779 (not (string-equal |
b0e5aae20733
* net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents:
106508
diff
changeset
|
6780 (substring-no-properties |
b0e5aae20733
* net/tramp.el (tramp-echo-mark-marker-length): New defconst.
Michael Albinus <michael.albinus@gmx.de>
parents:
106508
diff
changeset
|
6781 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
|
6782 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
|
6783 (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
|
6784 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
|
6785 ;; 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
|
6786 (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
|
6787 (re-search-forward regexp nil t)))) |
64772
060177e931f8
Sync with Tramp 2.0.50.
Michael Albinus <michael.albinus@gmx.de>
parents:
64701
diff
changeset
|
6788 |
45861 | 6789 (defun tramp-wait-for-regexp (proc timeout regexp) |
6790 "Wait for a REGEXP to appear from process PROC within TIMEOUT seconds. | |
6791 Expects the output of PROC to be sent to the current buffer. Returns | |
6792 the string that matched, or nil. Waits indefinitely if TIMEOUT is | |
6793 nil." | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6794 (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
|
6795 (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
|
6796 (start-time (current-time))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6797 (cond (timeout |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6798 ;; 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
|
6799 ;; 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
|
6800 ;; 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
|
6801 (while (and (not found) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6802 (< (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
|
6803 timeout)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6804 (with-timeout (timeout) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6805 (while (not found) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6806 (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
|
6807 (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
|
6808 (tramp-error-with-buffer |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6809 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
|
6810 (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
|
6811 (t |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6812 (while (not found) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6813 (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
|
6814 (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
|
6815 (tramp-error-with-buffer |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6816 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
|
6817 (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
|
6818 (tramp-message proc 6 "\n%s" (buffer-string)) |
45861 | 6819 (when (not found) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6820 (if timeout |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6821 (tramp-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6822 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
|
6823 regexp timeout) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6824 (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
|
6825 found))) |
51177
6234a4fe96f9
Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
50494
diff
changeset
|
6826 |
6234a4fe96f9
Version 2.0.34 (of Tramp) released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
50494
diff
changeset
|
6827 (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
|
6828 "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
|
6829 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
|
6830 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
|
6831 (unless |
4ccd437aad2e
* net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents:
85542
diff
changeset
|
6832 (tramp-wait-for-regexp |
4ccd437aad2e
* net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents:
85542
diff
changeset
|
6833 proc timeout |
4ccd437aad2e
* net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents:
85542
diff
changeset
|
6834 (format |
4ccd437aad2e
* net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents:
85542
diff
changeset
|
6835 "\\(%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
|
6836 (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
|
6837 |
85553
4ccd437aad2e
* net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents:
85542
diff
changeset
|
6838 ;; 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
|
6839 ;; 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
|
6840 ;; string. |
4ccd437aad2e
* net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents:
85542
diff
changeset
|
6841 (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
|
6842 "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
|
6843 (process-send-string |
85553
4ccd437aad2e
* net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents:
85542
diff
changeset
|
6844 proc (concat (tramp-read-passwd proc) |
4ccd437aad2e
* net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents:
85542
diff
changeset
|
6845 (or (tramp-get-method-parameter |
4ccd437aad2e
* net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents:
85542
diff
changeset
|
6846 tramp-current-method |
4ccd437aad2e
* net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents:
85542
diff
changeset
|
6847 'tramp-password-end-of-line) |
4ccd437aad2e
* net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents:
85542
diff
changeset
|
6848 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
|
6849 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6850 (defun tramp-open-connection-setup-interactive-shell (proc vec) |
45861 | 6851 "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
|
6852 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
|
6853 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
|
6854 (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
|
6855 ;; 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
|
6856 ;; 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
|
6857 ;; 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
|
6858 ;; 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
|
6859 ;; 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
|
6860 ;; 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
|
6861 ;; 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
|
6862 ;; 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
|
6863 ;; 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
|
6864 ;; 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
|
6865 ;; 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
|
6866 ;; 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
|
6867 ;; 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
|
6868 ;; discarded as well. |
85694
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
6869 (tramp-send-command |
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
6870 vec |
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
6871 (format |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
6872 "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
|
6873 (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
|
6874 (tramp-get-method-parameter |
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
6875 (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
|
6876 t) |
4a7e0b7fde4e
* net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents:
86224
diff
changeset
|
6877 |
4a7e0b7fde4e
* net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents:
86224
diff
changeset
|
6878 ;; Disable echo. |
4a7e0b7fde4e
* net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents:
86224
diff
changeset
|
6879 (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
|
6880 (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
|
6881 ;; 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
|
6882 ;; 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
|
6883 ;; support disabling. |
4a7e0b7fde4e
* net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents:
86224
diff
changeset
|
6884 (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
|
6885 (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
|
6886 (goto-char (point-min)) |
4a7e0b7fde4e
* net/tramp.el (tramp-open-connection-setup-interactive-shell):
Michael Albinus <michael.albinus@gmx.de>
parents:
86224
diff
changeset
|
6887 (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
|
6888 (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
|
6889 (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
|
6890 ;; 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
|
6891 ;; 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
|
6892 (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
|
6893 |
85553
4ccd437aad2e
* net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents:
85542
diff
changeset
|
6894 (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
|
6895 (tramp-send-command |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
6896 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
|
6897 (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
|
6898 (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
|
6899 (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
|
6900 |
45861 | 6901 ;; Try to set up the coding system correctly. |
6902 ;; 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
|
6903 (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
|
6904 (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
|
6905 (with-current-buffer (process-buffer proc) |
45861 | 6906 (goto-char (point-min)) |
6907 (if (featurep 'mule) | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6908 ;; 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
|
6909 ;; with the process. |
85126
9a6e9b6e4a76
Sync with Tramp 2.1.11.
Michael Albinus <michael.albinus@gmx.de>
parents:
85089
diff
changeset
|
6910 (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
|
6911 (cons 'undecided 'undecided))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6912 cs-decode cs-encode) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6913 (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
|
6914 (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
|
6915 (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
|
6916 (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
|
6917 (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
|
6918 (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
|
6919 cs-encode 'unix)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6920 (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
|
6921 (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
|
6922 cs-decode 'dos))) |
85126
9a6e9b6e4a76
Sync with Tramp 2.1.11.
Michael Albinus <michael.albinus@gmx.de>
parents:
85089
diff
changeset
|
6923 (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
|
6924 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
|
6925 (tramp-message |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
6926 vec 5 "Setting coding system to `%s' and `%s'" cs-decode cs-encode)) |
45861 | 6927 ;; Look for ^M and do something useful if found. |
6928 (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
|
6929 ;; 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
|
6930 ;; 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
|
6931 ;; stty, instead. |
85553
4ccd437aad2e
* net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents:
85542
diff
changeset
|
6932 (tramp-send-command vec "stty -onlcr" t)))) |
107021
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
6933 ;; Dump stty settings in the traces. |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
6934 (when (>= tramp-verbose 10) |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
6935 (tramp-send-command vec "stty -a" t)) |
85553
4ccd437aad2e
* net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents:
85542
diff
changeset
|
6936 (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
|
6937 |
766c1ba3d613
* net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents:
85970
diff
changeset
|
6938 ;; 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
|
6939 ;; 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
|
6940 ;; 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
|
6941 ;; `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
|
6942 (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
|
6943 (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
|
6944 (new-uname |
766c1ba3d613
* net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents:
85970
diff
changeset
|
6945 (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
|
6946 vec "uname" |
766c1ba3d613
* net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents:
85970
diff
changeset
|
6947 (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
|
6948 (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
|
6949 (with-current-buffer (tramp-get-debug-buffer vec) |
108158
94e4a7a7cadf
* net/tramp.el (tramp-remote-selinux-p): New defun.
Michael Albinus <albinus@detlef>
parents:
108077
diff
changeset
|
6950 ;; 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
|
6951 (rename-buffer |
940a290a5646
* net/tramp.el (tramp-methods): Add "-q" for "scp", "scp1",
Michael Albinus <michael.albinus@gmx.de>
parents:
96392
diff
changeset
|
6952 (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
|
6953 (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
|
6954 (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
|
6955 (kill-buffer nil) |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
6956 (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
|
6957 ;; 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
|
6958 (tramp-get-buffer vec) |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
6959 (tramp-message |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
6960 vec 3 |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
6961 "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
|
6962 old-uname new-uname) |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
6963 (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
|
6964 |
766c1ba3d613
* net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents:
85970
diff
changeset
|
6965 ;; 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
|
6966 ;; `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
|
6967 ;; `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
|
6968 ;; 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
|
6969 ;; 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
|
6970 ;; hosts, though. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6971 (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
|
6972 (cond |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6973 ((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
|
6974 tramp-chunksize) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6975 (t |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6976 (tramp-message |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6977 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
|
6978 (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
|
6979 "^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
|
6980 500 0)))) |
86048
766c1ba3d613
* net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
Michael Albinus <michael.albinus@gmx.de>
parents:
85970
diff
changeset
|
6981 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6982 ;; Set remote PATH variable. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6983 (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
|
6984 |
45861 | 6985 ;; Search for a good shell before searching for a command which |
6986 ;; checks if a file exists. This is done because Tramp wants to use | |
6987 ;; "test foo; echo $?" to check if various conditions hold, and | |
6988 ;; there are buggy /bin/sh implementations which don't execute the | |
6989 ;; "echo $?" part if the "test" part has an error. In particular, | |
107498
40467a8dcd6c
* net/tramp.el (tramp-find-executable): Use
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
6990 ;; the OpenSolaris /bin/sh is a problem. There are also other |
40467a8dcd6c
* net/tramp.el (tramp-find-executable): Use
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
6991 ;; problems with /bin/sh of OpenSolaris, like redirection of stderr |
40467a8dcd6c
* net/tramp.el (tramp-find-executable): Use
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
6992 ;; in in function declarations, or changing HISTFILE in place. |
40467a8dcd6c
* net/tramp.el (tramp-find-executable): Use
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
6993 ;; Therefore, OpenSolaris' /bin/sh is replaced by bash, when |
40467a8dcd6c
* net/tramp.el (tramp-find-executable): Use
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
6994 ;; detected. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6995 (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
|
6996 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
6997 ;; Disable unexpected output. |
85553
4ccd437aad2e
* net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents:
85542
diff
changeset
|
6998 (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
|
6999 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7000 ;; Set the environment. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7001 (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
|
7002 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7003 (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
|
7004 unset item) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7005 (while env |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
7006 (setq item (tramp-compat-split-string (car env) "=")) |
107021
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
7007 (setcdr item (mapconcat 'identity (cdr item) "=")) |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
7008 (if (and (stringp (cdr item)) (not (string-equal (cdr item) ""))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7009 (tramp-send-command |
107021
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
7010 vec (format "%s=%s; export %s" (car item) (cdr 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
|
7011 (push (car item) unset)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7012 (setq env (cdr env))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7013 (when unset |
45861 | 7014 (tramp-send-command |
85553
4ccd437aad2e
* net/tramp.el (tramp-find-shell)
Michael Albinus <michael.albinus@gmx.de>
parents:
85542
diff
changeset
|
7015 vec (format "unset %s" (mapconcat 'identity unset " "))))) t) |
45861 | 7016 |
46752 | 7017 ;; CCC: We should either implement a Perl version of base64 encoding |
7018 ;; and decoding. Then we just use that in the last item. The other | |
7019 ;; alternative is to use the Perl version of UU encoding. But then | |
7020 ;; 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
|
7021 ;; |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
7022 ;; 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
|
7023 ;; 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
|
7024 ;; 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
|
7025 ;; 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
|
7026 ;; 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
|
7027 ;; 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
|
7028 ;; 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
|
7029 ;; 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
|
7030 ;; |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
7031 ;; 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
|
7032 ;; |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
7033 ;; 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
|
7034 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7035 (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
|
7036 '((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
|
7037 (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
|
7038 (pack |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7039 "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
|
7040 "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
|
7041 "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
|
7042 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
|
7043 |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
7044 \(FORMAT ENCODING DECODING\) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7045 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7046 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
|
7047 `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
|
7048 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7049 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
|
7050 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
|
7051 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
|
7052 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
|
7053 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
|
7054 input. |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
7055 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
7056 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
|
7057 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
|
7058 with the encoded or decoded results, respectively.") |
46752 | 7059 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7060 (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
|
7061 '((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
|
7062 (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
|
7063 (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
|
7064 (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
|
7065 (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
|
7066 (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
|
7067 (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
|
7068 (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
|
7069 (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
|
7070 (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
|
7071 (pack |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7072 "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
|
7073 "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
|
7074 "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
|
7075 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
|
7076 |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
7077 \(FORMAT ENCODING DECODING\) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7078 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7079 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
|
7080 `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
|
7081 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7082 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
|
7083 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
|
7084 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
|
7085 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
|
7086 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
|
7087 input. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7088 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7089 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
|
7090 implementation for this functionality. This Perl program will be transferred |
106895
181539c8b6a4
Fix typos in docstrings, error messages, etc.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
7091 to the remote host, and it is available as shell function with the same name.") |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7092 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7093 (defun tramp-find-inline-encoding (vec) |
46752 | 7094 "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
|
7095 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
|
7096 `tramp-remote-coding-commands'." |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7097 (save-excursion |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7098 (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
|
7099 (magic "xyzzy") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7100 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
|
7101 (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
|
7102 (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
|
7103 (catch 'wont-work-local |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7104 (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
|
7105 (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
|
7106 (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
|
7107 (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
|
7108 ;; 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
|
7109 ;; 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
|
7110 (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
|
7111 (tramp-message |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7112 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
|
7113 (tramp-message |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7114 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
|
7115 (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
|
7116 loc-enc nil nil)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7117 (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
|
7118 (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
|
7119 (tramp-message |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7120 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
|
7121 (tramp-message |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7122 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
|
7123 (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
|
7124 loc-dec nil nil)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7125 (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
|
7126 ;; 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
|
7127 (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
|
7128 (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
|
7129 (catch 'wont-work-remote |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7130 (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
|
7131 (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
|
7132 (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
|
7133 ;; 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
|
7134 ;; 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
|
7135 ;; 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
|
7136 ;; 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
|
7137 ;; 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
|
7138 ;; 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
|
7139 ;; 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
|
7140 ;; 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
|
7141 (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
|
7142 (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
|
7143 (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
|
7144 (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
|
7145 (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
|
7146 (setq rem-enc name))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7147 (tramp-message |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7148 vec 5 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7149 "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
|
7150 (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
|
7151 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
|
7152 (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
|
7153 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7154 (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
|
7155 (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
|
7156 (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
|
7157 (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
|
7158 (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
|
7159 (setq rem-dec name))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7160 (tramp-message |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7161 vec 5 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7162 "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
|
7163 (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
|
7164 vec |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7165 (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
|
7166 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
|
7167 t)) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7168 (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
|
7169 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7170 (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
|
7171 (goto-char (point-min)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7172 (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
|
7173 (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
|
7174 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7175 ;; `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
|
7176 (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
|
7177 (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
|
7178 (setq found t))))))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7179 |
99950
f803581cae44
* net/tramp.el (tramp-handle-write-region): Improve the check for
Michael Albinus <michael.albinus@gmx.de>
parents:
99615
diff
changeset
|
7180 ;; 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
|
7181 (unless found |
107021
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
7182 (tramp-error |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
7183 vec 'file-error "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
|
7184 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7185 ;; Set connection properties. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7186 (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
|
7187 (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
|
7188 (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
|
7189 (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
|
7190 (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
|
7191 (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
|
7192 (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
|
7193 (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
|
7194 |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
7195 (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
|
7196 "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
|
7197 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
|
7198 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
|
7199 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
|
7200 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
|
7201 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
|
7202 means discard it)." |
85694
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
7203 (tramp-local-call-process |
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
7204 tramp-encoding-shell |
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
7205 (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
|
7206 (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
|
7207 nil |
47576
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
7208 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
|
7209 (concat |
b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47205
diff
changeset
|
7210 (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
|
7211 (if (stringp output) (concat "> " output) "")))) |
45861 | 7212 |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7213 (defconst tramp-inline-compress-commands |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7214 '(("gzip" "gzip -d") |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7215 ("bzip2" "bzip2 -d") |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7216 ("compress" "compress -d")) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7217 "List of compress and decompress commands for inline transfer. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7218 Each item is a list that looks like this: |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7219 |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7220 \(COMPRESS DECOMPRESS\) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7221 |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7222 COMPRESS or DECOMPRESS are strings with the respective commands.") |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7223 |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7224 (defun tramp-find-inline-compress (vec) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7225 "Find an inline transfer compress command that works. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7226 Goes through the list `tramp-inline-compress-commands'." |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7227 (save-excursion |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7228 (let ((commands tramp-inline-compress-commands) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7229 (magic "xyzzy") |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7230 item compress decompress |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7231 found) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7232 (while (and commands (not found)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7233 (catch 'next |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7234 (setq item (pop commands) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7235 compress (nth 0 item) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7236 decompress (nth 1 item)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7237 (tramp-message |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7238 vec 5 |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7239 "Checking local compress command `%s', `%s' for sanity" |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7240 compress decompress) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7241 (unless (zerop (tramp-call-local-coding-command |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7242 (format "echo %s | %s | %s" |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7243 magic compress decompress) nil nil)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7244 (throw 'next nil)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7245 (tramp-message |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7246 vec 5 |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7247 "Checking remote compress command `%s', `%s' for sanity" |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7248 compress decompress) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7249 (unless (zerop (tramp-send-command-and-check |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7250 vec (format "echo %s | %s | %s" |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7251 magic compress decompress) t)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7252 (throw 'next nil)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7253 (setq found t))) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7254 |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7255 ;; Did we find something? |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7256 (if found |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7257 (progn |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7258 ;; Set connection properties. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7259 (tramp-message |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7260 vec 5 "Using inline transfer compress command `%s'" compress) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7261 (tramp-set-connection-property vec "inline-compress" compress) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7262 (tramp-message |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7263 vec 5 "Using inline transfer decompress command `%s'" decompress) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7264 (tramp-set-connection-property vec "inline-decompress" decompress)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7265 |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7266 (tramp-set-connection-property vec "inline-compress" nil) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7267 (tramp-set-connection-property vec "inline-decompress" nil) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7268 (tramp-message |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7269 vec 2 "Couldn't find an inline transfer compress command"))))) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
7270 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7271 (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
|
7272 "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
|
7273 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
|
7274 (let ((target-alist `(,vec)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7275 (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
|
7276 item proxy) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7277 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7278 ;; 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
|
7279 (while choices |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7280 (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
|
7281 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
|
7282 (when (and |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7283 ;; host |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
7284 (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
|
7285 (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
|
7286 ;; user |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
7287 (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
|
7288 (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
|
7289 (if (null proxy) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7290 ;; No more hops needed. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7291 (setq choices nil) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7292 ;; Replace placeholders. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7293 (setq proxy |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7294 (format-spec |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7295 proxy |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
7296 (format-spec-make |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
7297 ?u (or (tramp-file-name-user (car target-alist)) "") |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
7298 ?h (or (tramp-file-name-host (car target-alist)) "")))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7299 (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
|
7300 ;; Add the hop. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7301 (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
|
7302 ;; Start next search. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7303 (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
|
7304 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7305 ;; Handle gateways. |
84406
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
7306 (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
|
7307 (string-match (format |
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
7308 "^\\(%s\\|%s\\)$" |
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
7309 (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
|
7310 (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
|
7311 (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
|
7312 (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
|
7313 (hop (pop target-alist))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7314 ;; 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
|
7315 (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
|
7316 (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
|
7317 (tramp-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7318 vec 'file-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7319 "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
|
7320 (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
|
7321 ;; 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
|
7322 (unless |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7323 (string-match |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7324 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
|
7325 (aset hop 2 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7326 (concat |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7327 (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
|
7328 (number-to-string |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7329 (tramp-get-method-parameter |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7330 (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
|
7331 ;; Open the gateway connection. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7332 (add-to-list |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7333 'target-alist |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7334 (vector |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7335 (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
|
7336 (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
|
7337 ;; 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
|
7338 ;; 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
|
7339 ;; 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
|
7340 ;; 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
|
7341 (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
|
7342 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7343 ;; 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
|
7344 (when (cdr target-alist) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7345 (setq choices target-alist) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7346 (while choices |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7347 (setq item (pop choices)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7348 (when |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7349 (or |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7350 (not |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7351 (tramp-get-method-parameter |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7352 (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
|
7353 (tramp-get-method-parameter |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7354 (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
|
7355 (tramp-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7356 vec 'file-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7357 "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
|
7358 (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
|
7359 |
88028
2a4ab582b2a6
* net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents:
87997
diff
changeset
|
7360 ;; 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
|
7361 ;; 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
|
7362 ;; hostname. |
2a4ab582b2a6
* net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents:
87997
diff
changeset
|
7363 (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
|
7364 (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
|
7365 (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
|
7366 (unless |
2a4ab582b2a6
* net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents:
87997
diff
changeset
|
7367 (or |
2a4ab582b2a6
* net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents:
87997
diff
changeset
|
7368 ;; 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
|
7369 (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
|
7370 ;; 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
|
7371 (member |
2a4ab582b2a6
* net/tramp.el (tramp-compute-multi-hops): In case of su(do)?
Michael Albinus <michael.albinus@gmx.de>
parents:
87997
diff
changeset
|
7372 '("%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
|
7373 ;; 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
|
7374 ;; 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
|
7375 (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
|
7376 (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
|
7377 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
|
7378 "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
|
7379 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
|
7380 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7381 ;; Result. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7382 target-alist)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7383 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7384 (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
|
7385 "Maybe open a connection VEC. |
45861 | 7386 Does not do anything if a connection is already open, but re-opens the |
7387 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
|
7388 (catch 'uname-changed |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7389 (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
|
7390 (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
|
7391 |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7392 ;; 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
|
7393 ;; 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
|
7394 ;; 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
|
7395 ;; 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
|
7396 ;; 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
|
7397 ;; 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
|
7398 ;; 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
|
7399 (condition-case nil |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7400 (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
|
7401 (current-time) |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7402 (tramp-get-connection-property |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7403 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
|
7404 60) |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7405 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
|
7406 (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
|
7407 (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
|
7408 (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
|
7409 ;; 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
|
7410 (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
|
7411 (file-error |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7412 (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
|
7413 (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
|
7414 (delete-process p) |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7415 (setq p nil))) |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7416 |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7417 ;; 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
|
7418 (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
|
7419 |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7420 ;; 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
|
7421 ;; messages from the beginning. |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7422 (tramp-get-buffer vec) |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7423 (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
|
7424 (tramp-message |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7425 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
|
7426 (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
|
7427 (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
|
7428 (tramp-message |
95967
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7429 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
|
7430 (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
|
7431 (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
|
7432 (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
|
7433 |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7434 ;; Start new process. |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7435 (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
|
7436 (delete-process p)) |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7437 (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
|
7438 (setenv "LC_ALL" "C") |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7439 (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
|
7440 (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
|
7441 (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
|
7442 (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
|
7443 (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
|
7444 (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
|
7445 ;; 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
|
7446 (p (let ((default-directory |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7447 (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
|
7448 (start-process |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7449 (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
|
7450 (tramp-buffer-name vec)) |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7451 (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
|
7452 tramp-encoding-shell)))) |
95967
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7453 |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7454 (tramp-message |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7455 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
|
7456 |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7457 ;; 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
|
7458 (tramp-set-process-query-on-exit-flag p nil) |
108066
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
7459 (with-progress-reporter vec 3 "Waiting 60s for local shell to come up" |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
7460 (tramp-barf-if-no-shell-prompt |
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
7461 p 60 "Couldn't find local shell prompt %s" tramp-encoding-shell)) |
95967
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7462 |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7463 ;; 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
|
7464 (while target-alist |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7465 (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
|
7466 (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
|
7467 (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
|
7468 (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
|
7469 (l-port nil) |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7470 (login-program |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7471 (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
|
7472 (login-args |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7473 (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
|
7474 (gw-args |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7475 (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
|
7476 (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
|
7477 (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
|
7478 (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
|
7479 (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
|
7480 (command login-program) |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7481 ;; 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
|
7482 ;; 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
|
7483 ;; 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
|
7484 ;; 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
|
7485 ;; 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
|
7486 (tmpfile |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7487 (tramp-set-connection-property |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7488 p "temp-file" |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7489 (make-temp-name |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7490 (expand-file-name |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7491 tramp-temp-name-prefix |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7492 (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
|
7493 spec) |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7494 |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7495 ;; 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
|
7496 (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
|
7497 (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
|
7498 |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7499 ;; 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
|
7500 ;; 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
|
7501 (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
|
7502 (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
|
7503 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
|
7504 |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7505 ;; 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
|
7506 ;; 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
|
7507 (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
|
7508 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
|
7509 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
|
7510 |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7511 ;; 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
|
7512 (setq |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7513 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
|
7514 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
|
7515 l-port (or l-port "") |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
7516 spec (format-spec-make ?h l-host ?u l-user ?p l-port ?t tmpfile) |
95967
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7517 command |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7518 (concat |
106310
334a4954c17e
* net/tramp.el (tramp-maybe-open-connection): Open the remote
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
7519 ;; 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
|
7520 ;; `start-file-process'. |
334a4954c17e
* net/tramp.el (tramp-maybe-open-connection): Open the remote
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
7521 (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
|
7522 command " " |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7523 (mapconcat |
104673
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
7524 (lambda (x) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
7525 (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
|
7526 (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
|
7527 login-args " ") |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7528 ;; 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
|
7529 ;; 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
|
7530 ;; `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
|
7531 (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
|
7532 |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7533 ;; Send the command. |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7534 (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
|
7535 (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
|
7536 (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
|
7537 (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
|
7538 ;; Next hop. |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7539 (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
|
7540 |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7541 ;; Make initial shell settings. |
13aa0133c5af
(tramp-open-connection-setup-interactive-shell): Flush cache, and
Michael Albinus <michael.albinus@gmx.de>
parents:
95963
diff
changeset
|
7542 (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
|
7543 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7544 (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
|
7545 "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
|
7546 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
|
7547 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
|
7548 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
|
7549 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
|
7550 (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
|
7551 (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
|
7552 (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
|
7553 ;; 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
|
7554 (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
|
7555 (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
|
7556 (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
|
7557 (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
|
7558 (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
|
7559 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7560 (defun tramp-wait-for-output (proc &optional timeout) |
107021
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
7561 "Wait for output from remote command." |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
7562 (unless (buffer-live-p (process-buffer proc)) |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
7563 (delete-process proc) |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
7564 (tramp-error proc 'file-error "Process `%s' not available, try again" proc)) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7565 (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
|
7566 (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
|
7567 ;; 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
|
7568 (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
|
7569 ;; 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
|
7570 ;; 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
|
7571 ;; 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
|
7572 (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
|
7573 (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
|
7574 (if found |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7575 (let (buffer-read-only) |
107021
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
7576 ;; A simple-minded busybox has sent " ^H" sequences. |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
7577 ;; Delete them. |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
7578 (goto-char (point-min)) |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
7579 (when (re-search-forward |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
7580 "^\\(.\b\\)+$" (tramp-compat-line-end-position) t) |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
7581 (forward-line 1) |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
7582 (delete-region (point-min) (point))) |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
7583 ;; Delete the prompt. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7584 (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
|
7585 (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
|
7586 (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
|
7587 (if timeout |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7588 (tramp-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7589 proc 'file-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7590 "[[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
|
7591 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
|
7592 (tramp-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7593 proc 'file-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7594 "[[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
|
7595 ;; 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
|
7596 found))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7597 |
106204
075fc4ee6c41
* net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents:
106115
diff
changeset
|
7598 (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
|
7599 (vec command &optional subshell dont-suppress-err) |
45861 | 7600 "Run COMMAND and check its exit status. |
7601 Sends `echo $?' along with the COMMAND for checking the exit status. If | |
7602 COMMAND is nil, just sends `echo $?'. Returns the exit status found. | |
7603 | |
106204
075fc4ee6c41
* net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents:
106115
diff
changeset
|
7604 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
|
7605 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
|
7606 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
|
7607 (tramp-send-command |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7608 vec |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7609 (concat (if subshell "( " "") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7610 command |
106204
075fc4ee6c41
* net/tramp.el (tramp-shell-prompt-pattern): Use \r for carriage
Michael Albinus <michael.albinus@gmx.de>
parents:
106115
diff
changeset
|
7611 (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
|
7612 "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
|
7613 (if subshell " )" ""))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7614 (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
|
7615 (goto-char (point-max)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7616 (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
|
7617 (tramp-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7618 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
|
7619 (skip-chars-forward "^ ") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7620 (prog1 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7621 (read (current-buffer)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7622 (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
|
7623 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7624 (defun tramp-barf-unless-okay (vec command fmt &rest args) |
45861 | 7625 "Run COMMAND, check exit status, throw error if exit status not okay. |
7626 Similar to `tramp-send-command-and-check' but accepts two more arguments | |
7627 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
|
7628 (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
|
7629 (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
|
7630 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7631 (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
|
7632 "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
|
7633 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
|
7634 (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
|
7635 (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
|
7636 ;; Read the expression. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7637 (goto-char (point-min)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7638 (condition-case nil |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7639 (prog1 (read (current-buffer)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7640 ;; Error handling. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
7641 (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
|
7642 (error nil))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7643 (error (tramp-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7644 vec 'file-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7645 "`%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
|
7646 command (buffer-string)))))) |
45861 | 7647 |
49995
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
7648 ;; 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
|
7649 ;; 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
|
7650 ;; `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
|
7651 ;; 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
|
7652 (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
|
7653 "Send the STRING via connection VEC. |
49995
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
7654 |
a0e8a85259ed
Version 2.0.30 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49612
diff
changeset
|
7655 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
|
7656 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
|
7657 `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
|
7658 (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
|
7659 (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
|
7660 (unless p |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7661 (tramp-error |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7662 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
|
7663 (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
|
7664 (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
|
7665 (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
|
7666 ;; 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
|
7667 ;; 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
|
7668 (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
|
7669 ;; 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
|
7670 (setq string |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7671 (mapconcat 'identity |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
7672 (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
|
7673 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
|
7674 (unless (or (string= string "") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7675 (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
|
7676 (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
|
7677 ;; Send the string. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7678 (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
|
7679 (let ((pos 0) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7680 (end (length string))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7681 (while (< pos end) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7682 (tramp-message |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7683 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
|
7684 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
|
7685 (process-send-string |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7686 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
|
7687 (setq pos (+ pos chunksize)))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7688 (process-send-string p string))))) |
45861 | 7689 |
7690 (defun tramp-mode-string-to-int (mode-string) | |
7691 "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
|
7692 (let* (case-fold-search |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7693 (mode-chars (string-to-vector mode-string)) |
45861 | 7694 (owner-read (aref mode-chars 1)) |
7695 (owner-write (aref mode-chars 2)) | |
7696 (owner-execute-or-setid (aref mode-chars 3)) | |
7697 (group-read (aref mode-chars 4)) | |
7698 (group-write (aref mode-chars 5)) | |
7699 (group-execute-or-setid (aref mode-chars 6)) | |
7700 (other-read (aref mode-chars 7)) | |
7701 (other-write (aref mode-chars 8)) | |
7702 (other-execute-or-sticky (aref mode-chars 9))) | |
7703 (save-match-data | |
7704 (logior | |
77986
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7705 (cond |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7706 ((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
|
7707 ((char-equal owner-read ?-) 0) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7708 (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
|
7709 (cond |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7710 ((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
|
7711 ((char-equal owner-write ?-) 0) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7712 (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
|
7713 (cond |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7714 ((char-equal owner-execute-or-setid ?x) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7715 (tramp-octal-to-decimal "00100")) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7716 ((char-equal owner-execute-or-setid ?S) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7717 (tramp-octal-to-decimal "04000")) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7718 ((char-equal owner-execute-or-setid ?s) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7719 (tramp-octal-to-decimal "04100")) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7720 ((char-equal owner-execute-or-setid ?-) 0) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7721 (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
|
7722 owner-execute-or-setid))) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7723 (cond |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7724 ((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
|
7725 ((char-equal group-read ?-) 0) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7726 (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
|
7727 (cond |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7728 ((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
|
7729 ((char-equal group-write ?-) 0) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7730 (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
|
7731 (cond |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7732 ((char-equal group-execute-or-setid ?x) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7733 (tramp-octal-to-decimal "00010")) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7734 ((char-equal group-execute-or-setid ?S) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7735 (tramp-octal-to-decimal "02000")) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7736 ((char-equal group-execute-or-setid ?s) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7737 (tramp-octal-to-decimal "02010")) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7738 ((char-equal group-execute-or-setid ?-) 0) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7739 (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
|
7740 group-execute-or-setid))) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7741 (cond |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7742 ((char-equal other-read ?r) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7743 (tramp-octal-to-decimal "00004")) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7744 ((char-equal other-read ?-) 0) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7745 (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
|
7746 (cond |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7747 ((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
|
7748 ((char-equal other-write ?-) 0) |
45861 | 7749 (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
|
7750 (cond |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7751 ((char-equal other-execute-or-sticky ?x) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7752 (tramp-octal-to-decimal "00001")) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7753 ((char-equal other-execute-or-sticky ?T) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7754 (tramp-octal-to-decimal "01000")) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7755 ((char-equal other-execute-or-sticky ?t) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7756 (tramp-octal-to-decimal "01001")) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7757 ((char-equal other-execute-or-sticky ?-) 0) |
0cc9b64806d2
Sync with Tramp 2.0.56.
Michael Albinus <michael.albinus@gmx.de>
parents:
76846
diff
changeset
|
7758 (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
|
7759 other-execute-or-sticky))))))) |
45861 | 7760 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7761 (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
|
7762 "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
|
7763 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
|
7764 Return ATTR." |
104866
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
7765 (when attr |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
7766 ;; 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
|
7767 (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
|
7768 (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
|
7769 (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
|
7770 (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
|
7771 ;; 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
|
7772 (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
|
7773 (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
|
7774 (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
|
7775 (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
|
7776 ;; 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
|
7777 (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
|
7778 (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
|
7779 (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
|
7780 (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
|
7781 ;; Convert file size. |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
7782 (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
|
7783 (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
|
7784 (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
|
7785 (<= (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
|
7786 (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
|
7787 ;; 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
|
7788 (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
|
7789 (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
|
7790 (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
|
7791 (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
|
7792 ;; 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
|
7793 (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
|
7794 (setcar attr t)) |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
7795 ;; 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
|
7796 (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
|
7797 (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
|
7798 (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
|
7799 (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
|
7800 (setcar attr nil))) |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
7801 ;; 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
|
7802 (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
|
7803 (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
|
7804 (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
|
7805 (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
|
7806 (not (string-equal |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
7807 (nth 3 attr) |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
7808 (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
|
7809 ;; Convert inode. |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
7810 (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
|
7811 (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
|
7812 (condition-case nil |
3d5d2850cbef
* net/tramp.el (tramp-perl-file-attributes): Print "nil" when
Michael Albinus <michael.albinus@gmx.de>
parents:
104850
diff
changeset
|
7813 (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
|
7814 (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
|
7815 ;; 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
|
7816 (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
|
7817 ;; 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
|
7818 (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
|
7819 (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
|
7820 attr)) |
58540
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
7821 |
105767
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
7822 (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
|
7823 "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
|
7824 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
|
7825 be granted." |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
7826 (let ((result nil) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
7827 (offset (cond |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
7828 ((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
|
7829 ((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
|
7830 ((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
|
7831 (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
|
7832 (setq |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
7833 result |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
7834 (or |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
7835 result |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
7836 (let ((file-attr |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
7837 (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
|
7838 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
|
7839 (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
|
7840 (remote-uid |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
7841 (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
|
7842 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
|
7843 (remote-gid |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
7844 (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
|
7845 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
|
7846 (and |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
7847 file-attr |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
7848 (or |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
7849 ;; Not a symlink |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
7850 (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
|
7851 (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
|
7852 (or |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
7853 ;; World accessible. |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
7854 (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
|
7855 ;; 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
|
7856 (and |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
7857 (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
|
7858 (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
|
7859 ;; 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
|
7860 ;; principal group. |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
7861 (and |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
7862 (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
|
7863 (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
|
7864 |
81938
26330ef1aa46
* net/tramp.el (tramp-handle-file-remote-p): Handle optional
Michael Albinus <michael.albinus@gmx.de>
parents:
81758
diff
changeset
|
7865 (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
|
7866 "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
|
7867 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
|
7868 (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
|
7869 (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
|
7870 (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
|
7871 (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
|
7872 ""))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7873 (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
|
7874 (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
|
7875 (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
|
7876 (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
|
7877 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7878 (defun tramp-get-device (vec) |
58540
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
7879 "Returns the virtual device number. |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
7880 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
|
7881 (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
|
7882 (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
|
7883 (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
|
7884 (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
|
7885 ""))) |
58540
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
7886 (unless (assoc string tramp-devices) |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
7887 (add-to-list 'tramp-devices |
d3f76ef9ad46
(tramp-handle-directory-files-and-attributes): New function.
Lars Hansen <larsh@soem.dk>
parents:
58005
diff
changeset
|
7888 (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
|
7889 (cons -1 (nth 1 (assoc string tramp-devices))))) |
45861 | 7890 |
7891 (defun tramp-file-mode-from-int (mode) | |
7892 "Turn an integer representing a file mode into an ls(1)-like string." | |
7893 (let ((type (cdr (assoc (logand (lsh mode -12) 15) tramp-file-mode-type-map))) | |
7894 (user (logand (lsh mode -6) 7)) | |
7895 (group (logand (lsh mode -3) 7)) | |
7896 (other (logand (lsh mode -0) 7)) | |
7897 (suid (> (logand (lsh mode -9) 4) 0)) | |
7898 (sgid (> (logand (lsh mode -9) 2) 0)) | |
7899 (sticky (> (logand (lsh mode -9) 1) 0))) | |
7900 (setq user (tramp-file-mode-permissions user suid "s")) | |
7901 (setq group (tramp-file-mode-permissions group sgid "s")) | |
7902 (setq other (tramp-file-mode-permissions other sticky "t")) | |
7903 (concat type user group other))) | |
7904 | |
7905 (defun tramp-file-mode-permissions (perm suid suid-text) | |
7906 "Convert a permission bitset into a string. | |
7907 This is used internally by `tramp-file-mode-from-int'." | |
7908 (let ((r (> (logand perm 4) 0)) | |
7909 (w (> (logand perm 2) 0)) | |
7910 (x (> (logand perm 1) 0))) | |
7911 (concat (or (and r "r") "-") | |
7912 (or (and w "w") "-") | |
7913 (or (and suid x suid-text) ; suid, execute | |
7914 (and suid (upcase suid-text)) ; suid, !execute | |
7915 (and x "x") "-")))) ; !suid | |
7916 | |
7917 (defun tramp-decimal-to-octal (i) | |
7918 "Return a string consisting of the octal digits of I. | |
7919 Not actually used. Use `(format \"%o\" i)' instead?" | |
7920 (cond ((< i 0) (error "Cannot convert negative number to octal")) | |
7921 ((not (integerp i)) (error "Cannot convert non-integer to octal")) | |
7922 ((zerop i) "0") | |
7923 (t (concat (tramp-decimal-to-octal (/ i 8)) | |
7924 (number-to-string (% i 8)))))) | |
7925 | |
7926 ;; Kudos to Gerd Moellmann for this suggestion. | |
7927 (defun tramp-octal-to-decimal (ostr) | |
7928 "Given a string of octal digits, return a decimal number." | |
7929 (let ((x (or ostr ""))) | |
7930 ;; `save-match' is in `tramp-mode-string-to-int' which calls this. | |
7931 (unless (string-match "\\`[0-7]*\\'" x) | |
7932 (error "Non-octal junk in string `%s'" x)) | |
7933 (string-to-number ostr 8))) | |
7934 | |
7935 (defun tramp-shell-case-fold (string) | |
7936 "Converts STRING to shell glob pattern which ignores case." | |
7937 (mapconcat | |
7938 (lambda (c) | |
7939 (if (equal (downcase c) (upcase c)) | |
7940 (vector c) | |
7941 (format "[%c%c]" (downcase c) (upcase c)))) | |
7942 string | |
7943 "")) | |
7944 | |
7945 | |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59582
diff
changeset
|
7946 ;; ------------------------------------------------------------ |
85694
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
7947 ;; -- 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
|
7948 ;; ------------------------------------------------------------ |
45861 | 7949 ;; Conversion functions between external representation and |
7950 ;; internal data structure. Convenience functions for internal | |
7951 ;; data structure. | |
7952 | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7953 (defun tramp-file-name-p (vec) |
108066
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
7954 "Check, whether VEC is a Tramp object." |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7955 (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
|
7956 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7957 (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
|
7958 "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
|
7959 (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
|
7960 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7961 (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
|
7962 "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
|
7963 (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
|
7964 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7965 (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
|
7966 "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
|
7967 (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
|
7968 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7969 (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
|
7970 "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
|
7971 (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
|
7972 |
100634
2af636c8c9d2
* net/tramp.el (tramp-rfn-eshadow-update-overlay): Move overlay to
Michael Albinus <michael.albinus@gmx.de>
parents:
100316
diff
changeset
|
7973 ;; 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
|
7974 ;; "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
|
7975 (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
|
7976 "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
|
7977 (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
|
7978 (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
|
7979 (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
|
7980 (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
|
7981 (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
|
7982 user)))) |
100634
2af636c8c9d2
* net/tramp.el (tramp-rfn-eshadow-update-overlay): Move overlay to
Michael Albinus <michael.albinus@gmx.de>
parents:
100316
diff
changeset
|
7983 |
2af636c8c9d2
* net/tramp.el (tramp-rfn-eshadow-update-overlay): Move overlay to
Michael Albinus <michael.albinus@gmx.de>
parents:
100316
diff
changeset
|
7984 (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
|
7985 "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
|
7986 (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
|
7987 (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
|
7988 (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
|
7989 (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
|
7990 (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
|
7991 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
7992 ;; 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
|
7993 ;; "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
|
7994 (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
|
7995 "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
|
7996 (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
|
7997 (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
|
7998 (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
|
7999 (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
|
8000 (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
|
8001 host)))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8002 |
84406
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
8003 (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
|
8004 "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
|
8005 (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
|
8006 (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
|
8007 (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
|
8008 (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
|
8009 (string-to-number (match-string 2 host)))))) |
45861 | 8010 |
8011 (defun tramp-tramp-file-p (name) | |
106390 | 8012 "Return t if NAME is a string with Tramp file name syntax." |
45861 | 8013 (save-match-data |
106390 | 8014 (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
|
8015 |
84406
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
8016 (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
|
8017 "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
|
8018 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
|
8019 `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
|
8020 (or method |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8021 (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
|
8022 lmethod item) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8023 (while choices |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8024 (setq item (pop choices)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8025 (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
|
8026 (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
|
8027 (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
|
8028 (setq choices nil))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8029 lmethod) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8030 tramp-default-method)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8031 |
84406
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
8032 (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
|
8033 "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
|
8034 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
|
8035 `tramp-default-user-alist'." |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8036 (or user |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8037 (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
|
8038 luser item) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8039 (while choices |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8040 (setq item (pop choices)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8041 (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
|
8042 (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
|
8043 (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
|
8044 (setq choices nil))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8045 luser) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8046 tramp-default-user)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8047 |
84406
38bcf4ef30c3
* net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
Michael Albinus <michael.albinus@gmx.de>
parents:
82942
diff
changeset
|
8048 (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
|
8049 "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
|
8050 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
|
8051 (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
|
8052 tramp-default-host)) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8053 |
84966
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
8054 (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
|
8055 "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
|
8056 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
|
8057 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
|
8058 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
|
8059 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
|
8060 (save-match-data |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8061 (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
|
8062 (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
|
8063 (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
|
8064 (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
|
8065 (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
|
8066 (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
|
8067 (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
|
8068 (error |
13df71a98040
* net/tramp.el (tramp-dissect-file-name): Raise an error when
Michael Albinus <michael.albinus@gmx.de>
parents:
87947
diff
changeset
|
8069 "`%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
|
8070 method)) |
100856
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
8071 (when host |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
8072 (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
|
8073 (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
|
8074 (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
|
8075 (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
|
8076 (if nodefault |
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
8077 (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
|
8078 (vector |
fa9dd0b54e54
* net/tramp.el (with-file-property, with-connection-property):
Michael Albinus <michael.albinus@gmx.de>
parents:
84942
diff
changeset
|
8079 (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
|
8080 (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
|
8081 (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
|
8082 localname)))))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8083 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8084 (defun tramp-equal-remote (file1 file2) |
108066
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
8085 "Check, whether the remote parts of FILE1 and FILE2 are identical. |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8086 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
|
8087 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
|
8088 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
|
8089 account. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8090 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8091 Example: |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8092 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8093 (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
|
8094 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8095 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
|
8096 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8097 (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
|
8098 (and (stringp (file-remote-p file1)) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
8099 (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
|
8100 (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
|
8101 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8102 (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
|
8103 "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
|
8104 (concat tramp-prefix-format |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8105 (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
|
8106 (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
|
8107 (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
|
8108 (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
|
8109 (when host |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
8110 (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
|
8111 (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
|
8112 host)) |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
8113 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
|
8114 (when localname localname))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8115 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8116 (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
|
8117 "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
|
8118 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
|
8119 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
|
8120 (concat tramp-prefix-format |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8121 (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
|
8122 (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
|
8123 (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
|
8124 (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
|
8125 (when (not (zerop (length host))) |
100856
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
8126 (concat |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
8127 (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
|
8128 (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
|
8129 host) |
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
8130 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
|
8131 (when localname localname))) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8132 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8133 (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
|
8134 "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
|
8135 (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
|
8136 (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
|
8137 (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
|
8138 (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
|
8139 (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
|
8140 (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
|
8141 (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
|
8142 |
104807
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
8143 (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
|
8144 "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
|
8145 (and |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
8146 ;; 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
|
8147 (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
|
8148 ;; 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
|
8149 ;; does not exist a remote encoding. |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8150 (or (null tramp-copy-size-limit) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8151 (> size tramp-copy-size-limit) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8152 (null (tramp-get-inline-coding vec "remote-encoding" size))))) |
45861 | 8153 |
82808
6e5814967ffb
* net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
82603
diff
changeset
|
8154 (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
|
8155 "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
|
8156 ;; 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
|
8157 ;; 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
|
8158 (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
|
8159 (and |
6e5814967ffb
* net/tramp.el (tramp-local-host-p): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
82603
diff
changeset
|
8160 (stringp host) |
100856
49bc8bb7a597
* net/tramp.el (tramp-local-host-regexp)
Michael Albinus <michael.albinus@gmx.de>
parents:
100634
diff
changeset
|
8161 (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
|
8162 ;; 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
|
8163 ;; 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
|
8164 ;; 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
|
8165 (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
|
8166 (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
|
8167 ;; 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
|
8168 (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
|
8169 (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
|
8170 (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
|
8171 (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
|
8172 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
|
8173 (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
|
8174 ;; 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
|
8175 (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
|
8176 (zerop (tramp-get-remote-uid vec 'integer)))))) |
45861 | 8177 |
8178 ;; Variables local to connection. | |
8179 | |
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
|
8180 (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
|
8181 (with-connection-property |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8182 ;; 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
|
8183 ;; 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
|
8184 ;; is cached persistently. |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8185 (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
|
8186 (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
|
8187 vec) |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8188 "remote-path" |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
8189 (let* ((remote-path (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
|
8190 (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
|
8191 (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
|
8192 (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
|
8193 (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
|
8194 (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
|
8195 (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
|
8196 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
|
8197 ;; 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
|
8198 (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
|
8199 (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
|
8200 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
|
8201 "`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
|
8202 "/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
|
8203 "/bin:/usr/bin")))) |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8204 (own-remote-path |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8205 (when elt2 |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8206 (condition-case nil |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8207 (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
|
8208 ;; 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
|
8209 (error |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8210 (tramp-message |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8211 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
|
8212 nil))))) |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8213 |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8214 ;; 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
|
8215 (when elt1 |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8216 (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
|
8217 (append |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8218 (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
|
8219 (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
|
8220 (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
|
8221 |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8222 ;; 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
|
8223 (when elt2 |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8224 (setcdr elt2 |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8225 (append |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8226 (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
|
8227 (cdr elt2))) |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8228 (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
|
8229 |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8230 ;; Remove double entries. |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8231 (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
|
8232 (while (consp elt1) |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8233 (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
|
8234 (setcar elt2 nil)) |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8235 (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
|
8236 |
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
|
8237 ;; 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
|
8238 (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
|
8239 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
|
8240 (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
|
8241 (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
|
8242 (and |
103527
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8243 (stringp x) |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8244 (file-directory-p |
d820807ffab7
* net/tramp.el (top): Require tramp-gvfs. Catch `tramp-loading',
Michael Albinus <michael.albinus@gmx.de>
parents:
103333
diff
changeset
|
8245 (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
|
8246 (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
|
8247 (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
|
8248 (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
|
8249 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
|
8250 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
|
8251 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
|
8252 |
85694
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
8253 (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
|
8254 (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
|
8255 (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
|
8256 (if (and (zerop |
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
8257 (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
|
8258 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
|
8259 (zerop |
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
8260 (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
|
8261 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
|
8262 dir |
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
8263 (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
|
8264 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8265 (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
|
8266 (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
|
8267 (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
|
8268 (or |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8269 (catch 'ls-found |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8270 (dolist (cmd '("ls" "gnuls" "gls")) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8271 (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
|
8272 result) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8273 (while (and dl (setq result (tramp-find-executable vec cmd dl t t))) |
107021
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
8274 ;; Check parameters. On busybox, "ls" output coloring is |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
8275 ;; enabled by default sometimes. So we try to disable it |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
8276 ;; when possible. $LS_COLORING is not supported there. |
104642
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8277 (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
|
8278 vec (format "%s -lnd /" result))) |
107021
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
8279 (when (zerop (tramp-send-command-and-check |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
8280 vec (format "%s --color=never /" result))) |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
8281 (setq result (concat result " --color=never"))) |
104642
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8282 (throw 'ls-found result)) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8283 (setq dl (cdr dl)))))) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8284 (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
|
8285 |
104216
bf65b05e8cf1
* net/tramp.el (tramp-get-ls-command-with-dired): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
104143
diff
changeset
|
8286 (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
|
8287 (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
|
8288 (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
|
8289 (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
|
8290 (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
|
8291 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
|
8292 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8293 (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
|
8294 (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
|
8295 (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
|
8296 (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
|
8297 "test" |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8298 (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
|
8299 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8300 (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
|
8301 ;; 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
|
8302 ;; 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
|
8303 ;; 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
|
8304 (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
|
8305 (or |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8306 (progn |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8307 (tramp-send-command |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8308 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
|
8309 (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
|
8310 (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
|
8311 (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
|
8312 (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
|
8313 (progn |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8314 (tramp-send-command |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8315 vec |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8316 (format |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8317 "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
|
8318 (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
|
8319 "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
|
8320 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8321 (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
|
8322 (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
|
8323 (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
|
8324 (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
|
8325 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8326 (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
|
8327 (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
|
8328 (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
|
8329 (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
|
8330 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8331 (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
|
8332 (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
|
8333 (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
|
8334 (let ((result |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
8335 (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
|
8336 (tramp-find-executable |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
8337 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
|
8338 ;; 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
|
8339 (when result |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
8340 (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
|
8341 (zerop |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
8342 (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
|
8343 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
|
8344 (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
|
8345 (zerop |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
8346 (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
|
8347 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
|
8348 result))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8349 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8350 (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
|
8351 (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
|
8352 (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
|
8353 (let ((result (tramp-find-executable |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8354 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
|
8355 tmp) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8356 ;; 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
|
8357 ;; work on older AIX systems. |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8358 (when result |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8359 (setq tmp |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8360 ;; 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
|
8361 (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
|
8362 (condition-case nil |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8363 (tramp-send-command-and-read |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8364 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
|
8365 (error nil)))) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8366 (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
|
8367 (string-match "^./.$" (car tmp)) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8368 (integerp (cadr tmp))) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8369 (setq result nil))) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8370 result))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8371 |
105767
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
8372 (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
|
8373 (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
|
8374 (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
|
8375 (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
|
8376 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
|
8377 (when (and result |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
8378 ;; 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
|
8379 (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
|
8380 (condition-case nil |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
8381 (zerop |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
8382 (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
|
8383 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
|
8384 (error nil)))) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
8385 result)))) |
986f88345cba
* net/tramp.el (tramp-perl-file-truename): New defconst. Perl
Michael Albinus <michael.albinus@gmx.de>
parents:
105718
diff
changeset
|
8386 |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8387 (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
|
8388 (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
|
8389 (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
|
8390 (or |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8391 (catch 'id-found |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8392 (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
|
8393 result) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8394 (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
|
8395 ;; Check POSIX parameter. |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8396 (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
|
8397 vec (format "%s -u" result))) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8398 (throw 'id-found result)) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8399 (setq dl (cdr dl))))) |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8400 (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
|
8401 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8402 (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
|
8403 (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
|
8404 (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
|
8405 vec |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8406 (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
|
8407 (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
|
8408 (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
|
8409 (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
|
8410 "" "| 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
|
8411 ;; 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
|
8412 (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
|
8413 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8414 (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
|
8415 (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
|
8416 (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
|
8417 vec |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8418 (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
|
8419 (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
|
8420 (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
|
8421 (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
|
8422 "" "| 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
|
8423 ;; 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
|
8424 (if (and (equal id-format 'integer) (not (integerp res))) -1 res)))) |
45861 | 8425 |
82942
5cf3cd03cb50
* net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents:
82808
diff
changeset
|
8426 (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
|
8427 (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
|
8428 |
5cf3cd03cb50
* net/tramp.el (tramp-handle-set-file-times): Flush the file
Michael Albinus <michael.albinus@gmx.de>
parents:
82808
diff
changeset
|
8429 (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
|
8430 (nth 3 (tramp-compat-file-attributes "~/" id-format))) |
45861 | 8431 |
46752 | 8432 ;; Some predefined connection properties. |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8433 (defun tramp-get-inline-compress (vec prop size) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8434 "Return the compress command related to PROP. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8435 PROP is either `inline-compress' or `inline-decompress'. SIZE is |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8436 the length of the file to be compressed. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8437 |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8438 If no corresponding command is found, nil is returned." |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8439 (when (and (integerp tramp-inline-compress-start-size) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8440 (> size tramp-inline-compress-start-size)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8441 (with-connection-property vec prop |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8442 (tramp-find-inline-compress vec) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8443 (tramp-get-connection-property vec prop nil)))) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8444 |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8445 (defun tramp-get-inline-coding (vec prop size) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8446 "Return the coding command related to PROP. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8447 PROP is either `remote-encoding', `remode-decoding', |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8448 `local-encoding' or `local-decoding'. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8449 |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8450 SIZE is the length of the file to be coded. Depending on SIZE, |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8451 compression might be applied. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8452 |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8453 If no corresponding command is found, nil is returned. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8454 Otherwise, either a string is returned which contains a `%s' mark |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8455 to be used for the respective input or output file; or a Lisp |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8456 function cell is returned to be applied on a buffer." |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8457 (let ((coding |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8458 (with-connection-property vec prop |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8459 (tramp-find-inline-encoding vec) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8460 (tramp-get-connection-property vec prop nil))) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8461 (prop1 (if (string-match "encoding" prop) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8462 "inline-compress" "inline-decompress")) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8463 compress) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8464 ;; The connection property might have been cached. So we must send |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8465 ;; the script to the remote side - maybe. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8466 (when (and coding (symbolp coding) (string-match "remote" prop)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8467 (let ((name (symbol-name coding))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8468 (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
|
8469 (setq name (replace-match "_" nil t name))) |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8470 (tramp-maybe-send-script vec (symbol-value coding) name) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8471 (setq coding name))) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8472 (when coding |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8473 ;; Check for the `compress' command. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8474 (setq compress (tramp-get-inline-compress vec prop1 size)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8475 ;; Return the value. |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8476 (cond |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8477 ((and compress (symbolp coding)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8478 (if (string-match "decompress" prop1) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8479 `(lambda (beg end) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8480 (,coding beg end) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8481 (let ((coding-system-for-write 'binary) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8482 (coding-system-for-read 'binary)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8483 (apply |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8484 'call-process-region (point-min) (point-max) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8485 (car (split-string ,compress)) t t nil |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8486 (cdr (split-string ,compress))))) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8487 `(lambda (beg end) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8488 (let ((coding-system-for-write 'binary) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8489 (coding-system-for-read 'binary)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8490 (apply |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8491 'call-process-region beg end |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8492 (car (split-string ,compress)) t t nil |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8493 (cdr (split-string ,compress)))) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8494 (,coding (point-min) (point-max))))) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8495 ((symbolp coding) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8496 coding) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8497 ((and compress (string-match "decoding" prop)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8498 (format "(%s | %s >%%s)" coding compress)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8499 (compress |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8500 (format "(%s <%%s | %s)" compress coding)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8501 ((string-match "decoding" prop) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8502 (format "%s >%%s" coding)) |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8503 (t |
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8504 (format "%s <%%s" coding)))))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8505 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8506 (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
|
8507 "Return the method parameter PARAM. |
108186
3287df4f3442
Implement compression for inline methods.
Michael Albinus <albinus@detlef>
parents:
108158
diff
changeset
|
8508 If the `tramp-methods' entry does not exist, return nil." |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8509 (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
|
8510 (when entry (cadr entry)))) |
51968
e4c4c45ea013
Tramp 2.0.36 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51603
diff
changeset
|
8511 |
45861 | 8512 ;; Auto saving to a special directory. |
8513 | |
65304
379e08762d65
* net/tramp.el (tramp-handle-make-auto-save-file-name): Deactivate
Michael Albinus <michael.albinus@gmx.de>
parents:
65254
diff
changeset
|
8514 (defun tramp-exists-file-name-handler (operation &rest args) |
108066
47a124b50bbf
Synchronize with Tramp repository.
Michael Albinus <michael.albinus@gmx.de>
parents:
108065
diff
changeset
|
8515 "Check, whether OPERATION runs a file name handler." |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8516 ;; 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
|
8517 ;; 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
|
8518 (condition-case nil |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8519 (let* ((buffer-file-name "/") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8520 (default-directory "/") |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8521 (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
|
8522 (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
|
8523 (file-name-handler-alist |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8524 (list |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8525 (cons "/" |
104673
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
8526 (lambda (operation &rest args) |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
8527 "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
|
8528 (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
|
8529 operation |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
8530 (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
|
8531 (apply operation args)))))))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8532 (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
|
8533 (error nil))) |
65248
0f994edbec5e
Make `make-auto-save-file-name' a magic operation.
Michael Albinus <michael.albinus@gmx.de>
parents:
64772
diff
changeset
|
8534 |
0f994edbec5e
Make `make-auto-save-file-name' a magic operation.
Michael Albinus <michael.albinus@gmx.de>
parents:
64772
diff
changeset
|
8535 (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
|
8536 (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
|
8537 (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
|
8538 "Invoke `tramp-handle-make-auto-save-file-name' for Tramp files." |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
8539 (if (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
|
8540 ;; 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
|
8541 ;; 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
|
8542 (setq ad-return-value |
509a5b989179
* net/tramp.el (tramp-handle-file-attributes-with-ls)
Michael Albinus <michael.albinus@gmx.de>
parents:
104673
diff
changeset
|
8543 (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
|
8544 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
|
8545 (add-hook |
9abdd578d117
* net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents:
105893
diff
changeset
|
8546 'tramp-unload-hook |
9abdd578d117
* net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents:
105893
diff
changeset
|
8547 (lambda () |
9abdd578d117
* net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents:
105893
diff
changeset
|
8548 (ad-remove-advice |
9abdd578d117
* net/tramp.el (tramp-advice-make-auto-save-file-name)
Michael Albinus <michael.albinus@gmx.de>
parents:
105893
diff
changeset
|
8549 '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
|
8550 '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
|
8551 (ad-activate 'make-auto-save-file-name)))) |
45861 | 8552 |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
8553 ;; In XEmacs < 21.5, autosaved remote files have permission 0666 minus |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
8554 ;; umask. This is a security threat. |
57463
40298ea4d83f
Sync with Tramp 2.0.45.
Michael Albinus <michael.albinus@gmx.de>
parents:
56644
diff
changeset
|
8555 |
40298ea4d83f
Sync with Tramp 2.0.45.
Michael Albinus <michael.albinus@gmx.de>
parents:
56644
diff
changeset
|
8556 (defun tramp-set-auto-save-file-modes () |
40298ea4d83f
Sync with Tramp 2.0.45.
Michael Albinus <michael.albinus@gmx.de>
parents:
56644
diff
changeset
|
8557 "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
|
8558 (let ((bfn (buffer-file-name))) |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
8559 (when (and (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
|
8560 (buffer-modified-p) |
57463
40298ea4d83f
Sync with Tramp 2.0.45.
Michael Albinus <michael.albinus@gmx.de>
parents:
56644
diff
changeset
|
8561 (stringp buffer-auto-save-file-name) |
60763
3ba8f94e9cfa
Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents:
60287
diff
changeset
|
8562 (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
|
8563 (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
|
8564 (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
|
8565 ;; 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
|
8566 ;; 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
|
8567 ;; be a security threat. |
62344
5a19ff64befb
Sync with Tramp 2.0.49.
Michael Albinus <michael.albinus@gmx.de>
parents:
60763
diff
changeset
|
8568 (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
|
8569 (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
|
8570 |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
8571 (unless (and (featurep 'xemacs) |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
8572 (= emacs-major-version 21) |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
8573 (> emacs-minor-version 4)) |
68335
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
8574 (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
|
8575 (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
|
8576 (lambda () |
317dde5b902b
* net/tramp.el (all): Replace "'(lambda" by "(lambda".
Michael Albinus <michael.albinus@gmx.de>
parents:
104642
diff
changeset
|
8577 (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
|
8578 |
45861 | 8579 (defun tramp-subst-strs-in-string (alist string) |
8580 "Replace all occurrences of the string FROM with TO in STRING. | |
8581 ALIST is of the form ((FROM . TO) ...)." | |
8582 (save-match-data | |
8583 (while alist | |
8584 (let* ((pr (car alist)) | |
8585 (from (car pr)) | |
8586 (to (cdr pr))) | |
8587 (while (string-match (regexp-quote from) string) | |
8588 (setq string (replace-match to t t string))) | |
8589 (setq alist (cdr alist)))) | |
8590 string)) | |
8591 | |
8592 ;; ------------------------------------------------------------ | |
8593 ;; -- Compatibility functions section -- | |
8594 ;; ------------------------------------------------------------ | |
8595 | |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8596 (defun tramp-read-passwd (proc &optional prompt) |
45861 | 8597 "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
|
8598 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
|
8599 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
|
8600 (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
|
8601 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
|
8602 tramp-current-host "")) |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8603 (pw-prompt |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8604 (or prompt |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8605 (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
|
8606 (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
|
8607 (format "%s for %s " (capitalize (match-string 1)) key))))) |
107151
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8608 (with-parsed-tramp-file-name key nil |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8609 (prog1 |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8610 (or |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8611 ;; See if auth-sources contains something useful, if it's bound. |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8612 (and (boundp 'auth-sources) |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8613 (tramp-get-connection-property v "first-password-request" nil) |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8614 ;; Try with Tramp's current method. |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8615 (funcall (symbol-function 'auth-source-user-or-password) |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8616 "password" tramp-current-host tramp-current-method)) |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8617 ;; Try the password cache. |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8618 (when (functionp 'password-read) |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8619 (unless (tramp-get-connection-property |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8620 v "first-password-request" nil) |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8621 (funcall (symbol-function 'password-cache-remove) key)) |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8622 (let ((password |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8623 (funcall (symbol-function 'password-read) pw-prompt key))) |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8624 (funcall (symbol-function 'password-cache-add) key password) |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8625 password)) |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8626 ;; Else, get the password interactively. |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8627 (read-passwd pw-prompt)) |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8628 (tramp-set-connection-property v "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
|
8629 |
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
|
8630 (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
|
8631 "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
|
8632 (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
|
8633 (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
|
8634 (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
|
8635 (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
|
8636 (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
|
8637 (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
|
8638 (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
|
8639 "")))) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8640 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8641 ;; 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
|
8642 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8643 (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
|
8644 "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
|
8645 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8646 (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
|
8647 '(("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
|
8648 ("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
|
8649 ("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
|
8650 ("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
|
8651 "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
|
8652 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8653 (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
|
8654 "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
|
8655 (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
|
8656 (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
|
8657 (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
|
8658 (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
|
8659 (< (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
|
8660 |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8661 (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
|
8662 "Subtract two time values. |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8663 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
|
8664 (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
|
8665 (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
|
8666 (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
|
8667 (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
|
8668 (- (+ (if borrow 65536 0) (cadr t1)) (cadr t2))))) |
45861 | 8669 |
8670 (defun tramp-time-diff (t1 t2) | |
8671 "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
|
8672 T1 and T2 are time values (as returned by `current-time' for example)." |
45861 | 8673 ;; 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
|
8674 (cond ((and (fboundp 'subtract-time) |
978e262c8f3a
Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51177
diff
changeset
|
8675 (fboundp 'float-time)) |
978e262c8f3a
Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51177
diff
changeset
|
8676 (funcall (symbol-function 'float-time) |
978e262c8f3a
Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51177
diff
changeset
|
8677 (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
|
8678 ((and (fboundp 'subtract-time) |
978e262c8f3a
Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51177
diff
changeset
|
8679 (fboundp 'time-to-seconds)) |
978e262c8f3a
Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51177
diff
changeset
|
8680 (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
|
8681 (funcall (symbol-function 'subtract-time) t1 t2))) |
45861 | 8682 ((fboundp 'itimer-time-difference) |
72569
7457615d594a
Sync with Tramp 2.0.54.
Michael Albinus <michael.albinus@gmx.de>
parents:
71561
diff
changeset
|
8683 (funcall (symbol-function 'itimer-time-difference) |
7457615d594a
Sync with Tramp 2.0.54.
Michael Albinus <michael.albinus@gmx.de>
parents:
71561
diff
changeset
|
8684 (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
|
8685 (if (< (length t2) 3) (append t2 '(0)) t2))) |
45861 | 8686 (t |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8687 (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
|
8688 (+ (* (car time) 65536.0) |
978e262c8f3a
Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51177
diff
changeset
|
8689 (cadr time) |
978e262c8f3a
Version 2.0.35 of Tramp released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51177
diff
changeset
|
8690 (/ (or (nth 2 time) 0) 1000000.0)))))) |
45861 | 8691 |
8692 (defun tramp-coding-system-change-eol-conversion (coding-system eol-type) | |
8693 "Return a coding system like CODING-SYSTEM but with given EOL-TYPE. | |
8694 EOL-TYPE can be one of `dos', `unix', or `mac'." | |
8695 (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
|
8696 (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
|
8697 coding-system eol-type)) |
45861 | 8698 ((fboundp 'subsidiary-coding-system) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
8699 (funcall (symbol-function 'subsidiary-coding-system) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
8700 coding-system |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
8701 (cond ((eq eol-type 'dos) 'crlf) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
8702 ((eq eol-type 'unix) 'lf) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
8703 ((eq eol-type 'mac) 'cr) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
8704 (t |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
8705 (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
|
8706 eol-type |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
84966
diff
changeset
|
8707 "`dos', `unix', or `mac'"))))) |
45861 | 8708 (t (error "Can't change EOL conversion -- is MULE missing?")))) |
8709 | |
55844
4bc6cb45c326
Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents:
55420
diff
changeset
|
8710 (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
|
8711 "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
|
8712 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
|
8713 exiting if process is running." |
4bc6cb45c326
Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents:
55420
diff
changeset
|
8714 (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
|
8715 (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
|
8716 (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
|
8717 |
4bc6cb45c326
Version 2.0.41 of Tramp released.
Michael Albinus <michael.albinus@gmx.de>
parents:
55420
diff
changeset
|
8718 |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59582
diff
changeset
|
8719 ;; ------------------------------------------------------------ |
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59582
diff
changeset
|
8720 ;; -- Kludges section -- |
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59582
diff
changeset
|
8721 ;; ------------------------------------------------------------ |
45861 | 8722 |
8723 ;; Currently (as of Emacs 20.5), the function `shell-quote-argument' | |
8724 ;; does not deal well with newline characters. Newline is replaced by | |
8725 ;; backslash newline. But if, say, the string `a backslash newline b' | |
8726 ;; is passed to a shell, the shell will expand this into "ab", | |
8727 ;; completely omitting the newline. This is not what was intended. | |
8728 ;; It does not appear to be possible to make the function | |
8729 ;; `shell-quote-argument' work with newlines without making it | |
8730 ;; dependent on the shell used. But within this package, we know that | |
8731 ;; we will always use a Bourne-like shell, so we use an approach which | |
8732 ;; groks newlines. | |
8733 ;; | |
8734 ;; The approach is simple: we call `shell-quote-argument', then | |
8735 ;; massage the newline part of the result. | |
8736 ;; | |
8737 ;; This function should produce a string which is grokked by a Unix | |
8738 ;; shell, even if the Emacs is running on Windows. Since this is the | |
8739 ;; kludges section, we bind `system-type' in such a way that | |
8740 ;; `shell-quote-arguments' behaves as if on Unix. | |
8741 ;; | |
8742 ;; Thanks to Mario DeWeerd for the hint that it is sufficient for this | |
8743 ;; function to work with Bourne-like shells. | |
8744 ;; | |
8745 ;; CCC: This function should be rewritten so that | |
8746 ;; `shell-quote-argument' is not used. This way, we are safe from | |
8747 ;; changes in `shell-quote-argument'. | |
8748 (defun tramp-shell-quote-argument (s) | |
8749 "Similar to `shell-quote-argument', but groks newlines. | |
8750 Only works for Bourne-like shells." | |
8751 (let ((system-type 'not-windows)) | |
8752 (save-match-data | |
8753 (let ((result (shell-quote-argument s)) | |
8754 (nl (regexp-quote (format "\\%s" tramp-rsh-end-of-line)))) | |
8755 (when (and (>= (length result) 2) | |
8756 (string= (substring result 0 2) "\\~")) | |
8757 (setq result (substring result 1))) | |
8758 (while (string-match nl result) | |
8759 (setq result (replace-match (format "'%s'" tramp-rsh-end-of-line) | |
8760 t t result))) | |
8761 result)))) | |
8762 | |
68335
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
8763 ;; Checklist for `tramp-unload-hook' |
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
8764 ;; - Unload all `tramp-*' packages |
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
8765 ;; - Reset `file-name-handler-alist' |
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
8766 ;; - Cleanup hooks where Tramp functions are in |
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
8767 ;; - Cleanup advised functions |
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
8768 ;; - Cleanup autoloads |
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
8769 ;;;###autoload |
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
8770 (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
|
8771 "Discard Tramp from loading remote files." |
68335
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
8772 (interactive) |
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
8773 ;; 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
|
8774 (tramp-unload-file-name-handlers) |
68335
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
8775 ;; ange-ftp settings must be enabled. |
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
8776 (when (functionp 'tramp-ftp-enable-ange-ftp) |
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
8777 (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
|
8778 ;; 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
|
8779 (condition-case nil |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8780 (unload-feature 'tramp 'force) |
68335
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
8781 (error nil))) |
118ceefc8263
Sync with Tramp 2.0.52.
Michael Albinus <michael.albinus@gmx.de>
parents:
66630
diff
changeset
|
8782 |
100634
2af636c8c9d2
* net/tramp.el (tramp-rfn-eshadow-update-overlay): Move overlay to
Michael Albinus <michael.albinus@gmx.de>
parents:
100316
diff
changeset
|
8783 (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
|
8784 (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
|
8785 (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
|
8786 |
45861 | 8787 (provide 'tramp) |
8788 | |
8789 ;;; TODO: | |
8790 | |
48973
09acf3f65bb5
* net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
47771
diff
changeset
|
8791 ;; * 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
|
8792 ;; * 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
|
8793 ;; 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
|
8794 ;; 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
|
8795 ;; 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
|
8796 ;; 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
|
8797 ;; (Stefan Monnier). |
45861 | 8798 ;; * Rewrite `tramp-shell-quote-argument' to abstain from using |
46790 | 8799 ;; `shell-quote-argument'. |
45861 | 8800 ;; * In Emacs 21, `insert-directory' shows total number of bytes used |
8801 ;; by the files in that directory. Add this here. | |
8802 ;; * Avoid screen blanking when hitting `g' in dired. (Eli Tziperman) | |
8803 ;; * Make ffap.el grok Tramp filenames. (Eli Tziperman) | |
8804 ;; * Case-insensitive filename completion. (Norbert Goevert.) | |
8805 ;; * Don't use globbing for directories with many files, as this is | |
8806 ;; likely to produce long command lines, and some shells choke on | |
8807 ;; long command lines. | |
8808 ;; * How to deal with MULE in `insert-file-contents' and `write-region'? | |
8809 ;; * Test remote ksh or bash for tilde expansion in `tramp-find-shell'? | |
8810 ;; * 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
|
8811 ;; * Better error checking. At least whenever we see something |
45861 | 8812 ;; strange when doing zerop, we should kill the process and start |
8813 ;; again. (Greg Stark) | |
8814 ;; * Remove unneeded parameters from methods. | |
8815 ;; * Make it work for different encodings, and for different file name | |
8816 ;; encodings, too. (Daniel Pittman) | |
8817 ;; * Don't search for perl5 and perl. Instead, only search for perl and | |
8818 ;; then look if it's the right version (with `perl -v'). | |
8819 ;; * When editing a remote CVS controlled file as a different user, VC | |
8820 ;; gets confused about the file locking status. Try to find out why | |
8821 ;; the workaround doesn't work. | |
46992
6529728ddf05
Version 2.0.13 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46835
diff
changeset
|
8822 ;; * 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
|
8823 ;; ** 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
|
8824 ;; ** 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
|
8825 ;; Code is nearly identical. |
91486
76c777ce052a
* net/tramp.el (tramp-process-sentinel): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
88072
diff
changeset
|
8826 ;; * 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
|
8827 ;; 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
|
8828 ;; 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
|
8829 ;; * 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
|
8830 ;; 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
|
8831 ;; just call |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8832 ;; trampclient filename.c |
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8833 ;; 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
|
8834 ;; 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
|
8835 ;; 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
|
8836 ;; 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
|
8837 ;; 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
|
8838 ;; 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
|
8839 ;; 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
|
8840 ;; 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
|
8841 ;; 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
|
8842 ;; 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
|
8843 ;; 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
|
8844 ;; be nice. |
85694
21983e7c844a
* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
Michael Albinus <michael.albinus@gmx.de>
parents:
85600
diff
changeset
|
8845 ;; 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
|
8846 ;; 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
|
8847 ;; 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
|
8848 ;; way of passing credentials, like by using an SSL socket or |
107189
a48b193e3b5f
(tramp-handle-insert-file-contents): Set always the permissions of the
Michael Albinus <michael.albinus@gmx.de>
parents:
107170
diff
changeset
|
8849 ;; something. (David Kastrup) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8850 ;; * Reconnect directly to a compliant shell without first going |
107189
a48b193e3b5f
(tramp-handle-insert-file-contents): Set always the permissions of the
Michael Albinus <michael.albinus@gmx.de>
parents:
107170
diff
changeset
|
8851 ;; through the user's default shell. (Pete Forman) |
81758
f03856eb136b
* files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents:
77986
diff
changeset
|
8852 ;; * Make `tramp-default-user' obsolete. |
95963
a20bb74ebe03
* net/tramp.el (tramp-handle-start-file-process): Clear
Michael Albinus <michael.albinus@gmx.de>
parents:
95659
diff
changeset
|
8853 ;; * How can I interrupt the remote process with a signal |
107189
a48b193e3b5f
(tramp-handle-insert-file-contents): Set always the permissions of the
Michael Albinus <michael.albinus@gmx.de>
parents:
107170
diff
changeset
|
8854 ;; (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
|
8855 ;; * 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
|
8856 ;; 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
|
8857 ;; 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
|
8858 ;; automatically; possibly SSH would have to be started with |
107189
a48b193e3b5f
(tramp-handle-insert-file-contents): Set always the permissions of the
Michael Albinus <michael.albinus@gmx.de>
parents:
107170
diff
changeset
|
8859 ;; "-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
|
8860 ;; * It makes me wonder if tramp couldn't fall back to ssh when scp |
107189
a48b193e3b5f
(tramp-handle-insert-file-contents): Set always the permissions of the
Michael Albinus <michael.albinus@gmx.de>
parents:
107170
diff
changeset
|
8861 ;; isn't on the remote host. (Mark A. Hershberger) |
a48b193e3b5f
(tramp-handle-insert-file-contents): Set always the permissions of the
Michael Albinus <michael.albinus@gmx.de>
parents:
107170
diff
changeset
|
8862 ;; * Use lsh instead of ssh. (Alfred M. Szmidt) |
103735
d3d4dbf21c9b
* net/tramp.el (tramp-handle-write-region): Flush file properties
Michael Albinus <michael.albinus@gmx.de>
parents:
103642
diff
changeset
|
8863 ;; * 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
|
8864 ;; 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
|
8865 ;; 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
|
8866 ;; 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
|
8867 ;; that they need to, which would then be let bound as appropriate |
107189
a48b193e3b5f
(tramp-handle-insert-file-contents): Set always the permissions of the
Michael Albinus <michael.albinus@gmx.de>
parents:
107170
diff
changeset
|
8868 ;; 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
|
8869 ;; * 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
|
8870 ;; rsync). |
67bdc8713158
* net/tramp.el (tramp-methods): New method "rsyncc".
Michael Albinus <michael.albinus@gmx.de>
parents:
104314
diff
changeset
|
8871 ;; * 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
|
8872 ;; rsync. |
107151
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8873 ;; * Support ptys in `tramp-handle-start-file-process'. (Bug#4604) |
107021
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
8874 ;; * IMHO, it's a drawback that currently Tramp doesn't support |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
8875 ;; Unicode in Dired file names by default. Is it possible to |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
8876 ;; improve Tramp to set LC_ALL to "C" only for commands where Tramp |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
8877 ;; expects English? Or just to set LC_MESSAGES to "C" if Tramp |
107189
a48b193e3b5f
(tramp-handle-insert-file-contents): Set always the permissions of the
Michael Albinus <michael.albinus@gmx.de>
parents:
107170
diff
changeset
|
8878 ;; expects only English messages? (Juri Linkov) |
107021
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
8879 ;; * Make shadowfile.el grok Tramp filenames. (Bug#4526, Bug#4846) |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
8880 ;; * Do not handle files with drive letter as remote. (Bug#5447) |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107538
diff
changeset
|
8881 ;; * Load Tramp subpackages only when needed. (Bug#1529, Bug#5448, Bug#5705) |
107021
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
8882 ;; * Try telnet+curl as new method. It might be useful for busybox, |
b38ac2be4408
Fix some busybox annoyances.
Michael Albinus <albinus@detlef>
parents:
106895
diff
changeset
|
8883 ;; without built-in uuencode/uudecode. |
107151
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8884 ;; * Let `shell-dynamic-complete-*' and `comint-dynamic-complete' work |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8885 ;; on remote hosts. |
7e66e7efd47d
* net/tramp.el (tramp-process-actions, tramp-read-passwd):
Michael Albinus <michael.albinus@gmx.de>
parents:
107085
diff
changeset
|
8886 ;; * Use secrets.el for password handling. |
107858 | 8887 ;; * Load ~/.emacs_SHELLNAME on the remote host for `shell'. |
45861 | 8888 |
8889 ;; Functions for file-name-handler-alist: | |
8890 ;; diff-latest-backup-file -- in diff.el | |
8891 | |
93103
19a32f437b65
Fix up encoding.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93082
diff
changeset
|
8892 ;; arch-tag: 3a21a994-182b-48fa-b0cd-c1d9fede424a |
45861 | 8893 ;;; tramp.el ends here |
93040
ba82da0cb626
* net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents:
93036
diff
changeset
|
8894 |
ba82da0cb626
* net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents:
93036
diff
changeset
|
8895 ;; Local Variables: |
ba82da0cb626
* net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents:
93036
diff
changeset
|
8896 ;; mode: Emacs-Lisp |
ba82da0cb626
* net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents:
93036
diff
changeset
|
8897 ;; coding: utf-8 |
ba82da0cb626
* net/tramp.el (tramp-root-regexp): Simplify.
Michael Albinus <michael.albinus@gmx.de>
parents:
93036
diff
changeset
|
8898 ;; End: |