[src/trunk]: src add FS_APPLEUFS

[dbj <dbj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6e29428bb892
branches:  trunk
changeset: 537196:6e29428bb892
user:      dbj <dbj%NetBSD.org@localhost>
date:      Sat Sep 28 00:47:24 2002 +0000

description:
add FS_APPLEUFS
part of PR #17345

diffstat:

 sbin/disklabel/disklabel.5  |   4 +++-
 sbin/disklabel/disklabel.c  |   6 ++++--
 sbin/disklabel/printlabel.c |   5 +++--
 sys/sys/disklabel.h         |  10 +++++++---
 4 files changed, 17 insertions(+), 8 deletions(-)

diffs (135 lines):

diff -r a9cc80f9b9e3 -r 6e29428bb892 sbin/disklabel/disklabel.5
--- a/sbin/disklabel/disklabel.5        Sat Sep 28 00:40:08 2002 +0000
+++ b/sbin/disklabel/disklabel.5        Sat Sep 28 00:47:24 2002 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: disklabel.5,v 1.19 2002/09/28 00:40:08 dbj Exp $
+.\"    $NetBSD: disklabel.5,v 1.20 2002/09/28 00:47:25 dbj Exp $
 .\"
 .\" Copyright (c) 1987, 1991, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -312,6 +312,7 @@
 #define        FS_RAID         19      /* RAIDframe component */
 #define        FS_CCD          20      /* concatenated disk component */
 #define        FS_JFS2         21      /* IBM JFS2 */
+#define        FS_APPLEUFS     22      /* Apple UFS */
 
 #ifdef FSTYPENAMES
 static const char *const fstypenames[] = {
@@ -337,6 +338,7 @@
        "RAID",
        "ccd",
        "jfs",
+       "Apple UFS",
        NULL
 };
 #define FSMAXTYPES     (sizeof(fstypenames) / sizeof(fstypenames[0]) - 1)
diff -r a9cc80f9b9e3 -r 6e29428bb892 sbin/disklabel/disklabel.c
--- a/sbin/disklabel/disklabel.c        Sat Sep 28 00:40:08 2002 +0000
+++ b/sbin/disklabel/disklabel.c        Sat Sep 28 00:47:24 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.c,v 1.106 2002/06/18 00:19:27 itojun Exp $   */
+/*     $NetBSD: disklabel.c,v 1.107 2002/09/28 00:47:25 dbj Exp $      */
 
 /*
  * Copyright (c) 1987, 1993
@@ -47,7 +47,7 @@
 static char sccsid[] = "@(#)disklabel.c        8.4 (Berkeley) 5/4/95";
 /* from static char sccsid[] = "@(#)disklabel.c        1.2 (Symmetric) 11/28/85"; */
 #else
-__RCSID("$NetBSD: disklabel.c,v 1.106 2002/06/18 00:19:27 itojun Exp $");
+__RCSID("$NetBSD: disklabel.c,v 1.107 2002/09/28 00:47:25 dbj Exp $");
 #endif
 #endif /* not lint */
 
@@ -1154,6 +1154,7 @@
                        case FS_BSDLFS:
                        case FS_EX2FS:
                        case FS_ADOS:
+                       case FS_APPLEUFS:
                                (void) fprintf(f, "b%c#%d:", c,
                                    pp->p_fsize * pp->p_frag);
                                (void) fprintf(f, "f%c#%d:", c, pp->p_fsize);
@@ -1606,6 +1607,7 @@
 
                        case FS_BSDFFS:
                        case FS_ADOS:
+                       case FS_APPLEUFS:
                                NXTNUM(pp->p_fsize);
                                if (pp->p_fsize == 0)
                                        break;
diff -r a9cc80f9b9e3 -r 6e29428bb892 sbin/disklabel/printlabel.c
--- a/sbin/disklabel/printlabel.c       Sat Sep 28 00:40:08 2002 +0000
+++ b/sbin/disklabel/printlabel.c       Sat Sep 28 00:47:24 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: printlabel.c,v 1.4 2002/05/27 17:33:09 drochner Exp $  */
+/*     $NetBSD: printlabel.c,v 1.5 2002/09/28 00:47:26 dbj Exp $       */
 
 /*
  * Copyright (c) 1987, 1993
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: printlabel.c,v 1.4 2002/05/27 17:33:09 drochner Exp $");
+__RCSID("$NetBSD: printlabel.c,v 1.5 2002/09/28 00:47:26 dbj Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -140,6 +140,7 @@
 
        case FS_BSDFFS:
        case FS_ADOS:
+       case FS_APPLEUFS:
                (void)fprintf(f, "  %5d %5d %5d ",
                    pp->p_fsize, pp->p_fsize * pp->p_frag, pp->p_cpg);
                break;
diff -r a9cc80f9b9e3 -r 6e29428bb892 sys/sys/disklabel.h
--- a/sys/sys/disklabel.h       Sat Sep 28 00:40:08 2002 +0000
+++ b/sys/sys/disklabel.h       Sat Sep 28 00:47:24 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.74 2002/09/28 00:30:24 dbj Exp $       */
+/*     $NetBSD: disklabel.h,v 1.75 2002/09/28 00:47:24 dbj Exp $       */
 
 /*
  * Copyright (c) 1987, 1988, 1993
@@ -335,8 +335,9 @@
 #define        FS_RAID         19              /* RAIDframe component */
 #define        FS_CCD          20              /* concatenated disk component */
 #define        FS_JFS2         21              /* IBM JFS2 */
+#define        FS_APPLEUFS     22              /* Apple UFS */
 
-/* Adjust the FSMAXTYPES def below if you add something after JFS2 */
+/* Adjust the FSMAXTYPES def below if you add something after APPLEUFS */
 
 #ifdef FSTYPENAMES
 static const char *const fstypenames[] = {
@@ -362,11 +363,12 @@
        "RAID",
        "ccd",
        "jfs",
+       "Apple UFS",
        NULL
 };
 #define FSMAXTYPES     (sizeof(fstypenames) / sizeof(fstypenames[0]) - 1)
 #else
-#define FSMAXTYPES     (FS_JFS2 + 1)
+#define FSMAXTYPES     (FS_APPLEUFS + 1)
 #endif
 
 #ifdef FSCKNAMES
@@ -394,6 +396,7 @@
        NULL,           /* RAID Component */
        NULL,           /* concatenated disk component */
        NULL,           /* IBM JFS2 */
+       NULL,           /* Apple UFS */
        NULL            /* NULL */
 };
 #define FSMAXNAMES     (sizeof(fscknames) / sizeof(fscknames[0]) - 1)
@@ -425,6 +428,7 @@
        NULL,           /* RAID Component */
        NULL,           /* concatenated disk component */
        NULL,           /* IBM JFS2 */
+       NULL,           /* Apple UFS */
        NULL            /* NULL */
 };
 #define FSMAXMOUNTNAMES        (sizeof(mountnames) / sizeof(mountnames[0]) - 1)