svn commit: r334606 - stable/10/sbin/fsck_msdosfs

Xin LI delphij at FreeBSD.org
Mon Jun 4 05:47:16 UTC 2018


Author: delphij
Date: Mon Jun  4 05:47:15 2018
New Revision: 334606
URL: https://svnweb.freebsd.org/changeset/base/334606

Log:
  MFC r333098:
  
  Don't bail out from the check if readboot() returns !FSFATAL.
  
  This can happen when the fsinfo signature is invalid, and the
  user have choose to fix it, in which case the code would return
  FSBOOTMOD (not FSOK but not FSFATAL either).
  
  All other (fatal) cases would return FSFATAL.
  
  Obtained from:	Android Open Source Project
  Obtained from:	https://android.googlesource.com/platform/external/fsck_msdos/+/d8775a29ea7eac2e5f1504dd21da3725b93b3036

Modified:
  stable/10/sbin/fsck_msdosfs/check.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/fsck_msdosfs/check.c
==============================================================================
--- stable/10/sbin/fsck_msdosfs/check.c	Mon Jun  4 05:38:22 2018	(r334605)
+++ stable/10/sbin/fsck_msdosfs/check.c	Mon Jun  4 05:47:15 2018	(r334606)
@@ -72,7 +72,7 @@ checkfilesys(const char *fname)
 		return 8;
 	}
 
-	if (readboot(dosfs, &boot) != FSOK) {
+	if (readboot(dosfs, &boot) == FSFATAL) {
 		close(dosfs);
 		printf("\n");
 		return 8;


More information about the svn-src-all mailing list