Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Jun 2024 06:28:19 GMT
From:      Stefan =?utf-8?Q?E=C3=9Fer?= <se@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 41ee91c64f47 - main - newfs_msdos: fix build on non-FreeBSD systems
Message-ID:  <202406040628.4546SJ98088668@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by se:

URL: https://cgit.FreeBSD.org/src/commit/?id=41ee91c64f47faaa8131df3cd8a63bdb60fa486a

commit 41ee91c64f47faaa8131df3cd8a63bdb60fa486a
Author:     Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2024-06-04 06:26:09 +0000
Commit:     Stefan Eßer <se@FreeBSD.org>
CommitDate: 2024-06-04 06:26:09 +0000

    newfs_msdos: fix build on non-FreeBSD systems
    
    Disable data area alignment if the build environment does not define
    PAGE_SIZE (e.g., when building on Linux or macOS).
    
    Reported by:    jrtc27
    MFC after:      1 week
---
 sbin/newfs_msdos/mkfs_msdos.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sbin/newfs_msdos/mkfs_msdos.c b/sbin/newfs_msdos/mkfs_msdos.c
index 423fbbcadcc5..1bca560a59e1 100644
--- a/sbin/newfs_msdos/mkfs_msdos.c
+++ b/sbin/newfs_msdos/mkfs_msdos.c
@@ -571,7 +571,11 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op)
 	    if (o.align)
 		alignto = bpb.bpbSecPerClust;
 	    else
+#ifdef	PAGE_SIZE
 		alignto = PAGE_SIZE / bpb.bpbBytesPerSec;
+#else
+	        alignto = 1;
+#endif
 	    if (alignto > 1) {
 		/* align data clusters */
 		alignment = (bpb.bpbResSectors + bpb.bpbBigFATsecs * bpb.bpbFATs + rds) %



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406040628.4546SJ98088668>