Add 'G' argument predicate in Eshell

* lisp/eshell/em-pred.el (eshell-predicate-alist): Add 'G' predicate.
(eshell-predicate-help-string): Document it.  (Bug#54470)

* test/lisp/eshell/em-pred-tests.el
(em-pred-test/predicate-effective-gid): New test.

* doc/misc/eshell.text (Argument Predication): Document 'G' predicate.
This commit is contained in:
Jim Porter 2022-04-01 22:06:02 -07:00 committed by Eli Zaretskii
parent 6358cbc21a
commit 3dc73569b4
3 changed files with 16 additions and 4 deletions

View file

@ -1266,6 +1266,9 @@ Matches files with the sticky bit set.
@item @samp{U}
Matches files owned by the current effective user ID.
@item @samp{G}
Matches files owned by the current effective group ID.
@item @samp{l@option{[+-]}@var{n}}
Matches files with @var{n} links. With @option{+} (or @option{-}),
matches files with more than (or less than) @var{n} links,

View file

@ -88,10 +88,10 @@ ordinary strings."
(if (file-exists-p file)
(= (file-attribute-user-id (file-attributes file))
(user-uid)))))
;; (?G . (lambda (file) ; owned by effective gid
;; (if (file-exists-p file)
;; (= (file-attribute-user-id (file-attributes file))
;; (user-uid)))))
(?G . (lambda (file) ; owned by effective gid
(if (file-exists-p file)
(= (file-attribute-group-id (file-attributes file))
(group-gid)))))
(?* . (lambda (file)
(and (file-regular-p file)
(not (file-symlink-p file))
@ -161,6 +161,7 @@ PERMISSION BITS (for owner/group/world):
OWNERSHIP:
U owned by effective uid
G owned by effective gid
u(UID|\\='user\\=') owned by UID/user
g(GID|\\='group\\=') owned by GID/group

View file

@ -225,6 +225,14 @@ read, write, and execute predicates to query the file's modes."
(should (equal (eshell-eval-predicate files "U")
'("/fake/uid=1")))))))
(ert-deftest em-pred-test/predicate-effective-gid ()
"Test that \"G\" matches files owned by the effective GID."
(eshell-with-file-attributes-from-name
(cl-letf (((symbol-function 'group-gid) (lambda () 1)))
(let ((files '("/fake/gid=1" "/fake/gid=2")))
(should (equal (eshell-eval-predicate files "G")
'("/fake/gid=1")))))))
(ert-deftest em-pred-test/predicate-links ()
"Test that \"l\" filters by number of links."
(eshell-with-file-attributes-from-name