summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/file/file.18
-rw-r--r--usr.bin/file/file.c10
2 files changed, 10 insertions, 8 deletions
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index 8572afb1cf0..53bfaa105b7 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: file.1,v 1.43 2015/07/30 11:13:24 jmc Exp $
+.\" $OpenBSD: file.1,v 1.44 2015/12/24 11:45:34 jca Exp $
.\" $FreeBSD: src/usr.bin/file/file.1,v 1.16 2000/03/01 12:19:39 sheldonh Exp $
.\"
.\" Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: July 30 2015 $
+.Dd $Mdocdate: December 24 2015 $
.Dt FILE 1
.Os
.Sh NAME
@@ -83,7 +83,7 @@ reads from the standard input.
.Pp
The options are as follows:
.Bl -tag -width indent
-.It Fl b
+.It Fl b , -brief
Does not prepend filenames to output lines.
.It Fl c
Prints a summary of the parsed magic file; usually used for debugging.
@@ -97,7 +97,7 @@ Thus it may say
.Dq text/plain
rather than
.Dq ASCII text .
-.It Fl L
+.It Fl L , -dereference
Causes symlinks to be followed.
.It Fl s
Attempts to read block and character device files, not just regular files.
diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c
index 1f5e8336f81..d6987e32f2a 100644
--- a/usr.bin/file/file.c
+++ b/usr.bin/file/file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file.c,v 1.56 2015/12/05 13:18:09 claudio Exp $ */
+/* $OpenBSD: file.c,v 1.57 2015/12/24 11:45:34 jca Exp $ */
/*
* Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -102,9 +102,11 @@ static char *magicpath;
static FILE *magicfp;
static struct option longopts[] = {
- { "mime", no_argument, NULL, 'i' },
- { "mime-type", no_argument, NULL, 'i' },
- { NULL, 0, NULL, 0 }
+ { "brief", no_argument, NULL, 'b' },
+ { "dereference", no_argument, NULL, 'L' },
+ { "mime", no_argument, NULL, 'i' },
+ { "mime-type", no_argument, NULL, 'i' },
+ { NULL, 0, NULL, 0 }
};
__dead void