Module Name: src
Committed By: wiz
Date: Fri May 8 20:19:39 UTC 2009
Modified Files:
src/external/bsd/file/dist/doc: libmagic.3 magic.5
Log Message:
Drop trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/file/dist/doc/libmagic.3
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/doc/magic.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/file/dist/doc/libmagic.3
diff -u src/external/bsd/file/dist/doc/libmagic.3:1.1.1.1 src/external/bsd/file/dist/doc/libmagic.3:1.2
--- src/external/bsd/file/dist/doc/libmagic.3:1.1.1.1 Fri May 8 16:35:10 2009
+++ src/external/bsd/file/dist/doc/libmagic.3 Fri May 8 20:19:39 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: libmagic.3,v 1.1.1.1 2009/05/08 16:35:10 christos Exp $
+.\" $NetBSD: libmagic.3,v 1.2 2009/05/08 20:19:39 wiz Exp $
.\"
.\" $File: libmagic.man,v 1.19 2008/10/06 20:16:04 christos Exp $
.\"
@@ -14,7 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\"
+.\"
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -75,7 +75,7 @@
The function
.Fn magic_open
creates a magic cookie pointer and returns it. It returns NULL if
-there was an error allocating the magic cookie. The
+there was an error allocating the magic cookie. The
.Ar flags
argument specifies how the other magic functions should behave:
.Bl -tag -width MAGIC_COMPRESS
@@ -167,7 +167,7 @@
.Pp
The
.Fn magic_setflags
-function sets the
+function sets the
.Ar flags
described above. Note that using both MIME flags together can also
return extra information on the charset.
@@ -221,7 +221,7 @@
The
.Fn magic_file ,
and
-.Fn magic_buffer
+.Fn magic_buffer
functions return a string on success and NULL on failure. The
.Fn magic_error
function returns a textual description of the errors of the above
@@ -244,7 +244,7 @@
.El
.Sh SEE ALSO
.Xr file 1 ,
-.Xr magic 5
+.Xr magic 5
.Sh AUTHORS
Måns Rullgård Initial libmagic implementation,
and configuration.
Index: src/external/bsd/file/dist/doc/magic.5
diff -u src/external/bsd/file/dist/doc/magic.5:1.2 src/external/bsd/file/dist/doc/magic.5:1.3
--- src/external/bsd/file/dist/doc/magic.5:1.2 Fri May 8 16:39:46 2009
+++ src/external/bsd/file/dist/doc/magic.5 Fri May 8 20:19:39 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: magic.5,v 1.2 2009/05/08 16:39:46 christos Exp $
+.\" $NetBSD: magic.5,v 1.3 2009/05/08 20:19:39 wiz Exp $
.\"
.\" $File: magic.man,v 1.59 2008/11/06 23:22:53 christos Exp $
.Dd August 30, 2008
@@ -299,14 +299,14 @@
.El
.Pp
An APPLE 4+4 character APPLE creator and type can be specified as:
-.Bd -literal -offset indent
+.Bd -literal -offset indent
!:apple CREATYPE
.Ed
.Pp
A MIME type is given on a separate line, which must be the next
non-blank or comment line after the magic line that identifies the
file type, and has the following format:
-.Bd -literal -offset indent
+.Bd -literal -offset indent
!:mime MIMETYPE
.Ed
.Pp
@@ -316,13 +316,13 @@
.Pp
An optional strength can be supplied on a separate line which refers to
the current magic description using the following format:
-.Bd -literal -offset indent
+.Bd -literal -offset indent
!:strength OP VALUE
.Ed
.Pp
The operand
.Dv OP
-can be:
+can be:
.Dv + ,
.Dv - ,
.Dv * ,
