Commit 67fe106d authored by Michael Albinus's avatar Michael Albinus
Browse files

Some minor improvements for share handling in tramp-gvfs.el

* lisp/net/tramp-gvfs.el (tramp-gvfs-connection-mounted-p):
Set "share" connection property if the mount spec offers it.
(tramp-gvfs-handle-get-remote-uid)
(tramp-gvfs-handle-get-remote-gid): Use it.
parent 1ff02c53
Pipeline #11606 failed with stages
in 29 seconds
...@@ -72,8 +72,8 @@ ...@@ -72,8 +72,8 @@
;; process key retrieved by `tramp-get-process' (the main connection ;; process key retrieved by `tramp-get-process' (the main connection
;; process). Other processes could reuse these properties, avoiding ;; process). Other processes could reuse these properties, avoiding
;; recomputation when a new asynchronous process is created by ;; recomputation when a new asynchronous process is created by
;; `make-process'. Examples are "remote-path", ;; `make-process'. Examples are "unsafe-temporary-file",
;; "unsafe-temporary-file" or "device" (tramp-adb.el). ;; "remote-path", "device" (tramp-adb.el) or "share" (tramp-gvfs.el).
;;; Code: ;;; Code:
......
...@@ -1633,8 +1633,10 @@ If FILE-SYSTEM is non-nil, return file system attributes." ...@@ -1633,8 +1633,10 @@ If FILE-SYSTEM is non-nil, return file system attributes."
ID-FORMAT valid values are `string' and `integer'." ID-FORMAT valid values are `string' and `integer'."
(if (equal id-format 'string) (if (equal id-format 'string)
(tramp-file-name-user vec) (tramp-file-name-user vec)
(when-let (when-let ((localname
((localname (tramp-get-connection-property vec "default-location" nil))) (tramp-get-connection-property
(tramp-get-process vec) "share"
(tramp-get-connection-property vec "default-location" nil))))
(tramp-compat-file-attribute-user-id (tramp-compat-file-attribute-user-id
(file-attributes (file-attributes
(tramp-make-tramp-file-name vec localname) id-format))))) (tramp-make-tramp-file-name vec localname) id-format)))))
...@@ -1642,8 +1644,10 @@ ID-FORMAT valid values are `string' and `integer'." ...@@ -1642,8 +1644,10 @@ ID-FORMAT valid values are `string' and `integer'."
(defun tramp-gvfs-handle-get-remote-gid (vec id-format) (defun tramp-gvfs-handle-get-remote-gid (vec id-format)
"The gid of the remote connection VEC, in ID-FORMAT. "The gid of the remote connection VEC, in ID-FORMAT.
ID-FORMAT valid values are `string' and `integer'." ID-FORMAT valid values are `string' and `integer'."
(when-let (when-let ((localname
((localname (tramp-get-connection-property vec "default-location" nil))) (tramp-get-connection-property
(tramp-get-process vec) "share"
(tramp-get-connection-property vec "default-location" nil))))
(tramp-compat-file-attribute-group-id (tramp-compat-file-attribute-group-id
(file-attributes (file-attributes
(tramp-make-tramp-file-name vec localname) id-format)))) (tramp-make-tramp-file-name vec localname) id-format))))
...@@ -1997,6 +2001,9 @@ a downcased host name only." ...@@ -1997,6 +2001,9 @@ a downcased host name only."
(tramp-set-file-property vec "/" "fuse-mountpoint" fuse-mountpoint) (tramp-set-file-property vec "/" "fuse-mountpoint" fuse-mountpoint)
(tramp-set-connection-property (tramp-set-connection-property
vec "default-location" default-location) vec "default-location" default-location)
(when share
(tramp-set-connection-property
(tramp-get-process vec) "share" (concat "/" share)))
(throw 'mounted t))))))) (throw 'mounted t)))))))
(defun tramp-gvfs-unmount (vec) (defun tramp-gvfs-unmount (vec)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment