January 2013 - XEmacs-Patches - XEmacs Mailing List Archives

commit/tramp: albinus: * lisp/tramp-loaddefs.el: Remove entries for tramp-ftp, tramp-gvfs 11 years, 11 months

Bitbucket

1 new commit in tramp: https://bitbucket.org/xemacs/tramp/commits/9888b23060f7/ changeset: 9888b23060f7 user: albinus date: 2013-01-23 13:26:52 summary: * lisp/tramp-loaddefs.el: Remove entries for tramp-ftp, tramp-gvfs and tramp-gw. affected #: 2 files diff -r a7db6b85b7ffc16ad7727004eee797e9a5be2c57 -r 9888b23060f7275c2a6df865931c34ef868eb5fb ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,3 +1,8 ＠＠ +2013-01-23 Michael Albinus <michael.albinus(a)gmx.de> + + * lisp/tramp-loaddefs.el: Remove entries for tramp-ftp, tramp-gvfs + and tramp-gw. + 2013-01-22 Michael Albinus <michael.albinus(a)gmx.de> * Makefile (ELCS): Remove lisp/tramp-ftp.elc diff -r a7db6b85b7ffc16ad7727004eee797e9a5be2c57 -r 9888b23060f7275c2a6df865931c34ef868eb5fb lisp/tramp-loaddefs.el --- a/lisp/tramp-loaddefs.el +++ b/lisp/tramp-loaddefs.el ＠＠ -469,79 +469,6 ＠＠ ;;;*** -;;;### (autoloads (tramp-ftp-file-name-handler) "tramp-ftp" "/net/ford/albinus/src/tramp/lisp/tramp-ftp") - -(defconst tramp-ftp-method "ftp" "\ -When this method name is used, forward all calls to Ange-FTP.") - -(unless (featurep 'xemacs) (add-to-list 'tramp-methods (cons tramp-ftp-method nil)) (add-to-list 'tramp-default-method-alist (list "\\`ftp\\." nil tramp-ftp-method)) (add-to-list 'tramp-default-method-alist (list nil "\\`\$anonymous\\|ftp\$\\'" tramp-ftp-method))) - -(eval-after-load 'tramp '(tramp-set-completion-function tramp-ftp-method '((tramp-parse-netrc "~/.netrc")))) - -(autoload 'tramp-ftp-file-name-handler "tramp-ftp" "\ -Invoke the Ange-FTP handler for OPERATION. -First arg specifies the OPERATION, second arg is a list of arguments to -pass to the OPERATION. - -arguments: (OPERATION &rest ARGS) -" nil nil) - -(defsubst tramp-ftp-file-name-p (filename) "\ -Check if it's a filename that should be forwarded to Ange-FTP." (string= (tramp-file-name-method (tramp-dissect-file-name filename)) tramp-ftp-method)) - -(unless (featurep 'xemacs) (add-to-list 'tramp-foreign-file-name-handler-alist (cons 'tramp-ftp-file-name-p 'tramp-ftp-file-name-handler))) - -;;;*** - -;;;### (autoloads (tramp-gvfs-file-name-handler tramp-gvfs-methods) "tramp-gvfs" "/net/ford/albinus/src/tramp/lisp/tramp-gvfs") - -(defvar tramp-gvfs-methods '("dav" "davs" "obex" "synce") "\ -List of methods for remote files, accessed with GVFS.") - -(add-to-list 'tramp-default-user-alist '("\\`synce\\'" nil nil)) - -(when (featurep 'dbusbind) (dolist (elt tramp-gvfs-methods) (unless (assoc elt tramp-methods) (add-to-list 'tramp-methods (cons elt nil))))) - -(defsubst tramp-gvfs-file-name-p (filename) "\ -Check if it's a filename handled by the GVFS daemon." (and (tramp-tramp-file-p filename) (let ((method (tramp-file-name-method (tramp-dissect-file-name filename)))) (and (stringp method) (member method tramp-gvfs-methods))))) - -(autoload 'tramp-gvfs-file-name-handler "tramp-gvfs" "\ -Invoke the GVFS related OPERATION. -First arg specifies the OPERATION, second arg is a list of arguments to -pass to the OPERATION. - -arguments: (OPERATION &rest ARGS) -" nil nil) - -(when (featurep 'dbusbind) (add-to-list 'tramp-foreign-file-name-handler-alist (cons 'tramp-gvfs-file-name-p 'tramp-gvfs-file-name-handler))) - -;;;*** - -;;;### (autoloads (tramp-gw-open-connection) "tramp-gw" "/net/ford/albinus/src/tramp/lisp/tramp-gw") - -(defconst tramp-gw-tunnel-method "tunnel" "\ -Method to connect HTTP gateways.") - -(defconst tramp-gw-socks-method "socks" "\ -Method to connect SOCKS servers.") - -(add-to-list 'tramp-default-user-alist (list (concat "\\`" (regexp-opt (list tramp-gw-tunnel-method tramp-gw-socks-method)) "\\'") nil (user-login-name))) - -(autoload 'tramp-gw-open-connection "tramp-gw" "\ -Open a remote connection to VEC (see `tramp-file-name' structure). -Take GW-VEC as SOCKS or HTTP gateway, i.e. its method must be a -gateway method. TARGET-VEC identifies where to connect to via -the gateway, it can be different from VEC when there are more -hops to be applied. - -It returns a string like \"localhost#port\", which must be used -instead of the host name declared in TARGET-VEC. - -arguments: (VEC GW-VEC TARGET-VEC) -" nil nil) - -;;;*** - ;;;### (autoloads (tramp-sh-file-name-handler tramp-remote-path tramp-terminal-type) "tramp-sh" "/net/ford/albinus/src/tramp/lisp/tramp-sh") (defvar tramp-terminal-type "dumb" "\ Repository URL: https://bitbucket.org/xemacs/tramp/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

Re: tramp modification broke ediff compile 11 years, 11 months

Vin Shelton

On Tue, Jan 22, 2013 at 9:37 PM, Michael Kifer <michael.kifer(a)stonybrook.edu> wrote: > Yes, please apply it. Thanks. Done. Thank you. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

commit/ediff: Vin Shelton: Fix broken requires caused by tramp update 11 years, 11 months

Bitbucket

1 new commit in ediff: https://bitbucket.org/xemacs/ediff/commits/bdbc67c1c927/ changeset: bdbc67c1c927 user: Vin Shelton date: 2013-01-21 23:53:31 summary: Fix broken requires caused by tramp update affected #: 2 files diff -r e574c28af4793c5c3d4c3c3e8fa9a13d3f250f74 -r bdbc67c1c9274ef68f98be379e96453baea8f72d ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,3 +1,7 ＠＠ +2013-01-21 Vin Shelton <acs(a)xemacs.org> + + * Makefile (REQUIRES): New tramp update requires sh-script. + 2009-12-21 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 1.81 released. diff -r e574c28af4793c5c3d4c3c3e8fa9a13d3f250f74 -r bdbc67c1c9274ef68f98be379e96453baea8f72d Makefile --- a/Makefile +++ b/Makefile ＠＠ -22,7 +22,8 ＠＠ MAINTAINER = Michael Kifer <kifer(a)cs.sunysb.edu> PACKAGE = ediff PKG_TYPE = regular -REQUIRES = pcl-cvs elib dired xemacs-base edebug prog-modes gnus tramp vc +REQUIRES = pcl-cvs elib dired xemacs-base edebug prog-modes gnus tramp \ + vc sh-script CATEGORY = standard ELCS = ediff-diff.elc ediff-help.elc ediff-hook.elc ediff-init.elc \ Repository URL: https://bitbucket.org/xemacs/ediff/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

Re: tramp modification broke ediff compile 11 years, 11 months

Michael Kifer

_______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

tramp modification broke ediff compile 11 years, 11 months

Vin Shelton

Michael - Since the tramp update, without the attached patch ediff will not compile. Do you want me to apply this patch, or do you have something else in mind? Regards, Vin _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

commit/pcl-cvs: Vin Shelton: Fix broken requires caused by tramp update 11 years, 11 months

Bitbucket

1 new commit in pcl-cvs: https://bitbucket.org/xemacs/pcl-cvs/commits/b93ade192ae4/ changeset: b93ade192ae4 user: Vin Shelton date: 2013-01-21 23:53:19 summary: Fix broken requires caused by tramp update affected #: 2 files diff -r edc81e85ee70ea6fe14a3a7e7bb79c0ecdf10b78 -r b93ade192ae4508c8aafefc9b36ec25265b11337 ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,3 +1,7 ＠＠ +2013-01-21 Vin Shelton <acs(a)xemacs.org> + + * Makefile (REQUIRES): New tramp update requires sh-script. + 2009-11-24 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 1.70 released. diff -r edc81e85ee70ea6fe14a3a7e7bb79c0ecdf10b78 -r b93ade192ae4508c8aafefc9b36ec25265b11337 Makefile --- a/Makefile +++ b/Makefile ＠＠ -23,7 +23,7 ＠＠ PACKAGE = pcl-cvs PKG_TYPE = regular REQUIRES = xemacs-base elib vc dired edebug ediff edit-utils mail-lib \ - prog-modes tramp gnus + prog-modes tramp gnus sh-script CATEGORY = standard ELCS = cvs-compat.elc cvs-edit.elc cvs-log.elc cvs-status.elc \ Repository URL: https://bitbucket.org/xemacs/pcl-cvs/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

commit/tramp: albinus: * Makefile (ELCS): Remove lisp/tramp-ftp.elc 11 years, 11 months

Bitbucket

1 new commit in tramp: https://bitbucket.org/xemacs/tramp/commits/a7db6b85b7ff/ changeset: a7db6b85b7ff user: albinus date: 2013-01-22 12:16:26 summary: * Makefile (ELCS): Remove lisp/tramp-ftp.elc lisp/tramp-gw.elc lisp/tramp-loaddefs.elc. * lisp/Makefile: * lisp/tramp-ftp.el: * lisp/tramp-gvfs.el: * lisp/tramp-gw.el: Remove files from repository. They are not needed for XEmacs. affected #: 6 files diff -r 4cfc445554a8df6479927f8ead8171037d76ed46 -r a7db6b85b7ffc16ad7727004eee797e9a5be2c57 ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,3 +1,14 ＠＠ +2013-01-22 Michael Albinus <michael.albinus(a)gmx.de> + + * Makefile (ELCS): Remove lisp/tramp-ftp.elc + lisp/tramp-gw.elc lisp/tramp-loaddefs.elc. + + * lisp/Makefile: + * lisp/tramp-ftp.el: + * lisp/tramp-gvfs.el: + * lisp/tramp-gw.el: Remove files from repository. They are not + needed for XEmacs. + 2013-01-21 Michael Albinus <michael.albinus(a)gmx.de> * Makefile (ELCS): Remove lisp/tramp-gvfs.elc. diff -r 4cfc445554a8df6479927f8ead8171037d76ed46 -r a7db6b85b7ffc16ad7727004eee797e9a5be2c57 Makefile --- a/Makefile +++ b/Makefile ＠＠ -29,7 +29,6 ＠＠ ELCS = lisp/tramp.elc lisp/tramp-adb.elc lisp/tramp-cache.elc \ lisp/tramp-cmds.elc lisp/tramp-compat.elc lisp/tramp-efs.elc \ - lisp/tramp-ftp.elc lisp/tramp-gw.elc lisp/tramp-loaddefs.elc \ lisp/tramp-sh.elc lisp/tramp-smb.elc lisp/tramp-uu.elc lisp/trampver.elc EXTRA_SOURCES = ChangeLog.upstream diff -r 4cfc445554a8df6479927f8ead8171037d76ed46 -r a7db6b85b7ffc16ad7727004eee797e9a5be2c57 lisp/Makefile --- a/lisp/Makefile +++ /dev/null ＠＠ -1,29 +0,0 ＠＠ -INSTALL=install -m644 -FTPDIR=/home-local/ftp/pub/src/emacs -SLISP=/app/unido-i06/sun4_56/edit/emacs/20.5/share/emacs/site-lisp - -all: tramp - -tramp: tramp.elc tramp-vc.elc tramp-util.elc - -tramp.elc: tramp.el base64.elc format-spec.elc - $(EMACS) -batch --eval "(add-to-list 'load-path \".\")" \ - -f batch-byte-compile tramp.el - -tramp-vc.elc: tramp-vc.el tramp.elc - $(EMACS) -batch --eval "(add-to-list 'load-path \".\")" \ - -f batch-byte-compile tramp-vc.el - -tramp-util.elc: tramp-util.el - $(EMACS) -batch --eval "(add-to-list 'load-path \".\")" \ - -f batch-byte-compile tramp-util.el - -install: all - $(INSTALL) tramp.el $(FTPDIR) - -site-lisp: all - /usr/ucb/$(INSTALL) tramp.el $(SLISP) - cd $(SLISP) && emacs-20.5 -batch -f batch-byte-compile tramp.el - -clean: - $(RM) *.elc diff -r 4cfc445554a8df6479927f8ead8171037d76ed46 -r a7db6b85b7ffc16ad7727004eee797e9a5be2c57 lisp/tramp-ftp.el --- a/lisp/tramp-ftp.el +++ /dev/null ＠＠ -1,226 +0,0 ＠＠ -;;; tramp-ftp.el --- Tramp convenience functions for Ange-FTP - -;; Copyright (C) 2002-2013 Free Software Foundation, Inc. - -;; Author: Michael Albinus <michael.albinus(a)gmx.de> -;; Keywords: comm, processes -;; Package: tramp - -;; This file is part of GNU Emacs. - -;; GNU Emacs is free software: you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - -;;; Commentary: - -;; Convenience functions for calling Ange-FTP from Tramp. -;; Most of them are displaced from tramp.el. - -;;; Code: - -(require 'tramp) - -(eval-when-compile - - ;; Pacify byte-compiler. - (require 'cl) - (require 'custom)) - -;; Disable Ange-FTP from file-name-handler-alist. -;; To handle EFS, the following functions need to be dealt with: -;; -;; * dired-before-readin-hook contains efs-dired-before-readin -;; * file-name-handler-alist contains efs-file-handler-function -;; and efs-root-handler-function and efs-sifn-handler-function -;; * find-file-hooks contains efs-set-buffer-mode -;; -;; But it won't happen for EFS since the XEmacs maintainers -;; don't want to use a unified filename syntax. -(defun tramp-disable-ange-ftp () - "Turn Ange-FTP off. -This is useful for unified remoting. See -`tramp-file-name-structure' for details. Requests suitable for -Ange-FTP will be forwarded to Ange-FTP. Also see the variables -`tramp-ftp-method', `tramp-default-method', and -`tramp-default-method-alist'. - -This function is not needed in Emacsen which include Tramp, but is -present for backward compatibility." - (let ((a1 (rassq 'ange-ftp-hook-function file-name-handler-alist)) - (a2 (rassq 'ange-ftp-completion-hook-function file-name-handler-alist))) - (setq file-name-handler-alist - (delete a1 (delete a2 file-name-handler-alist))))) - -(eval-after-load "ange-ftp" - '(when (functionp 'tramp-disable-ange-ftp) - (tramp-disable-ange-ftp))) - -;;;###autoload -(defun tramp-ftp-enable-ange-ftp () - ;; The following code is commented out in Ange-FTP. - - ;;; This regexp takes care of real ange-ftp file names (with a slash - ;;; and colon). - ;;; Don't allow the host name to end in a period--some systems use /.: - (or (assoc "^/[^/:]*[^/:.]:" file-name-handler-alist) - (setq file-name-handler-alist - (cons '("^/[^/:]*[^/:.]:" . ange-ftp-hook-function) - file-name-handler-alist))) - - ;;; This regexp recognizes absolute filenames with only one component, - ;;; for the sake of hostname completion. - (or (assoc "^/[^/:]*\\'" file-name-handler-alist) - (setq file-name-handler-alist - (cons '("^/[^/:]*\\'" . ange-ftp-completion-hook-function) - file-name-handler-alist))) - - ;;; This regexp recognizes absolute filenames with only one component - ;;; on Windows, for the sake of hostname completion. - (and (memq system-type '(ms-dos windows-nt)) - (or (assoc "^[a-zA-Z]:/[^/:]*\\'" file-name-handler-alist) - (setq file-name-handler-alist - (cons '("^[a-zA-Z]:/[^/:]*\\'" . - ange-ftp-completion-hook-function) - file-name-handler-alist))))) - -(add-hook 'tramp-ftp-unload-hook 'tramp-ftp-enable-ange-ftp) - -;; Define FTP method ... -;;;###tramp-autoload -(defconst tramp-ftp-method "ftp" - "When this method name is used, forward all calls to Ange-FTP.") - -;; ... and add it to the method list. -;;;###tramp-autoload -(unless (featurep 'xemacs) - (add-to-list 'tramp-methods (cons tramp-ftp-method nil)) - - ;; Add some defaults for `tramp-default-method-alist'. - (add-to-list 'tramp-default-method-alist - (list "\\`ftp\\." nil tramp-ftp-method)) - (add-to-list 'tramp-default-method-alist - (list nil "\\`\$anonymous\\|ftp\$\\'" tramp-ftp-method))) - -;; Add completion function for FTP method. -;;;###tramp-autoload -(eval-after-load 'tramp - '(tramp-set-completion-function - tramp-ftp-method - '((tramp-parse-netrc "~/.netrc")))) - -;; If there is URL syntax, `substitute-in-file-name' needs special -;; handling. -(put 'substitute-in-file-name 'ange-ftp 'tramp-handle-substitute-in-file-name) -(add-hook 'tramp-ftp-unload-hook - (lambda () - (setplist 'substitute-in-file-name - (delete 'ange-ftp - (delete 'tramp-handle-substitute-in-file-name - (symbol-plist - 'substitute-in-file-name)))))) - -;;;###tramp-autoload -(defun tramp-ftp-file-name-handler (operation &rest args) - "Invoke the Ange-FTP handler for OPERATION. -First arg specifies the OPERATION, second arg is a list of arguments to -pass to the OPERATION." - (save-match-data - (or (boundp 'ange-ftp-name-format) - (let (file-name-handler-alist) (require 'ange-ftp))) - (let ((ange-ftp-name-format - (list (nth 0 tramp-file-name-structure) - (nth 3 tramp-file-name-structure) - (nth 2 tramp-file-name-structure) - (nth 4 tramp-file-name-structure))) - ;; ange-ftp uses `ange-ftp-ftp-name-arg' and `ange-ftp-ftp-name-res' - ;; for optimization in `ange-ftp-ftp-name'. If Tramp wasn't active, - ;; there could be incorrect values from previous calls in case the - ;; "ftp" method is used in the Tramp file name. So we unset - ;; those values. - (ange-ftp-ftp-name-arg "") - (ange-ftp-ftp-name-res nil)) - (cond - ;; If argument is a symlink, `file-directory-p' and - ;; `file-exists-p' call the traversed file recursively. So we - ;; cannot disable the file-name-handler this case. We set the - ;; connection property "started" in order to put the remote - ;; location into the cache, which is helpful for further - ;; completion. We don't use `with-parsed-tramp-file-name', - ;; because this returns another user but the one declared in - ;; "~/.netrc". - ((memq operation '(file-directory-p file-exists-p)) - (if (apply 'ange-ftp-hook-function operation args) - (let ((v (tramp-dissect-file-name (car args) t))) - (aset v 0 tramp-ftp-method) - (tramp-set-connection-property v "started" t)) - nil)) - - ;; If the second argument of `copy-file' or `rename-file' is a - ;; remote file name but via FTP, ange-ftp doesn't check this. - ;; We must copy it locally first, because there is no place in - ;; ange-ftp for correct handling. - ((and (memq operation '(copy-file rename-file)) - (file-remote-p (cadr args)) - (not (tramp-ftp-file-name-p (cadr args)))) - (let* ((filename (car args)) - (newname (cadr args)) - (tmpfile (tramp-compat-make-temp-file filename)) - (args (cddr args))) - ;; We must set `ok-if-already-exists' to t in the first - ;; step, because the temp file has been created already. - (if (eq operation 'copy-file) - (apply operation filename tmpfile t (cdr args)) - (apply operation filename tmpfile t)) - (unwind-protect - (rename-file tmpfile newname (car args)) - ;; Cleanup. - (ignore-errors (delete-file tmpfile))))) - - ;; Normally, the handlers must be discarded. - ;; `inhibit-file-name-handlers' isn't sufficient, because the - ;; local file name could be in Tramp syntax as well (for - ;; example, returning VMS file names like "/DISK$CAM:/AAA"). - ;; That's why we set also `tramp-mode' to nil. - (t (let* (;(tramp-mode nil) - (inhibit-file-name-handlers - (list 'tramp-file-name-handler - 'tramp-completion-file-name-handler - (and (eq inhibit-file-name-operation operation) - inhibit-file-name-handlers))) - (inhibit-file-name-operation operation)) - (apply 'ange-ftp-hook-function operation args))))))) - -;; It must be a `defsubst' in order to push the whole code into -;; tramp-loaddefs.el. Otherwise, there would be recursive autoloading. -;;;###tramp-autoload -(defsubst tramp-ftp-file-name-p (filename) - "Check if it's a filename that should be forwarded to Ange-FTP." - (string= (tramp-file-name-method (tramp-dissect-file-name filename)) - tramp-ftp-method)) - -;;;###tramp-autoload -(unless (featurep 'xemacs) - (add-to-list 'tramp-foreign-file-name-handler-alist - (cons 'tramp-ftp-file-name-p 'tramp-ftp-file-name-handler))) - -(add-hook 'tramp-unload-hook - (lambda () - (unload-feature 'tramp-ftp 'force))) - -(provide 'tramp-ftp) - -;;; TODO: - -;; * There are no backup files on FTP hosts. - -;;; tramp-ftp.el ends here diff -r 4cfc445554a8df6479927f8ead8171037d76ed46 -r a7db6b85b7ffc16ad7727004eee797e9a5be2c57 lisp/tramp-gvfs.el --- a/lisp/tramp-gvfs.el +++ /dev/null ＠＠ -1,1448 +0,0 ＠＠ -;;; tramp-gvfs.el --- Tramp access functions for GVFS daemon - -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. - -;; Author: Michael Albinus <michael.albinus(a)gmx.de> -;; Keywords: comm, processes -;; Package: tramp - -;; This file is part of GNU Emacs. - -;; GNU Emacs is free software: you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - -;;; Commentary: - -;; Access functions for the GVFS daemon from Tramp. Tested with GVFS -;; 1.0.2 (Ubuntu 8.10, Gnome 2.24). It has been reported also to run -;; with GVFS 0.2.5 (Ubuntu 8.04, Gnome 2.22), but there is an -;; incompatibility with the mount_info structure, which has been -;; worked around. - -;; It has also been tested with GVFS 1.6.2 (Ubuntu 10.04, Gnome 2.30), -;; where the default_location has been added to mount_info (see -;; <https://bugzilla.gnome.org/show_bug.cgi?id=561998>. - -;; All actions to mount a remote location, and to retrieve mount -;; information, are performed by D-Bus messages. File operations -;; themselves are performed via the mounted filesystem in ~/.gvfs. -;; Consequently, GNU Emacs 23.1 with enabled D-Bus bindings is a -;; precondition. - -;; The GVFS D-Bus interface is said to be unstable. There are even no -;; introspection data. The interface, as discovered during -;; development time, is given in respective comments. - -;; The customer option `tramp-gvfs-methods' contains the list of -;; supported connection methods. Per default, these are "dav", -;; "davs", "obex" and "synce". Note that with "obex" it might be -;; necessary to pair with the other bluetooth device, if it hasn't -;; been done already. There might be also some few seconds delay in -;; discovering available bluetooth devices. - -;; Other possible connection methods are "ftp", "sftp" and "smb". -;; When one of these methods is added to the list, the remote access -;; for that method is performed via GVFS instead of the native Tramp -;; implementation. - -;; GVFS offers even more connection methods. The complete list of -;; connection methods of the actual GVFS implementation can be -;; retrieved by: -;; -;; (message -;; "%s" -;; (mapcar -;; 'car -;; (dbus-call-method -;;:session tramp-gvfs-service-daemon tramp-gvfs-path-mounttracker -;; tramp-gvfs-interface-mounttracker "listMountableInfo"))) - -;; Note that all other connection methods are not tested, beside the -;; ones offered for customization in `tramp-gvfs-methods'. If you -;; request an additional connection method to be supported, please -;; drop me a note. - -;; For hostname completion, information is retrieved either from the -;; bluez daemon (for the "obex" method), the hal daemon (for the -;; "synce" method), or from the zeroconf daemon (for the "dav", -;; "davs", and "sftp" methods). The zeroconf daemon is pre-configured -;; to discover services in the "local" domain. If another domain -;; shall be used for discovering services, the customer option -;; `tramp-gvfs-zeroconf-domain' can be set accordingly. - -;; Restrictions: - -;; * The current GVFS implementation does not allow to write on the -;; remote bluetooth device via OBEX. -;; -;; * Two shares of the same SMB server cannot be mounted in parallel. - -;;; Code: - -;; D-Bus support in the Emacs core can be disabled with configuration -;; option "--without-dbus". Declare used subroutines and variables. -(declare-function dbus-get-unique-name "dbusbind.c") - -;; Pacify byte-compiler -(eval-when-compile - (require 'cl) - (require 'custom)) - -(require 'tramp) - -(require 'dbus) -(require 'url-parse) -(require 'url-util) -(require 'zeroconf) - -;;;###tramp-autoload -(defcustom tramp-gvfs-methods '("dav" "davs" "obex" "synce") - "List of methods for remote files, accessed with GVFS." -:group 'tramp -:version "23.2" -:type '(repeat (choice (const "dav") - (const "davs") - (const "ftp") - (const "obex") - (const "sftp") - (const "smb") - (const "synce")))) - -;; Add a default for `tramp-default-user-alist'. Rule: For the SYNCE -;; method, no user is chosen. -;;;###tramp-autoload -(add-to-list 'tramp-default-user-alist '("\\`synce\\'" nil nil)) - -(defcustom tramp-gvfs-zeroconf-domain "local" - "Zeroconf domain to be used for discovering services, like host names." -:group 'tramp -:version "23.2" -:type 'string) - -;; Add the methods to `tramp-methods', in order to allow minibuffer -;; completion. -;;;###tramp-autoload -(when (featurep 'dbusbind) - (dolist (elt tramp-gvfs-methods) - (unless (assoc elt tramp-methods) - (add-to-list 'tramp-methods (cons elt nil))))) - -(defconst tramp-gvfs-path-tramp (concat dbus-path-emacs "/Tramp") - "The preceding object path for own objects.") - -(defconst tramp-gvfs-service-daemon "org.gtk.vfs.Daemon" - "The well known name of the GVFS daemon.") - -;; Check that GVFS is available. D-Bus integration is available since -;; Emacs 23 on some system types. We don't call `dbus-ping', because -;; this would load dbus.el. -(unless (and (tramp-compat-funcall 'dbus-get-unique-name :session) - (tramp-compat-process-running-p "gvfs-fuse-daemon")) - (error "Package `tramp-gvfs' not supported")) - -(defconst tramp-gvfs-path-mounttracker "/org/gtk/vfs/mounttracker" - "The object path of the GVFS daemon.") - -(defconst tramp-gvfs-interface-mounttracker "org.gtk.vfs.MountTracker" - "The mount tracking interface in the GVFS daemon.") - -;; <interface name='org.gtk.vfs.MountTracker'> -;; <method name='listMounts'> -;; <arg name='mount_info_list' -;; type='a{sosssssbay{aya{say}}ay}' -;; direction='out'/> -;; </method> -;; <method name='mountLocation'> -;; <arg name='mount_spec' type='{aya{say}}' direction='in'/> -;; <arg name='dbus_id' type='s' direction='in'/> -;; <arg name='object_path' type='o' direction='in'/> -;; </method> -;; <signal name='mounted'> -;; <arg name='mount_info' -;; type='{sosssssbay{aya{say}}ay}'/> -;; </signal> -;; <signal name='unmounted'> -;; <arg name='mount_info' -;; type='{sosssssbay{aya{say}}ay}'/> -;; </signal> -;; </interface> -;; -;; STRUCT mount_info -;; STRING dbus_id -;; OBJECT_PATH object_path -;; STRING display_name -;; STRING stable_name -;; STRING x_content_types Since GVFS 1.0 only !!! -;; STRING icon -;; STRING preferred_filename_encoding -;; BOOLEAN user_visible -;; ARRAY BYTE fuse_mountpoint -;; STRUCT mount_spec -;; ARRAY BYTE mount_prefix -;; ARRAY -;; STRUCT mount_spec_item -;; STRING key (server, share, type, user, host, port) -;; ARRAY BYTE value -;; ARRAY BYTE default_location Since GVFS 1.5 only !!! - -(defconst tramp-gvfs-interface-mountoperation "org.gtk.vfs.MountOperation" - "Used by the dbus-proxying implementation of GMountOperation.") - -;; <interface name='org.gtk.vfs.MountOperation'> -;; <method name='askPassword'> -;; <arg name='message' type='s' direction='in'/> -;; <arg name='default_user' type='s' direction='in'/> -;; <arg name='default_domain' type='s' direction='in'/> -;; <arg name='flags' type='u' direction='in'/> -;; <arg name='handled' type='b' direction='out'/> -;; <arg name='aborted' type='b' direction='out'/> -;; <arg name='password' type='s' direction='out'/> -;; <arg name='username' type='s' direction='out'/> -;; <arg name='domain' type='s' direction='out'/> -;; <arg name='anonymous' type='b' direction='out'/> -;; <arg name='password_save' type='u' direction='out'/> -;; </method> -;; <method name='askQuestion'> -;; <arg name='message' type='s' direction='in'/> -;; <arg name='choices' type='as' direction='in'/> -;; <arg name='handled' type='b' direction='out'/> -;; <arg name='aborted' type='b' direction='out'/> -;; <arg name='choice' type='u' direction='out'/> -;; </method> -;; </interface> - -;; The following flags are used in "askPassword". They are defined in -;; /usr/include/glib-2.0/gio/gioenums.h. - -(defconst tramp-gvfs-password-need-password 1 - "Operation requires a password.") - -(defconst tramp-gvfs-password-need-username 2 - "Operation requires a username.") - -(defconst tramp-gvfs-password-need-domain 4 - "Operation requires a domain.") - -(defconst tramp-gvfs-password-saving-supported 8 - "Operation supports saving settings.") - -(defconst tramp-gvfs-password-anonymous-supported 16 - "Operation supports anonymous users.") - -(defconst tramp-bluez-service "org.bluez" - "The well known name of the BLUEZ service.") - -(defconst tramp-bluez-interface-manager "org.bluez.Manager" - "The manager interface of the BLUEZ daemon.") - -;; <interface name='org.bluez.Manager'> -;; <method name='DefaultAdapter'> -;; <arg type='o' direction='out'/> -;; </method> -;; <method name='FindAdapter'> -;; <arg type='s' direction='in'/> -;; <arg type='o' direction='out'/> -;; </method> -;; <method name='ListAdapters'> -;; <arg type='ao' direction='out'/> -;; </method> -;; <signal name='AdapterAdded'> -;; <arg type='o'/> -;; </signal> -;; <signal name='AdapterRemoved'> -;; <arg type='o'/> -;; </signal> -;; <signal name='DefaultAdapterChanged'> -;; <arg type='o'/> -;; </signal> -;; </interface> - -(defconst tramp-bluez-interface-adapter "org.bluez.Adapter" - "The adapter interface of the BLUEZ daemon.") - -;; <interface name='org.bluez.Adapter'> -;; <method name='GetProperties'> -;; <arg type='a{sv}' direction='out'/> -;; </method> -;; <method name='SetProperty'> -;; <arg type='s' direction='in'/> -;; <arg type='v' direction='in'/> -;; </method> -;; <method name='RequestMode'> -;; <arg type='s' direction='in'/> -;; </method> -;; <method name='ReleaseMode'/> -;; <method name='RequestSession'/> -;; <method name='ReleaseSession'/> -;; <method name='StartDiscovery'/> -;; <method name='StopDiscovery'/> -;; <method name='ListDevices'> -;; <arg type='ao' direction='out'/> -;; </method> -;; <method name='CreateDevice'> -;; <arg type='s' direction='in'/> -;; <arg type='o' direction='out'/> -;; </method> -;; <method name='CreatePairedDevice'> -;; <arg type='s' direction='in'/> -;; <arg type='o' direction='in'/> -;; <arg type='s' direction='in'/> -;; <arg type='o' direction='out'/> -;; </method> -;; <method name='CancelDeviceCreation'> -;; <arg type='s' direction='in'/> -;; </method> -;; <method name='RemoveDevice'> -;; <arg type='o' direction='in'/> -;; </method> -;; <method name='FindDevice'> -;; <arg type='s' direction='in'/> -;; <arg type='o' direction='out'/> -;; </method> -;; <method name='RegisterAgent'> -;; <arg type='o' direction='in'/> -;; <arg type='s' direction='in'/> -;; </method> -;; <method name='UnregisterAgent'> -;; <arg type='o' direction='in'/> -;; </method> -;; <signal name='DeviceCreated'> -;; <arg type='o'/> -;; </signal> -;; <signal name='DeviceRemoved'> -;; <arg type='o'/> -;; </signal> -;; <signal name='DeviceFound'> -;; <arg type='s'/> -;; <arg type='a{sv}'/> -;; </signal> -;; <signal name='PropertyChanged'> -;; <arg type='s'/> -;; <arg type='v'/> -;; </signal> -;; <signal name='DeviceDisappeared'> -;; <arg type='s'/> -;; </signal> -;; </interface> - -(defcustom tramp-bluez-discover-devices-timeout 60 - "Defines seconds since last bluetooth device discovery before rescanning. -A value of 0 would require an immediate discovery during hostname -completion, nil means to use always cached values for discovered -devices." -:group 'tramp -:version "23.2" -:type '(choice (const nil) integer)) - -(defvar tramp-bluez-discovery nil - "Indicator for a running bluetooth device discovery. -It keeps the timestamp of last discovery.") - -(defvar tramp-bluez-devices nil - "Alist of detected bluetooth devices. -Every entry is a list (NAME ADDRESS).") - -(defconst tramp-hal-service "org.freedesktop.Hal" - "The well known name of the HAL service.") - -(defconst tramp-hal-path-manager "/org/freedesktop/Hal/Manager" - "The object path of the HAL daemon manager.") - -(defconst tramp-hal-interface-manager "org.freedesktop.Hal.Manager" - "The manager interface of the HAL daemon.") - -(defconst tramp-hal-interface-device "org.freedesktop.Hal.Device" - "The device interface of the HAL daemon.") - - -;; New handlers should be added here. -(defconst tramp-gvfs-file-name-handler-alist - '( - (access-file . ignore) - (add-name-to-file . tramp-gvfs-handle-copy-file) - ;; `byte-compiler-base-file-name' performed by default handler. - (copy-file . tramp-gvfs-handle-copy-file) - (delete-directory . tramp-gvfs-handle-delete-directory) - (delete-file . tramp-gvfs-handle-delete-file) - ;; `diff-latest-backup-file' performed by default handler. - (directory-file-name . tramp-handle-directory-file-name) - (directory-files . tramp-gvfs-handle-directory-files) - (directory-files-and-attributes - . tramp-gvfs-handle-directory-files-and-attributes) - (dired-call-process . ignore) - (dired-compress-file . ignore) - (dired-uncache . tramp-handle-dired-uncache) - ;; `executable-find' is not official yet. performed by default handler. - (expand-file-name . tramp-gvfs-handle-expand-file-name) - (file-accessible-directory-p . tramp-handle-file-accessible-directory-p) - (file-acl . tramp-gvfs-handle-file-acl) - (file-attributes . tramp-gvfs-handle-file-attributes) - (file-directory-p . tramp-gvfs-handle-file-directory-p) - (file-executable-p . tramp-gvfs-handle-file-executable-p) - (file-exists-p . tramp-gvfs-handle-file-exists-p) - (file-local-copy . tramp-gvfs-handle-file-local-copy) - ;; `file-modes' performed by default handler. - (file-name-all-completions . tramp-gvfs-handle-file-name-all-completions) - (file-name-as-directory . tramp-handle-file-name-as-directory) - (file-name-completion . tramp-handle-file-name-completion) - (file-name-directory . tramp-handle-file-name-directory) - (file-name-nondirectory . tramp-handle-file-name-nondirectory) - ;; `file-name-sans-versions' performed by default handler. - (file-newer-than-file-p . tramp-handle-file-newer-than-file-p) - (file-ownership-preserved-p . ignore) - (file-readable-p . tramp-gvfs-handle-file-readable-p) - (file-regular-p . tramp-handle-file-regular-p) - (file-remote-p . tramp-handle-file-remote-p) - (file-selinux-context . tramp-gvfs-handle-file-selinux-context) - (file-symlink-p . tramp-handle-file-symlink-p) - ;; `file-truename' performed by default handler. - (file-writable-p . tramp-gvfs-handle-file-writable-p) - (find-backup-file-name . tramp-handle-find-backup-file-name) - ;; `find-file-noselect' performed by default handler. - ;; `get-file-buffer' performed by default handler. - (insert-directory . tramp-gvfs-handle-insert-directory) - (insert-file-contents . tramp-gvfs-handle-insert-file-contents) - (load . tramp-handle-load) - (make-directory . tramp-gvfs-handle-make-directory) - (make-directory-internal . ignore) - (make-symbolic-link . ignore) - (process-file . tramp-gvfs-handle-process-file) - (rename-file . tramp-gvfs-handle-rename-file) - (set-file-acl . tramp-gvfs-handle-set-file-acl) - (set-file-modes . tramp-gvfs-handle-set-file-modes) - (set-file-selinux-context . tramp-gvfs-handle-set-file-selinux-context) - (set-visited-file-modtime . tramp-gvfs-handle-set-visited-file-modtime) - (shell-command . tramp-gvfs-handle-shell-command) - (start-file-process . tramp-gvfs-handle-start-file-process) - (substitute-in-file-name . tramp-handle-substitute-in-file-name) - (unhandled-file-name-directory . tramp-handle-unhandled-file-name-directory) - (vc-registered . ignore) - (verify-visited-file-modtime - . tramp-gvfs-handle-verify-visited-file-modtime) - (write-region . tramp-gvfs-handle-write-region) -) - "Alist of handler functions for Tramp GVFS method. -Operations not mentioned here will be handled by the default Emacs primitives.") - -;; It must be a `defsubst' in order to push the whole code into -;; tramp-loaddefs.el. Otherwise, there would be recursive autoloading. -;;;###tramp-autoload -(defsubst tramp-gvfs-file-name-p (filename) - "Check if it's a filename handled by the GVFS daemon." - (and (tramp-tramp-file-p filename) - (let ((method - (tramp-file-name-method (tramp-dissect-file-name filename)))) - (and (stringp method) (member method tramp-gvfs-methods))))) - -;;;###tramp-autoload -(defun tramp-gvfs-file-name-handler (operation &rest args) - "Invoke the GVFS related OPERATION. -First arg specifies the OPERATION, second arg is a list of arguments to -pass to the OPERATION." - (let ((fn (assoc operation tramp-gvfs-file-name-handler-alist))) - (if fn - (save-match-data (apply (cdr fn) args)) - (tramp-run-real-handler operation args)))) - -;; This might be moved to tramp.el. It shall be the first file name -;; handler. -;;;###tramp-autoload -(when (featurep 'dbusbind) - (add-to-list 'tramp-foreign-file-name-handler-alist - (cons 'tramp-gvfs-file-name-p 'tramp-gvfs-file-name-handler))) - -(defun tramp-gvfs-stringify-dbus-message (message) - "Convert a D-Bus message into readable UTF8 strings, used for traces." - (cond - ((and (consp message) (characterp (car message))) - (format "%S" (dbus-byte-array-to-string message))) - ((consp message) - (mapcar 'tramp-gvfs-stringify-dbus-message message)) - ((stringp message) - (format "%S" message)) - (t message))) - -(defmacro with-tramp-dbus-call-method - (vec synchronous bus service path interface method &rest args) - "Apply a D-Bus call on bus BUS. - -If SYNCHRONOUS is non-nil, the call is synchronously. Otherwise, -it is an asynchronous call, with `ignore' as callback function. - -The other arguments have the same meaning as with `dbus-call-method' -or `dbus-call-method-asynchronously'. Additionally, the call -will be traced by Tramp with trace level 6." - `(let ((func (if ,synchronous - 'dbus-call-method 'dbus-call-method-asynchronously)) - (args (append (list ,bus ,service ,path ,interface ,method) - (if ,synchronous (list ,＠args) (list 'ignore ,＠args)))) - result) - (tramp-message ,vec 6 "%s %s" func args) - (setq result (apply func args)) - (tramp-message ,vec 6 "%s" (tramp-gvfs-stringify-dbus-message result)) - result)) - -(put 'with-tramp-dbus-call-method 'lisp-indent-function 2) -(put 'with-tramp-dbus-call-method 'edebug-form-spec '(form symbolp body)) -(tramp-compat-font-lock-add-keywords - 'emacs-lisp-mode '("\\<with-tramp-dbus-call-method\\>")) - -(defmacro with-tramp-gvfs-error-message (filename handler &rest args) - "Apply a Tramp GVFS `handler'. -In case of an error, modify the error message by replacing -`filename' with its GVFS mounted name." - `(let ((fuse-file-name (regexp-quote (tramp-gvfs-fuse-file-name ,filename))) - elt) - (condition-case err - (tramp-compat-funcall ,handler ,＠args) - (error - (setq elt (cdr err)) - (while elt - (when (and (stringp (car elt)) - (string-match fuse-file-name (car elt))) - (setcar elt (replace-match ,filename t t (car elt)))) - (setq elt (cdr elt))) - (signal (car err) (cdr err)))))) - -(put 'with-tramp-gvfs-error-message 'lisp-indent-function 2) -(put 'with-tramp-gvfs-error-message 'edebug-form-spec '(form symbolp body)) -(tramp-compat-font-lock-add-keywords - 'emacs-lisp-mode '("\\<with-tramp-gvfs-error-message\\>")) - -(defvar tramp-gvfs-dbus-event-vector nil - "Current Tramp file name to be used, as vector. -It is needed when D-Bus signals or errors arrive, because there -is no information where to trace the message.") - -(defun tramp-gvfs-dbus-event-error (event err) - "Called when a D-Bus error message arrives, see `dbus-event-error-functions'." - (when tramp-gvfs-dbus-event-vector - (tramp-message tramp-gvfs-dbus-event-vector 10 "%S" event) - (tramp-error tramp-gvfs-dbus-event-vector 'file-error "%s" (cadr err)))) - -;; `dbus-event-error-hooks' has been renamed to `dbus-event-error-functions'. -(add-hook - (if (boundp 'dbus-event-error-functions) - 'dbus-event-error-functions 'dbus-event-error-hooks) - 'tramp-gvfs-dbus-event-error) - - -;; File name primitives. - -(defun tramp-gvfs-handle-copy-file - (filename newname &optional ok-if-already-exists keep-date - preserve-uid-gid preserve-extended-attributes) - "Like `copy-file' for Tramp files." - (with-parsed-tramp-file-name - (if (tramp-tramp-file-p filename) filename newname) nil - (with-tramp-progress-reporter - v 0 (format "Copying %s to %s" filename newname) - (condition-case err - (let ((args - (list - (if (tramp-gvfs-file-name-p filename) - (tramp-gvfs-fuse-file-name filename) - filename) - (if (tramp-gvfs-file-name-p newname) - (tramp-gvfs-fuse-file-name newname) - newname) - ok-if-already-exists keep-date preserve-uid-gid))) - (when preserve-extended-attributes - (setq args (append args (list preserve-extended-attributes)))) - (apply 'copy-file args)) - - ;; Error case. Let's try it with the GVFS utilities. - (error - (tramp-message v 4 "`copy-file' failed, trying `gvfs-copy'") - (unless - (zerop - (let ((args - (append (if (or keep-date preserve-uid-gid) - (list "--preserve") - nil) - (list - (tramp-gvfs-url-file-name filename) - (tramp-gvfs-url-file-name newname))))) - (apply 'tramp-gvfs-send-command v "gvfs-copy" args))) - ;; Propagate the error. - (tramp-error v (car err) "%s" (cdr err))))))) - - (when (file-remote-p newname) - (with-parsed-tramp-file-name newname nil - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname)))) - -(defun tramp-gvfs-handle-delete-directory (directory &optional recursive) - "Like `delete-directory' for Tramp files." - (tramp-compat-delete-directory - (tramp-gvfs-fuse-file-name directory) recursive)) - -(defun tramp-gvfs-handle-delete-file (filename &optional trash) - "Like `delete-file' for Tramp files." - (tramp-compat-delete-file (tramp-gvfs-fuse-file-name filename) trash)) - -(defun tramp-gvfs-handle-directory-files - (directory &optional full match nosort) - "Like `directory-files' for Tramp files." - (let ((fuse-file-name (tramp-gvfs-fuse-file-name directory))) - (mapcar - (lambda (x) - (if (string-match fuse-file-name x) - (replace-match directory t t x) - x)) - (directory-files fuse-file-name full match nosort)))) - -(defun tramp-gvfs-handle-directory-files-and-attributes - (directory &optional full match nosort id-format) - "Like `directory-files-and-attributes' for Tramp files." - (let ((fuse-file-name (tramp-gvfs-fuse-file-name directory))) - (mapcar - (lambda (x) - (when (string-match fuse-file-name (car x)) - (setcar x (replace-match directory t t (car x)))) - x) - (directory-files-and-attributes - fuse-file-name full match nosort id-format)))) - -(defun tramp-gvfs-handle-expand-file-name (name &optional dir) - "Like `expand-file-name' for Tramp files." - ;; If DIR is not given, use DEFAULT-DIRECTORY or "/". - (setq dir (or dir default-directory "/")) - ;; Unless NAME is absolute, concat DIR and NAME. - (unless (file-name-absolute-p name) - (setq name (concat (file-name-as-directory dir) name))) - ;; If NAME is not a Tramp file, run the real handler. - (if (not (tramp-tramp-file-p name)) - (tramp-run-real-handler 'expand-file-name (list name nil)) - ;; Dissect NAME. - (with-parsed-tramp-file-name name nil - ;; If there is a default location, expand tilde. - (when (string-match "\\`\$~\$\$/\\|\\'\$" localname) - (save-match-data - (tramp-gvfs-maybe-open-connection (vector method user host "/" hop))) - (setq localname - (replace-match - (tramp-get-file-property v "/" "default-location" "~") - nil t localname 1))) - ;; Tilde expansion is not possible. - (when (string-match "\\`\$~[^/]*\$\$.*\$\\'" localname) - (tramp-error - v 'file-error - "Cannot expand tilde in file `%s'" name)) - (unless (tramp-run-real-handler 'file-name-absolute-p (list localname)) - (setq localname (concat "/" localname))) - ;; We do not pass "/..". - (if (string-equal "smb" method) - (when (string-match "^/[^/]+\$/\\.\\./?\$" localname) - (setq localname (replace-match "/" t t localname 1))) - (when (string-match "^/\\.\\./?" localname) - (setq localname (replace-match "/" t t localname)))) - ;; There might be a double slash. Remove this. - (while (string-match "//" localname) - (setq localname (replace-match "/" t t localname))) - ;; No tilde characters in file name, do normal - ;; `expand-file-name' (this does "/./" and "/../"). - (tramp-make-tramp-file-name - method user host - (tramp-run-real-handler - 'expand-file-name (list localname)))))) - -(defun tramp-gvfs-handle-file-acl (filename) - "Like `file-acl' for Tramp files." - (tramp-compat-funcall 'file-acl (tramp-gvfs-fuse-file-name filename))) - -(defun tramp-gvfs-handle-file-attributes (filename &optional id-format) - "Like `file-attributes' for Tramp files." - (file-attributes (tramp-gvfs-fuse-file-name filename) id-format)) - -(defun tramp-gvfs-handle-file-directory-p (filename) - "Like `file-directory-p' for Tramp files." - (file-directory-p (tramp-gvfs-fuse-file-name filename))) - -(defun tramp-gvfs-handle-file-executable-p (filename) - "Like `file-executable-p' for Tramp files." - (file-executable-p (tramp-gvfs-fuse-file-name filename))) - -(defun tramp-gvfs-handle-file-exists-p (filename) - "Like `file-exists-p' for Tramp files." - (file-exists-p (tramp-gvfs-fuse-file-name filename))) - -(defun tramp-gvfs-handle-file-local-copy (filename) - "Like `file-local-copy' for Tramp files." - (with-parsed-tramp-file-name filename nil - (let ((tmpfile (tramp-compat-make-temp-file filename))) - (unless (file-exists-p filename) - (tramp-error - v 'file-error - "Cannot make local copy of non-existing file `%s'" filename)) - (copy-file filename tmpfile t t) - tmpfile))) - -(defun tramp-gvfs-handle-file-name-all-completions (filename directory) - "Like `file-name-all-completions' for Tramp files." - (unless (save-match-data (string-match "/" filename)) - (file-name-all-completions filename (tramp-gvfs-fuse-file-name directory)))) - -(defun tramp-gvfs-handle-file-readable-p (filename) - "Like `file-readable-p' for Tramp files." - (file-readable-p (tramp-gvfs-fuse-file-name filename))) - -(defun tramp-gvfs-handle-file-selinux-context (filename) - "Like `file-selinux-context' for Tramp files." - (tramp-compat-funcall - 'file-selinux-context (tramp-gvfs-fuse-file-name filename))) - -(defun tramp-gvfs-handle-file-writable-p (filename) - "Like `file-writable-p' for Tramp files." - (file-writable-p (tramp-gvfs-fuse-file-name filename))) - -(defun tramp-gvfs-handle-insert-directory - (filename switches &optional wildcard full-directory-p) - "Like `insert-directory' for Tramp files." - (insert-directory - (tramp-gvfs-fuse-file-name filename) switches wildcard full-directory-p)) - -(defun tramp-gvfs-handle-insert-file-contents - (filename &optional visit beg end replace) - "Like `insert-file-contents' for Tramp files." - (unwind-protect - (let ((fuse-file-name (tramp-gvfs-fuse-file-name filename)) - (result - (insert-file-contents - (tramp-gvfs-fuse-file-name filename) visit beg end replace))) - (when (string-match fuse-file-name (car result)) - (setcar result (replace-match filename t t (car result)))) - result) - (setq buffer-file-name filename))) - -(defun tramp-gvfs-handle-make-directory (dir &optional parents) - "Like `make-directory' for Tramp files." - (with-parsed-tramp-file-name dir nil - (condition-case err - (with-tramp-gvfs-error-message dir 'make-directory - (tramp-gvfs-fuse-file-name dir) parents) - - ;; Error case. Let's try it with the GVFS utilities. - (error - (tramp-message v 4 "`make-directory' failed, trying `gvfs-mkdir'") - (unless - (zerop - (tramp-gvfs-send-command - v "gvfs-mkdir" (tramp-gvfs-url-file-name dir))) - ;; Propagate the error. - (tramp-error v (car err) "%s" (cdr err))))))) - -(defun tramp-gvfs-handle-process-file - (program &optional infile destination display &rest args) - "Like `process-file' for Tramp files." - (let ((default-directory (tramp-gvfs-fuse-file-name default-directory))) - (apply 'call-process program infile destination display args))) - -(defun tramp-gvfs-handle-rename-file - (filename newname &optional ok-if-already-exists) - "Like `rename-file' for Tramp files." - (with-parsed-tramp-file-name - (if (tramp-tramp-file-p filename) filename newname) nil - (with-tramp-progress-reporter - v 0 (format "Renaming %s to %s" filename newname) - (condition-case err - (rename-file - (if (tramp-gvfs-file-name-p filename) - (tramp-gvfs-fuse-file-name filename) - filename) - (if (tramp-gvfs-file-name-p newname) - (tramp-gvfs-fuse-file-name newname) - newname) - ok-if-already-exists) - - ;; Error case. Let's try it with the GVFS utilities. - (error - (tramp-message v 4 "`rename-file' failed, trying `gvfs-move'") - (unless - (zerop - (tramp-gvfs-send-command - v "gvfs-move" - (tramp-gvfs-url-file-name filename) - (tramp-gvfs-url-file-name newname))) - ;; Propagate the error. - (tramp-error v (car err) "%s" (cdr err))))))) - - (when (file-remote-p filename) - (with-parsed-tramp-file-name filename nil - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname))) - - (when (file-remote-p newname) - (with-parsed-tramp-file-name newname nil - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname)))) - -(defun tramp-gvfs-handle-set-file-acl (filename acl-string) - "Like `set-file-acl' for Tramp files." - (with-tramp-gvfs-error-message filename 'set-file-acl - (tramp-gvfs-fuse-file-name filename) acl-string)) - -(defun tramp-gvfs-handle-set-file-modes (filename mode) - "Like `set-file-modes' for Tramp files." - (with-tramp-gvfs-error-message filename 'set-file-modes - (tramp-gvfs-fuse-file-name filename) mode)) - -(defun tramp-gvfs-handle-set-file-selinux-context (filename context) - "Like `set-file-selinux-context' for Tramp files." - (with-tramp-gvfs-error-message filename 'set-file-selinux-context - (tramp-gvfs-fuse-file-name filename) context)) - -(defun tramp-gvfs-handle-set-visited-file-modtime (&optional time-list) - "Like `set-visited-file-modtime' for Tramp files." - (let ((buffer-file-name (tramp-gvfs-fuse-file-name (buffer-file-name)))) - (set-visited-file-modtime time-list))) - -(defun tramp-gvfs-handle-shell-command - (command &optional output-buffer error-buffer) - "Like `shell-command' for Tramp files." - (let ((default-directory (tramp-gvfs-fuse-file-name default-directory))) - (shell-command command output-buffer error-buffer))) - -(defun tramp-gvfs-handle-start-file-process (name buffer program &rest args) - "Like `start-file-process' for Tramp files." - (let ((default-directory (tramp-gvfs-fuse-file-name default-directory))) - (apply 'start-process name buffer program args))) - -(defun tramp-gvfs-handle-verify-visited-file-modtime (buf) - "Like `verify-visited-file-modtime' for Tramp files." - (with-current-buffer buf - (let ((buffer-file-name (tramp-gvfs-fuse-file-name (buffer-file-name)))) - (verify-visited-file-modtime buf)))) - -(defun tramp-gvfs-handle-write-region - (start end filename &optional append visit lockname confirm) - "Like `write-region' for Tramp files." - (with-parsed-tramp-file-name filename nil - (condition-case err - (with-tramp-gvfs-error-message filename 'write-region - start end (tramp-gvfs-fuse-file-name filename) - append visit lockname confirm) - - ;; Error case. Let's try rename. - (error - (let ((tmpfile (tramp-compat-make-temp-file filename))) - (tramp-message v 4 "`write-region' failed, trying `rename-file'") - (write-region start end tmpfile) - (condition-case nil - (rename-file tmpfile filename) - (error - (delete-file tmpfile) - (tramp-error v (car err) "%s" (cdr err))))))) - - ;; Set file modification time. - (when (or (eq visit t) (stringp visit)) - (set-visited-file-modtime (nth 5 (file-attributes filename)))) - - ;; The end. - (when (or (eq visit t) (null visit) (stringp visit)) - (tramp-message v 0 "Wrote %s" filename)) - (run-hooks 'tramp-handle-write-region-hook))) - - -;; File name conversions. - -(defun tramp-gvfs-url-file-name (filename) - "Return FILENAME in URL syntax." - ;; "/" must NOT be hexlified. - (let ((url-unreserved-chars (append '(?/) url-unreserved-chars))) - (url-recreate-url - (if (tramp-tramp-file-p filename) - (with-parsed-tramp-file-name (file-truename filename) nil - (when (string-match tramp-user-with-domain-regexp user) - (setq user - (concat (match-string 2 user) ";" (match-string 2 user)))) - (url-parse-make-urlobj - method user nil - (tramp-file-name-real-host v) (tramp-file-name-port v) - (url-hexify-string localname))) - (url-parse-make-urlobj - "file" nil nil nil nil (url-hexify-string (file-truename filename))))))) - -(defun tramp-gvfs-object-path (filename) - "Create a D-Bus object path from FILENAME." - (expand-file-name (dbus-escape-as-identifier filename) tramp-gvfs-path-tramp)) - -(defun tramp-gvfs-file-name (object-path) - "Retrieve file name from D-Bus OBJECT-PATH." - (dbus-unescape-from-identifier - (replace-regexp-in-string "^.*/\$[^/]+\$$" "\\1" object-path))) - -(defun tramp-gvfs-fuse-file-name (filename) - "Return FUSE file name, which is directly accessible." - (with-parsed-tramp-file-name (expand-file-name filename) nil - (tramp-gvfs-maybe-open-connection v) - (let ((prefix (tramp-get-file-property v "/" "prefix" "")) - (fuse-mountpoint - (tramp-get-file-property v "/" "fuse-mountpoint" nil))) - (unless fuse-mountpoint - (tramp-error - v 'file-error "There is no FUSE mount point for `%s'" filename)) - ;; We must hide the prefix, if any. - (when (string-match (concat "^" (regexp-quote prefix)) localname) - (setq localname (replace-match "" t t localname))) - (tramp-message - v 10 "remote file `%s' is local file `%s'" - filename (concat fuse-mountpoint localname)) - (concat fuse-mountpoint localname)))) - -(defun tramp-bluez-address (device) - "Return bluetooth device address from a given bluetooth DEVICE name." - (when (stringp device) - (if (string-match tramp-ipv6-regexp device) - (match-string 0 device) - (cadr (assoc device (tramp-bluez-list-devices)))))) - -(defun tramp-bluez-device (address) - "Return bluetooth device name from a given bluetooth device ADDRESS. -ADDRESS can have the form \"xx:xx:xx:xx:xx:xx\" or \"[xx:xx:xx:xx:xx:xx]\"." - (when (stringp address) - (while (string-match "[][]" address) - (setq address (replace-match "" t t address))) - (let (result) - (dolist (item (tramp-bluez-list-devices) result) - (when (string-match address (cadr item)) - (setq result (car item))))))) - - -;; D-Bus GVFS functions. - -(defun tramp-gvfs-handler-askpassword (message user domain flags) - "Implementation for the \"org.gtk.vfs.MountOperation.askPassword\" method." - (let* ((filename - (tramp-gvfs-file-name (dbus-event-path-name last-input-event))) - (pw-prompt - (format - "%s for %s " - (if (string-match "\$[pP]assword\\|[pP]assphrase\$" message) - (capitalize (match-string 1 message)) - "Password") - filename)) - password) - - (condition-case nil - (with-parsed-tramp-file-name filename l - (when (and (zerop (length user)) - (not - (zerop (logand flags tramp-gvfs-password-need-username)))) - (setq user (read-string "User name: "))) - (when (and (zerop (length domain)) - (not (zerop (logand flags tramp-gvfs-password-need-domain)))) - (setq domain (read-string "Domain name: "))) - - (tramp-message l 6 "%S %S %S %d" message user domain flags) - (setq tramp-current-method l-method - tramp-current-user user - tramp-current-host l-host - password (tramp-read-passwd - (tramp-get-connection-process l) pw-prompt)) - - ;; Return result. - (if (stringp password) - (list - t ;; password handled. - nil ;; no abort of D-Bus. - password - (tramp-file-name-real-user l) - domain - nil ;; not anonymous. - 0) ;; no password save. - ;; No password provided. - (list nil t "" (tramp-file-name-real-user l) domain nil 0))) - - ;; When QUIT is raised, we shall return this information to D-Bus. - (quit (list nil t "" "" "" nil 0))))) - -(defun tramp-gvfs-handler-askquestion (message choices) - "Implementation for the \"org.gtk.vfs.MountOperation.askQuestion\" method." - (save-window-excursion - (let ((enable-recursive-minibuffers t) - choice) - - (condition-case nil - (with-parsed-tramp-file-name - (tramp-gvfs-file-name (dbus-event-path-name last-input-event)) nil - (tramp-message v 6 "%S %S" message choices) - - ;; In theory, there can be several choices. Until now, - ;; there is only the question whether to accept an unknown - ;; host signature. - (with-temp-buffer - ;; Preserve message for `progress-reporter'. - (tramp-compat-with-temp-message "" - (insert message) - (pop-to-buffer (current-buffer)) - (setq choice (if (yes-or-no-p (concat (car choices) " ")) 0 1)) - (tramp-message v 6 "%d" choice))) - - ;; When the choice is "no", we set a dummy fuse-mountpoint - ;; in order to leave the timeout. - (unless (zerop choice) - (tramp-set-file-property v "/" "fuse-mountpoint" "/")) - - (list - t ;; handled. - nil ;; no abort of D-Bus. - choice)) - - ;; When QUIT is raised, we shall return this information to D-Bus. - (quit (list nil t 0)))))) - -(defun tramp-gvfs-handler-mounted-unmounted (mount-info) - "Signal handler for the \"org.gtk.vfs.MountTracker.mounted\" and -\"org.gtk.vfs.MountTracker.unmounted\" signals." - (ignore-errors - (let ((signal-name (dbus-event-member-name last-input-event)) - (elt mount-info)) - ;; Jump over the first elements of the mount info. Since there - ;; were changes in the entries, we cannot access dedicated - ;; elements. - (while (stringp (car elt)) (setq elt (cdr elt))) - (let* ((fuse-mountpoint (dbus-byte-array-to-string (cadr elt))) - (mount-spec (caddr elt)) - (default-location (dbus-byte-array-to-string (cadddr elt))) - (method (dbus-byte-array-to-string - (cadr (assoc "type" (cadr mount-spec))))) - (user (dbus-byte-array-to-string - (cadr (assoc "user" (cadr mount-spec))))) - (domain (dbus-byte-array-to-string - (cadr (assoc "domain" (cadr mount-spec))))) - (host (dbus-byte-array-to-string - (cadr (or (assoc "host" (cadr mount-spec)) - (assoc "server" (cadr mount-spec)))))) - (port (dbus-byte-array-to-string - (cadr (assoc "port" (cadr mount-spec))))) - (ssl (dbus-byte-array-to-string - (cadr (assoc "ssl" (cadr mount-spec))))) - (prefix (concat (dbus-byte-array-to-string (car mount-spec)) - (dbus-byte-array-to-string - (cadr (assoc "share" (cadr mount-spec))))))) - (when (string-match "^smb" method) - (setq method "smb")) - (when (string-equal "obex" method) - (setq host (tramp-bluez-device host))) - (when (and (string-equal "dav" method) (string-equal "true" ssl)) - (setq method "davs")) - (unless (zerop (length domain)) - (setq user (concat user tramp-prefix-domain-format domain))) - (unless (zerop (length port)) - (setq host (concat host tramp-prefix-port-format port))) - (with-parsed-tramp-file-name - (tramp-make-tramp-file-name method user host "") nil - (tramp-message - v 6 "%s %s" - signal-name (tramp-gvfs-stringify-dbus-message mount-info)) - (tramp-set-file-property v "/" "list-mounts" 'undef) - (if (string-equal signal-name "unmounted") - (tramp-set-file-property v "/" "fuse-mountpoint" nil) - ;; Set prefix, mountpoint and location. - (unless (string-equal prefix "/") - (tramp-set-file-property v "/" "prefix" prefix)) - (tramp-set-file-property v "/" "fuse-mountpoint" fuse-mountpoint) - (tramp-set-file-property - v "/" "default-location" default-location))))))) - -(dbus-register-signal -:session nil tramp-gvfs-path-mounttracker - tramp-gvfs-interface-mounttracker "mounted" - 'tramp-gvfs-handler-mounted-unmounted) - -(dbus-register-signal -:session nil tramp-gvfs-path-mounttracker - tramp-gvfs-interface-mounttracker "unmounted" - 'tramp-gvfs-handler-mounted-unmounted) - -(defun tramp-gvfs-connection-mounted-p (vec) - "Check, whether the location is already mounted." - (or - (tramp-get-file-property vec "/" "fuse-mountpoint" nil) - (catch 'mounted - (dolist - (elt - (with-tramp-file-property vec "/" "list-mounts" - (with-tramp-dbus-call-method vec t - :session tramp-gvfs-service-daemon tramp-gvfs-path-mounttracker - tramp-gvfs-interface-mounttracker "listMounts")) - nil) - ;; Jump over the first elements of the mount info. Since there - ;; were changes in the entries, we cannot access dedicated - ;; elements. - (while (stringp (car elt)) (setq elt (cdr elt))) - (let* ((fuse-mountpoint (dbus-byte-array-to-string (cadr elt))) - (mount-spec (caddr elt)) - (default-location (dbus-byte-array-to-string (cadddr elt))) - (method (dbus-byte-array-to-string - (cadr (assoc "type" (cadr mount-spec))))) - (user (dbus-byte-array-to-string - (cadr (assoc "user" (cadr mount-spec))))) - (domain (dbus-byte-array-to-string - (cadr (assoc "domain" (cadr mount-spec))))) - (host (dbus-byte-array-to-string - (cadr (or (assoc "host" (cadr mount-spec)) - (assoc "server" (cadr mount-spec)))))) - (port (dbus-byte-array-to-string - (cadr (assoc "port" (cadr mount-spec))))) - (ssl (dbus-byte-array-to-string - (cadr (assoc "ssl" (cadr mount-spec))))) - (prefix (concat (dbus-byte-array-to-string (car mount-spec)) - (dbus-byte-array-to-string - (cadr (assoc "share" (cadr mount-spec))))))) - (when (string-match "^smb" method) - (setq method "smb")) - (when (string-equal "obex" method) - (setq host (tramp-bluez-device host))) - (when (and (string-equal "dav" method) (string-equal "true" ssl)) - (setq method "davs")) - (when (and (string-equal "synce" method) (zerop (length user))) - (setq user (or (tramp-file-name-user vec) ""))) - (unless (zerop (length domain)) - (setq user (concat user tramp-prefix-domain-format domain))) - (unless (zerop (length port)) - (setq host (concat host tramp-prefix-port-format port))) - (when (and - (string-equal method (tramp-file-name-method vec)) - (string-equal user (or (tramp-file-name-user vec) "")) - (string-equal host (tramp-file-name-host vec)) - (string-match (concat "^" (regexp-quote prefix)) - (tramp-file-name-localname vec))) - ;; Set prefix, mountpoint and location. - (unless (string-equal prefix "/") - (tramp-set-file-property vec "/" "prefix" prefix)) - (tramp-set-file-property vec "/" "fuse-mountpoint" fuse-mountpoint) - (tramp-set-file-property vec "/" "default-location" default-location) - (throw 'mounted t))))))) - -(defun tramp-gvfs-mount-spec (vec) - "Return a mount-spec for \"org.gtk.vfs.MountTracker.mountLocation\"." - (let* ((method (tramp-file-name-method vec)) - (user (tramp-file-name-real-user vec)) - (domain (tramp-file-name-domain vec)) - (host (tramp-file-name-real-host vec)) - (port (tramp-file-name-port vec)) - (localname (tramp-file-name-localname vec)) - (ssl (if (string-match "^davs" method) "true" "false")) - (mount-spec '(:array)) - (mount-pref "/")) - - (setq - mount-spec - (append - mount-spec - (cond - ((string-equal "smb" method) - (string-match "^/?\$[^/]+\$" localname) - `((:struct "type" ,(dbus-string-to-byte-array "smb-share")) - (:struct "server" ,(dbus-string-to-byte-array host)) - (:struct "share" ,(dbus-string-to-byte-array - (match-string 1 localname))))) - ((string-equal "obex" method) - `((:struct "type" ,(dbus-string-to-byte-array method)) - (:struct "host" ,(dbus-string-to-byte-array - (concat "[" (tramp-bluez-address host) "]"))))) - ((string-match "^dav" method) - `((:struct "type" ,(dbus-string-to-byte-array "dav")) - (:struct "host" ,(dbus-string-to-byte-array host)) - (:struct "ssl" ,(dbus-string-to-byte-array ssl)))) - (t - `((:struct "type" ,(dbus-string-to-byte-array method)) - (:struct "host" ,(dbus-string-to-byte-array host))))))) - - (when user - (add-to-list - 'mount-spec - `(:struct "user" ,(dbus-string-to-byte-array user)) - 'append)) - - (when domain - (add-to-list - 'mount-spec - `(:struct "domain" ,(dbus-string-to-byte-array domain)) - 'append)) - - (when port - (add-to-list - 'mount-spec - `(:struct "port" ,(dbus-string-to-byte-array (number-to-string port))) - 'append)) - - (when (and (string-match "^dav" method) - (string-match "^/?[^/]+" localname)) - (setq mount-pref (match-string 0 localname))) - - ;; Return. - `(:struct ,(dbus-string-to-byte-array mount-pref) ,mount-spec))) - - -;; Connection functions - -(defun tramp-gvfs-maybe-open-connection (vec) - "Maybe open a connection VEC. -Does not do anything if a connection is already open, but re-opens the -connection if a previous connection has died for some reason." - - ;; We set the file name, in case there are incoming D-Bus signals or - ;; D-Bus errors. - (setq tramp-gvfs-dbus-event-vector vec) - - ;; For password handling, we need a process bound to the connection - ;; buffer. Therefore, we create a dummy process. Maybe there is a - ;; better solution? - (unless (get-buffer-process (tramp-get-buffer vec)) - (let ((p (make-network-process - :name (tramp-buffer-name vec) - :buffer (tramp-get-buffer vec) - :server t :host 'local :service t))) - (tramp-compat-set-process-query-on-exit-flag p nil))) - - (unless (tramp-gvfs-connection-mounted-p vec) - (let* ((method (tramp-file-name-method vec)) - (user (tramp-file-name-user vec)) - (host (tramp-file-name-host vec)) - (object-path - (tramp-gvfs-object-path - (tramp-make-tramp-file-name method user host "")))) - - (with-tramp-progress-reporter - vec 3 - (if (zerop (length user)) - (format "Opening connection for %s using %s" host method) - (format "Opening connection for %s＠%s using %s" user host method)) - - ;; Enable auth-source and password-cache. - (tramp-set-connection-property vec "first-password-request" t) - - ;; There will be a callback of "askPassword" when a password is - ;; needed. - (dbus-register-method - :session dbus-service-emacs object-path - tramp-gvfs-interface-mountoperation "askPassword" - 'tramp-gvfs-handler-askpassword) - - ;; There could be a callback of "askQuestion" when adding fingerprint. - (dbus-register-method - :session dbus-service-emacs object-path - tramp-gvfs-interface-mountoperation "askQuestion" - 'tramp-gvfs-handler-askquestion) - - ;; The call must be asynchronously, because of the "askPassword" - ;; or "askQuestion"callbacks. - (with-tramp-dbus-call-method vec nil - :session tramp-gvfs-service-daemon tramp-gvfs-path-mounttracker - tramp-gvfs-interface-mounttracker "mountLocation" - (tramp-gvfs-mount-spec vec) (dbus-get-unique-name :session) - :object-path object-path) - - ;; We must wait, until the mount is applied. This will be - ;; indicated by the "mounted" signal, i.e. the "fuse-mountpoint" - ;; file property. - (with-timeout - (60 - (if (zerop (length (tramp-file-name-user vec))) - (tramp-error - vec 'file-error - "Timeout reached mounting %s using %s" host method) - (tramp-error - vec 'file-error - "Timeout reached mounting %s＠%s using %s" user host method))) - (while (not (tramp-get-file-property vec "/" "fuse-mountpoint" nil)) - (read-event nil nil 0.1))) - - ;; If `tramp-gvfs-handler-askquestion' has returned "No", it - ;; is marked with the fuse-mountpoint "/". We shall react. - (when (string-equal - (tramp-get-file-property vec "/" "fuse-mountpoint" "") "/") - (tramp-error vec 'file-error "FUSE mount denied")) - - ;; We set the connection property "started" in order to put the - ;; remote location into the cache, which is helpful for further - ;; completion. - (tramp-set-connection-property vec "started" t))))) - -(defun tramp-gvfs-send-command (vec command &rest args) - "Send the COMMAND with its ARGS to connection VEC. -COMMAND is usually a command from the gvfs-* utilities. -`call-process' is applied, and its return code is returned." - (let (result) - (with-current-buffer (tramp-get-buffer vec) - (erase-buffer) - (tramp-message vec 6 "%s %s" command (mapconcat 'identity args " ")) - (setq result (apply 'tramp-compat-call-process command nil t nil args)) - (tramp-message vec 6 "%s" (buffer-string)) - result))) - - -;; D-Bus BLUEZ functions. - -(defun tramp-bluez-list-devices () - "Return all discovered bluetooth devices as list. -Every entry is a list (NAME ADDRESS). - -If `tramp-bluez-discover-devices-timeout' is an integer, and the last -discovery happened more time before indicated there, a rescan will be -started, which lasts some ten seconds. Otherwise, cached results will -be used." - ;; Reset the scanned devices list if time has passed. - (and (integerp tramp-bluez-discover-devices-timeout) - (integerp tramp-bluez-discovery) - (> (tramp-time-diff (current-time) tramp-bluez-discovery) - tramp-bluez-discover-devices-timeout) - (setq tramp-bluez-devices nil)) - - ;; Rescan if needed. - (unless tramp-bluez-devices - (let ((object-path - (with-tramp-dbus-call-method tramp-gvfs-dbus-event-vector t - :system tramp-bluez-service "/" - tramp-bluez-interface-manager "DefaultAdapter"))) - (setq tramp-bluez-devices nil - tramp-bluez-discovery t) - (with-tramp-dbus-call-method tramp-gvfs-dbus-event-vector nil - :system tramp-bluez-service object-path - tramp-bluez-interface-adapter "StartDiscovery") - (while tramp-bluez-discovery - (read-event nil nil 0.1)))) - (setq tramp-bluez-discovery (current-time)) - (tramp-message tramp-gvfs-dbus-event-vector 10 "%s" tramp-bluez-devices) - tramp-bluez-devices) - -(defun tramp-bluez-property-changed (property value) - "Signal handler for the \"org.bluez.Adapter.PropertyChanged\" signal." - (tramp-message tramp-gvfs-dbus-event-vector 6 "%s %s" property value) - (cond - ((string-equal property "Discovering") - (unless (car value) - ;; "Discovering" FALSE means discovery run has been completed. - ;; We stop it, because we don't need another run. - (setq tramp-bluez-discovery nil) - (with-tramp-dbus-call-method tramp-gvfs-dbus-event-vector t - :system tramp-bluez-service (dbus-event-path-name last-input-event) - tramp-bluez-interface-adapter "StopDiscovery"))))) - -(dbus-register-signal -:system nil nil tramp-bluez-interface-adapter "PropertyChanged" - 'tramp-bluez-property-changed) - -(defun tramp-bluez-device-found (device args) - "Signal handler for the \"org.bluez.Adapter.DeviceFound\" signal." - (tramp-message tramp-gvfs-dbus-event-vector 6 "%s %s" device args) - (let ((alias (car (cadr (assoc "Alias" args)))) - (address (car (cadr (assoc "Address" args))))) - ;; Maybe we shall check the device class for being a proper - ;; device, and call also SDP in order to find the obex service. - (add-to-list 'tramp-bluez-devices (list alias address)))) - -(dbus-register-signal -:system nil nil tramp-bluez-interface-adapter "DeviceFound" - 'tramp-bluez-device-found) - -(defun tramp-bluez-parse-device-names (ignore) - "Return a list of (nil host) tuples allowed to access." - (mapcar - (lambda (x) (list nil (car x))) - (tramp-bluez-list-devices))) - -;; Add completion function for OBEX method. -(when (member tramp-bluez-service (dbus-list-known-names :system)) - (tramp-set-completion-function - "obex" '((tramp-bluez-parse-device-names "")))) - - -;; D-Bus zeroconf functions. - -(defun tramp-zeroconf-parse-workstation-device-names (ignore) - "Return a list of (user host) tuples allowed to access." - (mapcar - (lambda (x) - (list nil (zeroconf-service-host x))) - (zeroconf-list-services "_workstation._tcp"))) - -(defun tramp-zeroconf-parse-webdav-device-names (ignore) - "Return a list of (user host) tuples allowed to access." - (mapcar - (lambda (x) - (let ((host (zeroconf-service-host x)) - (port (zeroconf-service-port x)) - (text (zeroconf-service-txt x)) - user) - (when port - (setq host (format "%s%s%d" host tramp-prefix-port-regexp port))) - ;; A user is marked in a TXT field like "u=guest". - (while text - (when (string-match "u=\$.+\$$" (car text)) - (setq user (match-string 1 (car text)))) - (setq text (cdr text))) - (list user host))) - (zeroconf-list-services "_webdav._tcp"))) - -;; Add completion function for DAV and DAVS methods. -(when (member zeroconf-service-avahi (dbus-list-known-names :system)) - (zeroconf-init tramp-gvfs-zeroconf-domain) - (tramp-set-completion-function - "sftp" '((tramp-zeroconf-parse-workstation-device-names ""))) - (tramp-set-completion-function - "dav" '((tramp-zeroconf-parse-webdav-device-names ""))) - (tramp-set-completion-function - "davs" '((tramp-zeroconf-parse-webdav-device-names "")))) - - -;; D-Bus SYNCE functions. - -(defun tramp-synce-list-devices () - "Return all discovered synce devices as list. -They are retrieved from the hal daemon." - (let (tramp-synce-devices) - (dolist (device - (with-tramp-dbus-call-method tramp-gvfs-dbus-event-vector t - :system tramp-hal-service tramp-hal-path-manager - tramp-hal-interface-manager "GetAllDevices")) - (when (with-tramp-dbus-call-method tramp-gvfs-dbus-event-vector t - :system tramp-hal-service device tramp-hal-interface-device - "PropertyExists" "sync.plugin") - (add-to-list - 'tramp-synce-devices - (with-tramp-dbus-call-method tramp-gvfs-dbus-event-vector t - :system tramp-hal-service device tramp-hal-interface-device - "GetPropertyString" "pda.pocketpc.name")))) - (tramp-message tramp-gvfs-dbus-event-vector 10 "%s" tramp-synce-devices) - tramp-synce-devices)) - -(defun tramp-synce-parse-device-names (ignore) - "Return a list of (nil host) tuples allowed to access." - (mapcar - (lambda (x) (list nil x)) - (tramp-synce-list-devices))) - -;; Add completion function for SYNCE method. -(tramp-set-completion-function - "synce" '((tramp-synce-parse-device-names ""))) - -(add-hook 'tramp-unload-hook - (lambda () - (unload-feature 'tramp-gvfs 'force))) - -(provide 'tramp-gvfs) - -;;; TODO: - -;; * Host name completion via smb-server or smb-network. -;; * Check how two shares of the same SMB server can be mounted in -;; parallel. -;; * Apply SDP on bluetooth devices, in order to filter out obex -;; capability. -;; * Implement obex for other serial communication but bluetooth. - -;;; tramp-gvfs.el ends here This diff is so big that we needed to truncate the remainder. Repository URL: https://bitbucket.org/xemacs/tramp/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

commit/XEmacs: Jerry James: When an error is encountered while converting a Lisp menu specification 11 years, 11 months

Bitbucket

1 new commit in XEmacs: https://bitbucket.org/xemacs/xemacs/commits/489e76b85828/ changeset: 489e76b85828 user: Jerry James date: 2013-01-21 18:17:55 summary: When an error is encountered while converting a Lisp menu specification to its internal form, don't fail an assert(). Instead, return 0 to skip the fault menu and show any errors in *Warnings*. affected #: 2 files diff -r 8b5bdc8aebfd835411a42e614d2ef41fe4b51a1c -r 489e76b8582868ac588551ea0565ef43e695da54 src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog ＠＠ -1,3 +1,9 ＠＠ +2013-01-16 Jerry James <james(a)xemacs.org> + + * menubar-x.c (set_frame_menubar): when a menubar specification has an + error, don't fail an assert() and bring XEmacs down. Instead, return + 0 to skip the faulty menu and show any errors in *Warnings*. + 2013-01-04 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.33 "horseradish" is released. diff -r 8b5bdc8aebfd835411a42e614d2ef41fe4b51a1c -r 489e76b8582868ac588551ea0565ef43e695da54 src/menubar-x.c --- a/src/menubar-x.c +++ b/src/menubar-x.c ＠＠ -516,6 +516,9 ＠＠ } } +/* Returns the converted menubar, or NULL if an error is encountered while + * converting the Lisp menu specification. + */ static widget_value * compute_menubar_data (struct frame *f, Lisp_Object menubar, int deep_p) { ＠＠ -573,7 +576,8 ＠＠ menubar_visible = !NILP (w->menubar_visible_p); data = compute_menubar_data (f, menubar, deep_p); - assert (data && (data->next || data->contents)); + if (!data || (!data->next && !data->contents)) + return 0; if (!FRAME_X_MENUBAR_ID (f)) FRAME_X_MENUBAR_ID (f) = new_lwlib_id (); ＠＠ -594,6 +598,8 ＠＠ { free_popup_widget_value_tree (data); data = compute_menubar_data (f, menubar, 1); + if (!data || (!data->next && !data->contents)) + return 0; } Repository URL: https://bitbucket.org/xemacs/xemacs/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

Re: Issue 802: menubar-x.c assertion failure 11 years, 11 months

Stephen J. Turnbull

Jerry James writes: > Okay, I propose this patch. If nobody objects, I will commit it in a > day or two. Hmmm, upon looking at my changelog entry again, I can > suddenly hear Jeff Lynne singing, "Don't bring me down..." I prefer Neil Young's classic live intro "This is a song that's guaranteed to bring you right down. It's called 'Don't Let It Bring You Down'". > data = compute_menubar_data (f, menubar, deep_p); > - assert (data && (data->next || data->contents)); > + if (!data || (!data->next && !data->contents)) > + return 0; The problem with this simple patch is that you may just be pushing the crash around. There's another call to compute_menubar_data later in menubar-x.c at line 596; make sure it is similarly protected if necessary. Grep says those are the only calls (it's static so all calls are in menubar-x.c). There probably also should be a comment on compute_menubar_data warning that it can return NULL. I wonder if it *should* be able to return NULL, or if there's a bug elsewhere. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

2 participants
3 comments

commit/tramp: albinus: * Makefile (ELCS): Remove lisp/tramp-gvfs.elc. 11 years, 11 months

Bitbucket

1 new commit in tramp: https://bitbucket.org/xemacs/tramp/commits/4cfc445554a8/ changeset: 4cfc445554a8 user: albinus date: 2013-01-21 16:18:06 summary: * Makefile (ELCS): Remove lisp/tramp-gvfs.elc. affected #: 2 files diff -r 6774c94dba7d537158d7d9fe69e0e423cdb85eeb -r 4cfc445554a8df6479927f8ead8171037d76ed46 ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,3 +1,7 ＠＠ +2013-01-21 Michael Albinus <michael.albinus(a)gmx.de> + + * Makefile (ELCS): Remove lisp/tramp-gvfs.elc. + 2013-01-15 Michael Albinus <michael.albinus(a)gmx.de> Sync with Tramp 2.2 upstream. diff -r 6774c94dba7d537158d7d9fe69e0e423cdb85eeb -r 4cfc445554a8df6479927f8ead8171037d76ed46 Makefile --- a/Makefile +++ b/Makefile ＠＠ -29,9 +29,8 ＠＠ ELCS = lisp/tramp.elc lisp/tramp-adb.elc lisp/tramp-cache.elc \ lisp/tramp-cmds.elc lisp/tramp-compat.elc lisp/tramp-efs.elc \ - lisp/tramp-ftp.elc lisp/tramp-gvfs.elc lisp/tramp-gw.elc \ - lisp/tramp-loaddefs.elc lisp/tramp-sh.elc lisp/tramp-smb.elc \ - lisp/tramp-uu.elc lisp/trampver.elc + lisp/tramp-ftp.elc lisp/tramp-gw.elc lisp/tramp-loaddefs.elc \ + lisp/tramp-sh.elc lisp/tramp-smb.elc lisp/tramp-uu.elc lisp/trampver.elc EXTRA_SOURCES = ChangeLog.upstream Repository URL: https://bitbucket.org/xemacs/tramp/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

XEmacs-Patches January 2013