svn commit: r268635 - head/sbin/fsck_msdosfs

[Pedro F. Giffuni]

Author: pfg
Date: Mon Jul 14 21:32:40 2014
New Revision: 268635
URL: http://svnweb.freebsd.org/changeset/base/268635

Log:
  newfs_msdosfs: Respect FSFIXFAT
  
  Fix some whitespace issues while here.
  
  Obtained from:	NetBSD (rev. 1.9)
  MFC after:	3 days

Modified:
  head/sbin/fsck_msdosfs/check.c
  head/sbin/fsck_msdosfs/ext.h

Modified: head/sbin/fsck_msdosfs/check.c
==============================================================================
--- head/sbin/fsck_msdosfs/check.c	Mon Jul 14 21:12:59 2014	(r268634)
+++ head/sbin/fsck_msdosfs/check.c	Mon Jul 14 21:32:40 2014	(r268635)
@@ -142,7 +142,7 @@ checkfilesys(const char *fname)
 		goto out;
 
 	/* now write the FATs */
-	if (mod & FSFATMOD) {
+	if (mod & (FSFATMOD|FSFIXFAT)) {
 		if (ask(1, "Update FATs")) {
 			mod |= writefat(dosfs, &boot, fat, mod & FSFIXFAT);
 			if (mod & FSFATAL)

Modified: head/sbin/fsck_msdosfs/ext.h
==============================================================================
--- head/sbin/fsck_msdosfs/ext.h	Mon Jul 14 21:12:59 2014	(r268634)
+++ head/sbin/fsck_msdosfs/ext.h	Mon Jul 14 21:32:40 2014	(r268635)
@@ -26,7 +26,7 @@
  */
 
 #ifndef EXT_H
-#define EXT_H
+#define	EXT_H
 
 #include <sys/types.h>
 
@@ -69,8 +69,8 @@ int checkfilesys(const char *);
 #define	FSFATMOD	4		/* The FAT was modified */
 #define	FSERROR		8		/* Some unrecovered error remains */
 #define	FSFATAL		16		/* Some unrecoverable error occurred */
-#define FSDIRTY		32		/* File system is dirty */
-#define FSFIXFAT	64		/* Fix file system FAT */
+#define	FSDIRTY		32		/* File system is dirty */
+#define	FSFIXFAT	64		/* Fix file system FAT */
 
 /*
  * read a boot block in a machine independent fashion and translate