Fixed operation of -f to match its documentation and fsck_ffs. It

has now has no effect except in combination with -p, and plain fsck
checks all file systems instead of skipping clean ones for msdosfs
only.

Renamed the force flag to skipclean and inverted its logic as in
fsck_ffs.

3 files changed, 6 insertions, 7 deletions

diff --git a/sbin/fsck_msdosfs/check.c b/sbin/fsck_msdosfs/check.c
index 6a40749..48ae5ca 100644
--- a/sbin/fsck_msdosfs/check.c
+++ b/sbin/fsck_msdosfs/check.c
@@ -84,9 +84,8 @@ checkfilesys(const char *fname)
 		return 8;
 	}
 
-	if (checkdirty(dosfs, &boot) && !force) {
-		if (preen)
-			printf("%s: ", fname);
+	if (skipclean && preen && checkdirty(dosfs, &boot)) {
+		printf("%s: ", fname);
 		printf("FILESYSTEM CLEAN; SKIPPING CHECKS\n");
 		ret = 0;
 		goto out;
diff --git a/sbin/fsck_msdosfs/ext.h b/sbin/fsck_msdosfs/ext.h
index 7a24a5d..0e93c24 100644
--- a/sbin/fsck_msdosfs/ext.h
+++ b/sbin/fsck_msdosfs/ext.h
@@ -46,9 +46,9 @@
  */
 extern int alwaysno;	/* assume "no" for all questions */
 extern int alwaysyes;	/* assume "yes" for all questions */
-extern int force;	/* force check even the fs is clean */
 extern int preen;	/* we are preening */
 extern int rdonly;	/* device is opened read only (supersedes above) */
+extern int skipclean;	/* skip clean file systems if preening */
 
 extern struct dosDirEntry *rootDir;
 
diff --git a/sbin/fsck_msdosfs/main.c b/sbin/fsck_msdosfs/main.c
index b0e852e..37bfb6e 100644
--- a/sbin/fsck_msdosfs/main.c
+++ b/sbin/fsck_msdosfs/main.c
@@ -51,9 +51,9 @@ static const char rcsid[] =
 
 int alwaysno;		/* assume "no" for all questions */
 int alwaysyes;		/* assume "yes" for all questions */
-int force;		/* force check even the fs is clean */
 int preen;		/* set when preening */
 int rdonly;		/* device is opened read only (supersedes above) */
+int skipclean;		/* skip clean file systems if preening */
 
 static void usage(void) __dead2;
 
@@ -71,11 +71,11 @@ main(int argc, char **argv)
 	int ret = 0, erg;
 	int ch;
 
-	force = 0;
+	skipclean = 1;
 	while ((ch = getopt(argc, argv, "fFnpy")) != -1) {
 		switch (ch) {
 		case 'f':
-			force = 1;
+			skipclean = 0;
 			break;
 		case 'F':
 			/*