2021-03-08 12:05:29 +01:00
|
|
|
|
;;; tramp-fuse.el --- Tramp access functions for FUSE mounts -*- lexical-binding:t -*-
|
|
|
|
|
|
|
2022-01-01 02:45:51 -05:00
|
|
|
|
;; Copyright (C) 2021-2022 Free Software Foundation, Inc.
|
2021-03-08 12:05:29 +01:00
|
|
|
|
|
|
|
|
|
|
;; Author: Michael Albinus <michael.albinus@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 <https://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
|
|
;; These are helper functions for FUSE file systems.
|
|
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
|
|
|
|
(require 'tramp)
|
|
|
|
|
|
|
|
|
|
|
|
;; File name primitives.
|
|
|
|
|
|
|
|
|
|
|
|
(defun tramp-fuse-handle-delete-directory
|
|
|
|
|
|
(directory &optional recursive trash)
|
|
|
|
|
|
"Like `delete-directory' for Tramp files."
|
|
|
|
|
|
(with-parsed-tramp-file-name (expand-file-name directory) nil
|
|
|
|
|
|
(tramp-flush-directory-properties v localname)
|
|
|
|
|
|
(delete-directory (tramp-fuse-local-file-name directory) recursive trash)))
|
|
|
|
|
|
|
|
|
|
|
|
(defun tramp-fuse-handle-delete-file (filename &optional trash)
|
|
|
|
|
|
"Like `delete-file' for Tramp files."
|
|
|
|
|
|
(with-parsed-tramp-file-name (expand-file-name filename) nil
|
|
|
|
|
|
(delete-file (tramp-fuse-local-file-name filename) trash)
|
|
|
|
|
|
(tramp-flush-file-properties v localname)))
|
|
|
|
|
|
|
2022-05-17 09:13:34 +02:00
|
|
|
|
(defvar tramp-fuse-remove-hidden-files nil
|
|
|
|
|
|
"Remove hidden files from directory listings.")
|
|
|
|
|
|
|
2022-05-15 15:09:26 +02:00
|
|
|
|
(defsubst tramp-fuse-remove-hidden-files (files)
|
|
|
|
|
|
"Remove hidden files from FILES."
|
2022-05-17 09:13:34 +02:00
|
|
|
|
(if tramp-fuse-remove-hidden-files
|
|
|
|
|
|
(cl-remove-if
|
|
|
|
|
|
(lambda (x) (and (stringp x) (string-match-p "\\.fuse_hidden" x)))
|
|
|
|
|
|
files)
|
|
|
|
|
|
files))
|
2022-05-15 15:09:26 +02:00
|
|
|
|
|
2021-03-08 12:05:29 +01:00
|
|
|
|
(defun tramp-fuse-handle-directory-files
|
|
|
|
|
|
(directory &optional full match nosort count)
|
|
|
|
|
|
"Like `directory-files' for Tramp files."
|
2022-07-24 16:02:10 +02:00
|
|
|
|
(let ((result
|
|
|
|
|
|
(tramp-skeleton-directory-files directory full match nosort count
|
|
|
|
|
|
;; Some storage systems do not return "." and "..".
|
|
|
|
|
|
(delete-dups
|
|
|
|
|
|
(append
|
|
|
|
|
|
'("." "..")
|
|
|
|
|
|
(tramp-fuse-remove-hidden-files
|
|
|
|
|
|
(tramp-compat-directory-files
|
|
|
|
|
|
(tramp-fuse-local-file-name directory))))))))
|
|
|
|
|
|
(if full
|
2021-03-08 12:05:29 +01:00
|
|
|
|
;; Massage the result.
|
2022-07-24 16:02:10 +02:00
|
|
|
|
(let ((local (concat
|
|
|
|
|
|
"^" (regexp-quote
|
|
|
|
|
|
(tramp-fuse-mount-point
|
|
|
|
|
|
(tramp-dissect-file-name directory)))))
|
|
|
|
|
|
(remote (directory-file-name
|
|
|
|
|
|
(funcall
|
|
|
|
|
|
(if (tramp-compat-file-name-quoted-p directory)
|
|
|
|
|
|
#'tramp-compat-file-name-quote #'identity)
|
|
|
|
|
|
(file-remote-p directory)))))
|
|
|
|
|
|
(mapcar
|
|
|
|
|
|
(lambda (x) (replace-regexp-in-string local remote x))
|
|
|
|
|
|
result))
|
|
|
|
|
|
result)))
|
2021-03-08 12:05:29 +01:00
|
|
|
|
|
|
|
|
|
|
(defun tramp-fuse-handle-file-attributes (filename &optional id-format)
|
|
|
|
|
|
"Like `file-attributes' for Tramp files."
|
|
|
|
|
|
(with-parsed-tramp-file-name (expand-file-name filename) nil
|
|
|
|
|
|
(with-tramp-file-property
|
|
|
|
|
|
v localname (format "file-attributes-%s" id-format)
|
|
|
|
|
|
(file-attributes (tramp-fuse-local-file-name filename) id-format))))
|
|
|
|
|
|
|
|
|
|
|
|
(defun tramp-fuse-handle-file-executable-p (filename)
|
|
|
|
|
|
"Like `file-executable-p' for Tramp files."
|
|
|
|
|
|
(with-parsed-tramp-file-name (expand-file-name filename) nil
|
|
|
|
|
|
(with-tramp-file-property v localname "file-executable-p"
|
|
|
|
|
|
(file-executable-p (tramp-fuse-local-file-name filename)))))
|
|
|
|
|
|
|
|
|
|
|
|
(defun tramp-fuse-handle-file-name-all-completions (filename directory)
|
|
|
|
|
|
"Like `file-name-all-completions' for Tramp files."
|
2022-05-15 15:09:26 +02:00
|
|
|
|
(tramp-fuse-remove-hidden-files
|
|
|
|
|
|
(all-completions
|
|
|
|
|
|
filename
|
|
|
|
|
|
(delete-dups
|
|
|
|
|
|
(append
|
|
|
|
|
|
(file-name-all-completions
|
|
|
|
|
|
filename (tramp-fuse-local-file-name directory))
|
|
|
|
|
|
;; Some storage systems do not return "." and "..".
|
|
|
|
|
|
(let (result)
|
|
|
|
|
|
(dolist (item '(".." ".") result)
|
|
|
|
|
|
(when (string-prefix-p filename item)
|
|
|
|
|
|
(catch 'match
|
|
|
|
|
|
(dolist (elt completion-regexp-list)
|
|
|
|
|
|
(unless (string-match-p elt item) (throw 'match nil)))
|
|
|
|
|
|
(setq result (cons (concat item "/") result)))))))))))
|
2021-03-08 12:05:29 +01:00
|
|
|
|
|
|
|
|
|
|
;; This function isn't used.
|
|
|
|
|
|
(defun tramp-fuse-handle-insert-directory
|
|
|
|
|
|
(filename switches &optional wildcard full-directory-p)
|
|
|
|
|
|
"Like `insert-directory' for Tramp files."
|
|
|
|
|
|
(insert-directory
|
|
|
|
|
|
(tramp-fuse-local-file-name filename) switches wildcard full-directory-p)
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(while (search-forward (tramp-fuse-local-file-name filename) nil 'noerror)
|
|
|
|
|
|
(replace-match filename)))
|
|
|
|
|
|
|
|
|
|
|
|
(defun tramp-fuse-handle-make-directory (dir &optional parents)
|
|
|
|
|
|
"Like `make-directory' for Tramp files."
|
|
|
|
|
|
(with-parsed-tramp-file-name (expand-file-name dir) nil
|
|
|
|
|
|
(make-directory (tramp-fuse-local-file-name dir) parents)
|
|
|
|
|
|
;; When PARENTS is non-nil, DIR could be a chain of non-existent
|
|
|
|
|
|
;; directories a/b/c/... Instead of checking, we simply flush the
|
|
|
|
|
|
;; whole file cache.
|
|
|
|
|
|
(tramp-flush-file-properties v localname)
|
|
|
|
|
|
(tramp-flush-directory-properties
|
|
|
|
|
|
v (if parents "/" (file-name-directory localname)))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; File name helper functions.
|
|
|
|
|
|
|
|
|
|
|
|
(defun tramp-fuse-mount-spec (vec)
|
|
|
|
|
|
"Return local mount spec of VEC."
|
|
|
|
|
|
(if-let ((host (tramp-file-name-host vec))
|
|
|
|
|
|
(user (tramp-file-name-user vec)))
|
|
|
|
|
|
(format "%s@%s:/" user host)
|
|
|
|
|
|
(format "%s:/" host)))
|
|
|
|
|
|
|
|
|
|
|
|
(defun tramp-fuse-mount-point (vec)
|
|
|
|
|
|
"Return local mount point of VEC."
|
2022-07-03 18:23:55 +02:00
|
|
|
|
(or (tramp-get-connection-property vec "mount-point")
|
2021-03-08 12:05:29 +01:00
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(concat
|
|
|
|
|
|
tramp-temp-name-prefix
|
|
|
|
|
|
(tramp-file-name-method vec) "."
|
|
|
|
|
|
(when (tramp-file-name-user vec)
|
|
|
|
|
|
(concat (tramp-file-name-user-domain vec) "@"))
|
|
|
|
|
|
(tramp-file-name-host-port vec))
|
Fix tramp-compat-temporary-file-directory implementation
* lisp/net/tramp-archive.el
(tramp-archive-handle-temporary-file-directory):
Use `tramp-compat-temporary-file-directory-function'.
* lisp/net/tramp-compat.el (tramp-compat-temporary-file-directory):
Make it a defconst.
* lisp/net/tramp.el (tramp-get-debug-buffer, tramp-get-debug-file-name)
(tramp-debug-message, tramp-file-name-handler, tramp-parse-file)
(tramp-parse-shostkeys-sknownhosts)
(tramp-handle-expand-file-name, tramp-handle-make-process)
(tramp-local-host-p, tramp-call-process)
(tramp-call-process-region, tramp-process-lines)
(tramp-read-passwd):
* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
* lisp/net/tramp-compat.el (tramp-compat-make-temp-name)
(tramp-compat-make-temp-file);
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-for-operation)
(tramp-crypt-maybe-open-connection, tramp-crypt-send-command)
(tramp-crypt-do-encrypt-or-decrypt-file-name):
* lisp/net/tramp-fuse.el (tramp-fuse-mount-point, tramp-fuse-mounted-p)
(tramp-fuse-unmount):
* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
(tramp-sh-handle-expand-file-name)
(tramp-sh-handle-file-local-copy, )
(tramp-sh-handle-write-region, tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection): Use it.
2021-09-21 20:26:59 +02:00
|
|
|
|
tramp-compat-temporary-file-directory)))
|
2021-03-08 12:05:29 +01:00
|
|
|
|
|
2021-10-05 11:27:48 +02:00
|
|
|
|
(defconst tramp-fuse-mount-timeout
|
|
|
|
|
|
(eval (car (get 'remote-file-name-inhibit-cache 'standard-value)) t)
|
|
|
|
|
|
"Time period to check whether the mount point still exists.
|
|
|
|
|
|
It has the same meaning as `remote-file-name-inhibit-cache'.")
|
|
|
|
|
|
|
2021-03-08 12:05:29 +01:00
|
|
|
|
(defun tramp-fuse-mounted-p (vec)
|
|
|
|
|
|
"Check, whether fuse volume determined by VEC is mounted."
|
2021-10-05 11:27:48 +02:00
|
|
|
|
;; Remember the mount status by using a file property on "/",
|
|
|
|
|
|
;; instead of using a connection property, because a file property
|
|
|
|
|
|
;; has a timeout. Having a timeout lets us regularly recheck the
|
|
|
|
|
|
;; mount status, as requested by `tramp-fuse-mount-timeout'. We
|
|
|
|
|
|
;; cannot use `with-tramp-file-property', because we don't want to
|
|
|
|
|
|
;; cache a nil result.
|
|
|
|
|
|
(let ((remote-file-name-inhibit-cache tramp-fuse-mount-timeout))
|
2022-07-03 18:23:55 +02:00
|
|
|
|
(or (tramp-get-file-property vec "/" "mounted")
|
Fix tramp-compat-temporary-file-directory implementation
* lisp/net/tramp-archive.el
(tramp-archive-handle-temporary-file-directory):
Use `tramp-compat-temporary-file-directory-function'.
* lisp/net/tramp-compat.el (tramp-compat-temporary-file-directory):
Make it a defconst.
* lisp/net/tramp.el (tramp-get-debug-buffer, tramp-get-debug-file-name)
(tramp-debug-message, tramp-file-name-handler, tramp-parse-file)
(tramp-parse-shostkeys-sknownhosts)
(tramp-handle-expand-file-name, tramp-handle-make-process)
(tramp-local-host-p, tramp-call-process)
(tramp-call-process-region, tramp-process-lines)
(tramp-read-passwd):
* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
* lisp/net/tramp-compat.el (tramp-compat-make-temp-name)
(tramp-compat-make-temp-file);
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-for-operation)
(tramp-crypt-maybe-open-connection, tramp-crypt-send-command)
(tramp-crypt-do-encrypt-or-decrypt-file-name):
* lisp/net/tramp-fuse.el (tramp-fuse-mount-point, tramp-fuse-mounted-p)
(tramp-fuse-unmount):
* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
(tramp-sh-handle-expand-file-name)
(tramp-sh-handle-file-local-copy, )
(tramp-sh-handle-write-region, tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection): Use it.
2021-09-21 20:26:59 +02:00
|
|
|
|
(let* ((default-directory tramp-compat-temporary-file-directory)
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
(command (format "mount -t fuse.%s" (tramp-file-name-method vec)))
|
|
|
|
|
|
(mount (shell-command-to-string command)))
|
|
|
|
|
|
(tramp-message vec 6 "%s\n%s" command mount)
|
2021-10-05 11:27:48 +02:00
|
|
|
|
(tramp-set-file-property
|
|
|
|
|
|
vec "/" "mounted"
|
2021-03-08 12:05:29 +01:00
|
|
|
|
(when (string-match
|
|
|
|
|
|
(format
|
|
|
|
|
|
"^\\(%s\\)\\s-" (regexp-quote (tramp-fuse-mount-spec vec)))
|
|
|
|
|
|
mount)
|
|
|
|
|
|
(match-string 1 mount)))))))
|
|
|
|
|
|
|
2021-10-03 18:55:35 +02:00
|
|
|
|
(defun tramp-fuse-get-fusermount ()
|
|
|
|
|
|
"Determine the local `fusermount' command."
|
|
|
|
|
|
;; We use key nil for local connection properties.
|
|
|
|
|
|
(with-tramp-connection-property nil "fusermount"
|
|
|
|
|
|
(or (executable-find "fusermount3")
|
|
|
|
|
|
(executable-find "fusermount"))))
|
|
|
|
|
|
|
|
|
|
|
|
(defvar tramp-fuse-mount-points nil
|
|
|
|
|
|
"List of fuse volume determined by a VEC.")
|
|
|
|
|
|
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
(defun tramp-fuse-unmount (vec)
|
|
|
|
|
|
"Unmount fuse volume determined by VEC."
|
2021-10-03 18:55:35 +02:00
|
|
|
|
(let* ((default-directory tramp-compat-temporary-file-directory)
|
|
|
|
|
|
(mount-point (tramp-fuse-mount-point vec))
|
|
|
|
|
|
(command (format "%s -u %s" (tramp-fuse-get-fusermount) mount-point)))
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
(tramp-message vec 6 "%s\n%s" command (shell-command-to-string command))
|
2021-10-05 11:27:48 +02:00
|
|
|
|
(tramp-flush-file-property vec "/" "mounted")
|
2021-10-03 18:55:35 +02:00
|
|
|
|
(setq tramp-fuse-mount-points
|
|
|
|
|
|
(delete (tramp-file-name-unify vec) tramp-fuse-mount-points))
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
;; Give the caches a chance to expire.
|
2021-10-03 18:55:35 +02:00
|
|
|
|
(sleep-for 1)
|
|
|
|
|
|
(when (tramp-compat-directory-empty-p mount-point)
|
|
|
|
|
|
(delete-directory mount-point))))
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
|
2021-03-08 12:05:29 +01:00
|
|
|
|
(defun tramp-fuse-local-file-name (filename)
|
|
|
|
|
|
"Return local mount name of FILENAME."
|
|
|
|
|
|
(setq filename (tramp-compat-file-name-unquote (expand-file-name filename)))
|
|
|
|
|
|
(with-parsed-tramp-file-name filename nil
|
|
|
|
|
|
;; As long as we call `tramp-*-maybe-open-connection' here,
|
|
|
|
|
|
;; we cache the result.
|
|
|
|
|
|
(with-tramp-file-property v localname "local-file-name"
|
|
|
|
|
|
(funcall
|
|
|
|
|
|
(intern
|
|
|
|
|
|
(format "tramp-%s-maybe-open-connection" (tramp-file-name-method v)))
|
|
|
|
|
|
v)
|
|
|
|
|
|
(let ((quoted (tramp-compat-file-name-quoted-p localname))
|
|
|
|
|
|
(localname (tramp-compat-file-name-unquote localname)))
|
|
|
|
|
|
(funcall
|
|
|
|
|
|
(if quoted #'tramp-compat-file-name-quote #'identity)
|
|
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(if (file-name-absolute-p localname)
|
|
|
|
|
|
(substring localname 1) localname)
|
|
|
|
|
|
(tramp-fuse-mount-point v)))))))
|
|
|
|
|
|
|
2021-10-03 18:55:35 +02:00
|
|
|
|
(defcustom tramp-fuse-unmount-on-cleanup nil
|
|
|
|
|
|
"Whether fuse volumes shall be unmounted on cleanup."
|
|
|
|
|
|
:group 'tramp
|
|
|
|
|
|
:version "28.1"
|
|
|
|
|
|
:type 'boolean)
|
|
|
|
|
|
|
|
|
|
|
|
(defun tramp-fuse-cleanup (vec)
|
|
|
|
|
|
"Cleanup fuse volume determined by VEC."
|
|
|
|
|
|
(and tramp-fuse-unmount-on-cleanup
|
|
|
|
|
|
(member (tramp-file-name-unify vec) tramp-fuse-mount-points)
|
|
|
|
|
|
(tramp-fuse-unmount vec)))
|
|
|
|
|
|
|
|
|
|
|
|
(defun tramp-fuse-cleanup-all ()
|
|
|
|
|
|
"Unmount all fuse volumes used by Tramp."
|
|
|
|
|
|
(and tramp-fuse-unmount-on-cleanup
|
|
|
|
|
|
(mapc #'tramp-fuse-unmount tramp-fuse-mount-points)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Add cleanup hooks.
|
|
|
|
|
|
(add-hook 'tramp-cleanup-connection-hook #'tramp-fuse-cleanup)
|
|
|
|
|
|
(add-hook 'tramp-cleanup-all-connections-hook #'tramp-fuse-cleanup-all)
|
|
|
|
|
|
(add-hook 'kill-emacs-hook #'tramp-fuse-cleanup-all)
|
|
|
|
|
|
(add-hook 'tramp-fuse-unload-hook
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(remove-hook 'tramp-cleanup-connection-hook
|
|
|
|
|
|
#'tramp-fuse-cleanup)
|
|
|
|
|
|
(remove-hook 'tramp-cleanup-all-connections-hook
|
|
|
|
|
|
#'tramp-fuse-cleanup-all)
|
|
|
|
|
|
(remove-hook 'kill-emacs-hook
|
|
|
|
|
|
#'tramp-fuse-cleanup-all)))
|
|
|
|
|
|
|
2021-03-08 12:05:29 +01:00
|
|
|
|
(add-hook 'tramp-unload-hook
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(unload-feature 'tramp-fuse 'force)))
|
|
|
|
|
|
|
|
|
|
|
|
(provide 'tramp-fuse)
|
|
|
|
|
|
|
|
|
|
|
|
;;; tramp-fuse.el ends here
|