On Sat, Sep 16, 2017 at 01:44:06AM +0200, Klemens Nanni wrote: > Here's an updated diff I simply forgot to send back then. > > Feedback, more comments or improvements? >
now committed, thanks. jmc > > diff --git a/usr.bin/file/magic.5 b/usr.bin/file/magic.5 > index 812c4c31095..b2f3a27671a 100644 > --- a/usr.bin/file/magic.5 > +++ b/usr.bin/file/magic.5 > @@ -41,10 +41,9 @@ > This manual page documents the format of the magic file as > used by the > .Xr file 1 > -command, version 4.24. > -The > +command. > .Xr file 1 > -command identifies the type of a file using, > +identifies the type of a file using, > among other tests, > a test for whether the file contains certain > .Dq "magic patterns" . > @@ -218,6 +217,28 @@ This is intended to be used with the test > .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 level. > +It is intended to be used with the default test. > +.It Dv name > +Define a named 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 instance begins with a > +.Dv ^ > +then the endianness of the magic is switched; if the magic mentioned > +.Dv leshort > +for example, > +it is treated as > +.Dv beshort > +and vice versa. > +This is useful to avoid duplicating the rules for different endianness. > .El > .Pp > Each top-level magic pattern (see below for an explanation of levels) >
