From owner-svn-src-stable@FreeBSD.ORG  Wed Jun 17 09:29:19 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 54CBD106566B;
	Wed, 17 Jun 2009 09:29:19 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 426068FC17;
	Wed, 17 Jun 2009 09:29:19 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5H9TJoj068731;
	Wed, 17 Jun 2009 09:29:19 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5H9TJQ0068728;
	Wed, 17 Jun 2009 09:29:19 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <200906170929.n5H9TJQ0068728@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Wed, 17 Jun 2009 09:29:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194338 - stable/7/sbin/fsck_msdosfs
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Jun 2009 09:29:20 -0000

Author: avg
Date: Wed Jun 17 09:29:18 2009
New Revision: 194338
URL: http://svn.freebsd.org/changeset/base/194338

Log:
  MFC r193943: fsck_msdosfs: accept no-op -C option

Modified:
  stable/7/sbin/fsck_msdosfs/   (props changed)
  stable/7/sbin/fsck_msdosfs/fsck_msdosfs.8
  stable/7/sbin/fsck_msdosfs/main.c

Modified: stable/7/sbin/fsck_msdosfs/fsck_msdosfs.8
==============================================================================
--- stable/7/sbin/fsck_msdosfs/fsck_msdosfs.8	Wed Jun 17 07:11:38 2009	(r194337)
+++ stable/7/sbin/fsck_msdosfs/fsck_msdosfs.8	Wed Jun 17 09:29:18 2009	(r194338)
@@ -32,7 +32,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 13, 1995
+.Dd June 4, 2009
 .Dt FSCK_MSDOSFS 8
 .Os
 .Sh NAME
@@ -41,10 +41,10 @@
 .Sh SYNOPSIS
 .Nm
 .Fl p
-.Op Fl f
+.Op Fl Cf
 .Ar filesystem ...
 .Nm
-.Op Fl ny
+.Op Fl Cny
 .Ar filesystem ...
 .Sh DESCRIPTION
 The
@@ -80,6 +80,10 @@ making any changes.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
+.It Fl C
+Compatibility with the corresponding
+.Xr fsck 8
+option (skip check if clean), defined to no-op.
 .It Fl F
 Compatibility with the wrapper
 .Xr fsck 8

Modified: stable/7/sbin/fsck_msdosfs/main.c
==============================================================================
--- stable/7/sbin/fsck_msdosfs/main.c	Wed Jun 17 07:11:38 2009	(r194337)
+++ stable/7/sbin/fsck_msdosfs/main.c	Wed Jun 17 09:29:18 2009	(r194338)
@@ -74,8 +74,10 @@ main(int argc, char **argv)
 	int ch;
 
 	skipclean = 1;
-	while ((ch = getopt(argc, argv, "fFnpy")) != -1) {
+	while ((ch = getopt(argc, argv, "CfFnpy")) != -1) {
 		switch (ch) {
+		case 'C': /* for fsck_ffs compatibility */
+			break;
 		case 'f':
 			skipclean = 0;
 			break;