svn commit: r357516 - stable/11/sbin/newfs_msdos

[Dimitry Andric]

Author: dim
Date: Tue Feb  4 19:15:57 2020
New Revision: 357516
URL: https://svnweb.freebsd.org/changeset/base/357516

Log:
  MFC r351382 (by delphij):
  
  When creating a new FAT32 filesystem, use "unknown" (0xFFFFFFFF) for
  FSI_Nxt_Free instead of providing a wrong value.
  
  With this change, fsck_msdosfs would no longer complain about invalid
  FSInfo information.
  
  MFC r355317 (by delphij):
  
  newfs_msdos: -A is incompatible with -r, not -o.
  
  PR:		242314
  Submitted by:	Guy Yur <guyyur gmail com>
  
  MFC r357227:
  
  Merge r357225 from the clang1000-import branch:
  
  Fix the following -Werror warning from clang 10.0.0 in newfs_msdos:
  
  sbin/newfs_msdos/newfs_msdos.c:181:2: error: misleading indentation; statement is not part of the previous 'if' [-Werror,-Wmisleading-indentation]
          if (o.align) {
          ^
  sbin/newfs_msdos/newfs_msdos.c:179:5: note: previous statement is here
      if (argc < 1 || argc > 2)
      ^

Modified:
  stable/11/sbin/newfs_msdos/mkfs_msdos.c
  stable/11/sbin/newfs_msdos/newfs_msdos.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sbin/newfs_msdos/mkfs_msdos.c
==============================================================================
--- stable/11/sbin/newfs_msdos/mkfs_msdos.c	Tue Feb  4 19:05:58 2020	(r357515)
+++ stable/11/sbin/newfs_msdos/mkfs_msdos.c	Tue Feb  4 19:15:57 2020	(r357516)
@@ -715,7 +715,7 @@ mkfs_msdos(const char *fname, const char *dtype, const
 		mk4(img, 0x41615252);
 		mk4(img + MINBPS - 28, 0x61417272);
 		mk4(img + MINBPS - 24, 0xffffffff);
-		mk4(img + MINBPS - 20, bpb.bpbRootClust);
+		mk4(img + MINBPS - 20, 0xffffffff);
 		mk2(img + MINBPS - 2, DOSMAGIC);
 	    } else if (lsn >= bpb.bpbResSectors && lsn < dir &&
 		       !((lsn - bpb.bpbResSectors) %

Modified: stable/11/sbin/newfs_msdos/newfs_msdos.c
==============================================================================
--- stable/11/sbin/newfs_msdos/newfs_msdos.c	Tue Feb  4 19:05:58 2020	(r357515)
+++ stable/11/sbin/newfs_msdos/newfs_msdos.c	Tue Feb  4 19:15:57 2020	(r357516)
@@ -178,10 +178,10 @@ main(int argc, char *argv[])
     argv += optind;
     if (argc < 1 || argc > 2)
 	usage();
-	if (o.align) {
-		if (o.hidden_sectors_set)
-		    errx(1, "align (-A) is incompatible with -r");
-	}
+    if (o.align) {
+	if (o.reserved_sectors)
+	    errx(1, "align (-A) is incompatible with -r");
+    }
     fname = *argv++;
     if (!o.create_size && !strchr(fname, '/')) {
 	snprintf(buf, sizeof(buf), "%s%s", _PATH_DEV, fname);