From owner-svn-src-all@FreeBSD.ORG Mon Jul 14 21:32:41 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 49AB1E85; Mon, 14 Jul 2014 21:32:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 37618260F; Mon, 14 Jul 2014 21:32:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6ELWfsK009466; Mon, 14 Jul 2014 21:32:41 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6ELWeCk009464; Mon, 14 Jul 2014 21:32:40 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201407142132.s6ELWeCk009464@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Mon, 14 Jul 2014 21:32:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r268635 - head/sbin/fsck_msdosfs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2014 21:32:41 -0000 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 @@ -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