From 8abe8104f31757cccd2af02156e17b59f4d75c40 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Wed, 12 Mar 2003 14:37:01 +0000
Subject: [PATCH] Update for FILE v3.41.

---
 usr.bin/file/file.1  | 34 ++++++++++++++++++++++++++++------
 usr.bin/file/magic.5 |  6 +++---
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index 8cc9b9938cc4..e9f6895ae249 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -1,6 +1,6 @@
 .\" $FreeBSD$
-.\" $Id: file.man,v 1.42 2002/07/03 18:26:37 christos Exp $
-.Dd April 4, 2001
+.\" $Id: file.man,v 1.44 2003/02/27 20:47:46 christos Exp $
+.Dd February 27, 2003
 .Dt FILE 1 "Copyright but distributable"
 .Os
 .Sh NAME
@@ -8,15 +8,16 @@
 .Nd determine file type
 .Sh SYNOPSIS
 .Nm
-.Op Fl bciknsvzL
+.Op Fl bciknNsvzL
 .Op Fl f Ar namefile
+.Op Fl F Ar separator
 .Op Fl m Ar magicfiles
 .Ar
 .Nm
 .Fl C
 .Op Fl m Ar magicfile
 .Sh DESCRIPTION
-This manual page documents version 3.39 of the
+This manual page documents version 3.41 of the
 .Nm
 utility which tests each argument in an attempt to classify it.
 There are three sets of tests, performed in this order:
@@ -181,6 +182,9 @@ or at least one filename argument must be present;
 to test the standard input, use
 .Dq Fl
 as a filename argument.
+.It Fl F Ar separator
+Use the specified separator character instead of
+.Ql \&: .
 .It Fl i
 Causes the file command to output mime type strings rather than the more
 traditional human readable ones.
@@ -206,6 +210,8 @@ Force stdout to be flushed after checking each file.
 This is only useful if checking a list of files.
 It is intended to be used by programs that want
 filetype output from a pipe.
+.It Fl N
+Don't pad output to align filenames nicely.
 .It Fl v
 Print the version of the program and exit.
 .It Fl z
@@ -325,7 +331,7 @@ file:      ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV),
 $ file -s /dev/wd0{b,d}
 /dev/wd0b: data
 /dev/wd0d: x86 boot sector
-$ file -s /dev/hda{,1,2,3,4,5,6,7,8,9,10}
+$ file -s /dev/hda{,1,2,3,4,5,6,7,8,9,10}	# Linux
 /dev/hda:   x86 boot sector
 /dev/hda1:  Linux/i386 ext2 filesystem
 /dev/hda2:  x86 boot sector
@@ -338,6 +344,22 @@ $ file -s /dev/hda{,1,2,3,4,5,6,7,8,9,10}
 /dev/hda9:  empty
 /dev/hda10: empty
 
+$ file -s /dev/rwd0e				# BSD
+/dev/rwd0e:
+Unix Fast File system (little-endian),
+last mounted on /usr,
+last written at Mon Feb 10 13:22:40 2003,
+clean flag 2,
+number of blocks 28754208,
+number of data blocks 27812712,
+number of cylinder groups 3566,
+block size 8192,
+fragment size 1024,
+minimum percentage of free blocks 5,
+rotational delay 0ms,
+disk rotational speed 60rps,
+TIME optimization
+
 $ file -i file.c file /dev/{wd0a,hda}
 file.c:    text/x-c
 file:      application/x-executable, dynamically linked (uses shared libs),
@@ -506,4 +528,4 @@ You can obtain the original author's latest version by anonymous FTP
 on
 .Pa ftp.astron.com
 in the directory
-.Pa /pub/file/file-X.YY.tar.gz
+.Pa /pub/file/file-X.YZ.tar.gz
diff --git a/usr.bin/file/magic.5 b/usr.bin/file/magic.5
index 01e68dcf102d..35d904bf4c9f 100644
--- a/usr.bin/file/magic.5
+++ b/usr.bin/file/magic.5
@@ -3,7 +3,7 @@
 .\"
 .\" install as magic.4 on USG, magic.5 on V7 or Berkeley systems.
 .\"
-.Dd December 8, 2000
+.Dd February 27, 2003
 .Dt MAGIC 5 "Public Domain"
 .Os
 .Sh NAME
@@ -13,7 +13,7 @@
 This manual page documents the format of the magic file as
 used by the
 .Nm
-command, version 3.39.
+command, version 3.41.
 The
 .Nm file
 command identifies the type of a file using,
@@ -259,4 +259,4 @@ indirect offsets.
 .\" the changes I posted to the S5R2 version.
 .\"
 .\" Modified for Ian Darwin's version of the file command.
-.\" @(#)$Id: magic.man,v 1.19 2002/07/03 18:26:38 christos Exp $
+.\" @(#)$Id: magic.man,v 1.21 2003/02/27 20:47:46 christos Exp $