From 2ffc1ec6ca0bd9e12a19efce1a1be51700cb522f Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Wed, 11 Dec 1996 10:01:56 +0000
Subject: [PATCH]         The manual page of df called cd9660 file systems by
 the name         isofs while the df command itself used the name iso9660fs or
         cdfs. Both of these were inconsistent with the name cd9660 which     
    is used by the mount command. I modified df to recognize all of        
 the names cd9660, cdfs, isofs, and iso9660fs, and take them all         to
 refer to the same thing. Naturally I added a note of this         behaviour
 in the manual page too.

Submitted-By: Jukka Ukkonen <jau@jau.csc.fi>
---
 bin/df/df.1 | 9 ++++++---
 bin/df/df.c | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/bin/df/df.1 b/bin/df/df.1
index 6c82d5e1757f..658a1bf8df37 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.2 (Berkeley) 1/13/94
-.\"	$Id: df.1,v 1.3 1994/09/24 02:55:08 davidg Exp $
+.\"	$Id: df.1,v 1.4 1996/08/29 18:05:48 wosch Exp $
 .\"
 .Dd January 13, 1994
 .Dt DF 1
@@ -78,11 +78,14 @@ with the possibly stale statistics that were previously obtained.
 .It Fl t
 Only print out statistics for filesystems of the specified types.
 The recognized types are:
-ufs, nfs, mfs, lfs, msdos, fdesc, portal, kernfs, procfs, afs and isofs.
+ufs, nfs, mfs, lfs, msdos, fdesc, portal, kernfs, procfs, afs, isofs,
+iso9660fs, cdfs, and cd9660,
 along with the aggregates:
 all (the default),
-local (ufs, mfs, lfs, msdos, isofs),
+local (ufs, mfs, lfs, msdos, cd9660),
 and misc (fdesc, portal, kernfs, procfs).
+The names isofs, iso9660fs, cdfs, and cd9660 are aliases to each other
+all of them refering to the same type of file system.
 The string ``no'' may be prepending to a type to get its complement
 (e.g. ``nonfs'' to get non-NFS filesystems).  The first
 .Fl t
diff --git a/bin/df/df.c b/bin/df/df.c
index 701a9adac46c..cb0c26e0ae7c 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: df.c,v 1.7 1995/05/30 00:06:42 rgrimes Exp $
+ *	$Id: df.c,v 1.8 1996/01/14 18:55:09 bde Exp $
  */
 
 #ifndef lint
@@ -95,6 +95,8 @@ struct typetab {
 	{"procfs",	MT(MOUNT_PROCFS)},
 	{"afs",		MT(MOUNT_AFS)},
 	{"iso9660fs",	MT(MOUNT_CD9660)},
+	{"isofs",	MT(MOUNT_CD9660)},
+	{"cd9660",	MT(MOUNT_CD9660)},
 	{"cdfs",	MT(MOUNT_CD9660)},
 	{"misc",	MT(MOUNT_LOFS)|MT(MOUNT_FDESC)|MT(MOUNT_PORTAL)|
 			MT(MOUNT_KERNFS)|MT(MOUNT_PROCFS)},