Rename option 'C' to 'D' (damaged) in order to avoid a conflict with upcoming

Juniper 'C' (clean) flag.

Requested by:	obrien
MFC after:	1 week

4 files changed, 28 insertions, 28 deletions

diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index 14f49d6..fd2ed3d 100644
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -270,7 +270,7 @@ char	yflag;			/* assume a yes response */
 int	bkgrdflag;		/* use a snapshot to run on an active system */
 int	bflag;			/* location of alternate super block */
 int	debug;			/* output debugging info */
-char	catastrophicflag;	/* run in catastrophic mode */
+char	damagedflag;		/* run in damaged mode */
 int	cvtlevel;		/* convert to newer file system format */
 int	bkgrdcheck;		/* determine if background check is possible */
 int	bkgrdsumadj;		/* whether the kernel have ability to adjust superblock summary */
diff --git a/sbin/fsck_ffs/fsck_ffs.8 b/sbin/fsck_ffs/fsck_ffs.8
index aa5a1ba..a264f21 100644
--- a/sbin/fsck_ffs/fsck_ffs.8
+++ b/sbin/fsck_ffs/fsck_ffs.8
@@ -29,7 +29,7 @@
 .\"	@(#)fsck.8	8.4 (Berkeley) 5/9/95
 .\" $FreeBSD$
 .\"
-.Dd April 10, 2008
+.Dd January 20, 2009
 .Dt FSCK_FFS 8
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 .Nd file system consistency check and interactive repair
 .Sh SYNOPSIS
 .Nm
-.Op Fl BCFpfny
+.Op Fl BDFpfny
 .Op Fl b Ar block
 .Op Fl c Ar level
 .Op Fl m Ar mode
@@ -175,26 +175,6 @@ Use the block specified immediately after the flag as
 the super block for the file system.
 An alternate super block is usually located at block 32 for UFS1,
 and block 160 for UFS2.
-.It Fl C
-Run
-.Nm
-in 'catastrophic recovery' mode, which will enable certain aggressive
-operations that can make
-.Nm
-to survive with file systems that has very serious data damage, which
-is an useful last resort when on disk data damage is very serious
-and causes
-.Nm
-to crash otherwise.  Be
-.Em very careful
-using this flag, it is dangerous if there are data transmission hazards
-because a false positive cylinder group magic number mismatch could
-cause
-.Em irrevertible data loss!
-.Pp
-This option implies the
-.Fl f
-flag.
 .It Fl c
 Convert the file system to the specified level.
 Note that the level of a file system can only be raised.
@@ -228,6 +208,26 @@ are being converted at once.
 The format of a file system can be determined from the
 first line of output from
 .Xr dumpfs 8 .
+.It Fl D
+Run
+.Nm
+in 'damaged recovery' mode, which will enable certain aggressive
+operations that can make
+.Nm
+to survive with file systems that has very serious data damage, which
+is an useful last resort when on disk data damage is very serious
+and causes
+.Nm
+to crash otherwise.  Be
+.Em very careful
+using this flag, it is dangerous if there are data transmission hazards
+because a false positive cylinder group magic number mismatch could
+cause
+.Em irrevertible data loss!
+.Pp
+This option implies the
+.Fl f
+flag.
 .It Fl f
 Force
 .Nm
diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c
index 7ca0c44..2664324 100644
--- a/sbin/fsck_ffs/fsutil.c
+++ b/sbin/fsck_ffs/fsutil.c
@@ -427,7 +427,7 @@ check_cgmagic(int cg, struct cg *cgp)
 
 	if (!cg_chkmagic(cgp)) {
 	    pwarn("CG %d: BAD MAGIC NUMBER\n", cg);
-	    if (catastrophicflag) {
+	    if (damagedflag) {
 		if (reply("CLEAR CG")) {
 			memset(cgp, 0, (size_t)sblock.fs_cgsize);
 			cgp->cg_initediblk = sblock.fs_ipg;
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index 2187e45..ac4a2a0 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -81,8 +81,8 @@ main(int argc, char *argv[])
 
 	sync();
 	skipclean = 1;
-	catastrophicflag = 0;
-	while ((ch = getopt(argc, argv, "b:Bc:CdfFm:npy")) != -1) {
+	damagedflag = 0;
+	while ((ch = getopt(argc, argv, "b:Bc:dDfFm:npy")) != -1) {
 		switch (ch) {
 		case 'b':
 			skipclean = 0;
@@ -106,8 +106,8 @@ main(int argc, char *argv[])
 			debug++;
 			break;
 
-		case 'C':
-			catastrophicflag = 1;
+		case 'D':
+			damagedflag = 1;
 			/* FALLTHROUGH */
 
 		case 'f':