On Mon, Jul 03, 2017 at 05:36:52PM +0100, Nicholas Marriott wrote:
Hi
On Thu, Jun 29, 2017 at 09:29:57PM +0200, Klemens Nanni wrote:
[...]
What about the current version being 4.21? We're clearly ahead of this,
it seems magic(5) wasn't updated when nicm@ reimplemented things.
This patch documents the respective types.
Did you copy this text from upstream or write it?
It's copied from magic.5 provided by devel/libmagic-5.31.
Some comments inline.
Feedback/OK?
Index: magic.5
===================================================================
RCS file: /cvs/src/usr.bin/file/magic.5,v
retrieving revision 1.17
diff -u -p -r1.17 magic.5
--- magic.5 24 Apr 2016 07:02:07 -0000 1.17
+++ magic.5 29 Jun 2017 17:41:56 -0000
@@ -218,6 +218,31 @@ This is intended to be used with the tes
.Em x
(which is always true) and a message that is to be used if there are
no other matches.
+.It Dv clear
+This test is always true and clears the match flag for that continuation
+level.
I would just say "that level" or "the test's level" not "that
continuation level" because there is no previous mention of
"continuation".
+It is intended to be used with the default test.
+.It Dv name
+Define a
+.Dq named
I don't think quotation marks are necessary here.
+magic instance that can be called from another
+.Dv use
+magic entry, like a subroutine call.
+Named instance direct magic offsets are relative to the offset of the
+previous matched entry, but indirect offsets are relative to the
+beginning of the file as usual.
+Named magic entries always match.
+.It Dv use
+Recursively call the named magic starting from the current offset.
+If the name of the referenced begins with a
"the referenced instance" would be better than "the referenced".
Sounds good to me.
