From nobody Fri Apr 14 12:52:51 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pybvm4XQkz45Bj6; Fri, 14 Apr 2023 12:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pybvl3yMVz3rYg; Fri, 14 Apr 2023 12:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681476771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ibtKO1Kp3A5SrSunYyVzIZVa0nGbeuvpw2ptKtM3fvs=; b=bs8EI/qes5QUeig2Wo4iD8EWR5Lc3AUKddu/4JeihJqQB05rKIFVn0SPaL7gR2Pm/qEKhv n7ZsMRD16MpJgeEx1eSaX270NInK/mDW2I0OQCbuxo5z/QDQNljry6KfbFDSl2U076UZP4 h8nhtLLOSQ3aiEyJ+LfEju5BLzWPk0WFQNeK5C2tebN55aOYc11m8WSnWiniPBDZfO8dS6 /aCjlVadrD6yr9YmGi9u6acUTxFuUi0mjnsSZA5hPFAeYXww4EoQrmh2TMJCCzAMkYQXTp B31qO1T7+UCrRAArWJVFekyi9e2XsVvWqkjPJ6P5gBq87oduLYPCIOsVKqwK4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681476771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ibtKO1Kp3A5SrSunYyVzIZVa0nGbeuvpw2ptKtM3fvs=; b=MKcc2YZVokr722AjXGOoHpzV2ZAierRdaJshpGrPwbezcV/HKyKvM6YmNUgueRI2gIkHeM 6/c338MukPgBiajGuAM0sd0Xc9BpS/Jf4sHFvGZ+10jxGnTID8GUitx2JXQhXdlGv1rVE9 JtkhPFAPB1n/NftpRwgeM73Wb1vuws2n1dR0v8ErfmZR2Q/EI+ekeelPlAtRGx+E9t2biX ziY2ei9bhr4Nsl15DKGHKhAHoyqGiarJjFm9FtHg0PCnm97CUcrPgvbzlo/Bn2hj58M/5D Zzt0/eGOEscT1ALlfCxwIFlicVNSr8LmOSLmWHVao7t/hgh7KZABZ+Yft59Opw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681476771; a=rsa-sha256; cv=none; b=rMa4GiVxKhzSenAV+hmcMu5QFESunOgs1NeB7CNl9dZSvTXlx7I4i2s8D4019q4FS/sZi8 YQbOJtuxvLWkALGgpBUGk3mJTINrpEaj45eP4xMs+G3hlr1k5/nopHg18dAtE0tMdLOqPH DFeJWbQ+9IJdXe+uuKjieOULiWHTbA+2JeU7QECQCUS3m6RruirBDYQPoX9THQdaWO6z7q n/uTaTkjmDBv4lEBg0of1gnfAp6n9d3DvQRm0vuCbILF8/wXRi0QSfinoVoAHljOltdgUA +tyAWM5RfuS7hnbGKH7hcN2bS6LuMYoaSXl3A9iU1tCZEptdFvF7+Cz4EfKrDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pybvl1q0DzPw1; Fri, 14 Apr 2023 12:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33ECqpkC074784; Fri, 14 Apr 2023 12:52:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ECqpt1074783; Fri, 14 Apr 2023 12:52:51 GMT (envelope-from git) Date: Fri, 14 Apr 2023 12:52:51 GMT Message-Id: <202304141252.33ECqpt1074783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 4311c5b3db25 - stable/13 - makefs: #define Apple Partition bits List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4311c5b3db25c929a2f3d08a8d74d6a08f5cffc0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4311c5b3db25c929a2f3d08a8d74d6a08f5cffc0 commit 4311c5b3db25c929a2f3d08a8d74d6a08f5cffc0 Author: Ed Maste AuthorDate: 2023-03-30 16:45:18 +0000 Commit: Ed Maste CommitDate: 2023-04-14 12:10:37 +0000 makefs: #define Apple Partition bits NetBSD defines these in sys/bootblock.h, which we don't have. Add local defintions in cd9660_eltorito.c (as OpenBSD did) to reduce diffs between the three makefs implementations. Obtained from: OpenBSD Sponsored by: The FreeBSD Foundation (cherry picked from commit f0bef3d20eb6e28cf66a42c6d34fdfe80a784365) --- usr.sbin/makefs/cd9660/cd9660_eltorito.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c b/usr.sbin/makefs/cd9660/cd9660_eltorito.c index 0a57c91a659e..6d7a32378b64 100644 --- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c +++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c @@ -41,6 +41,14 @@ #include __FBSDID("$FreeBSD$"); +/* + * Partition Status Information from Apple Tech Note 1189 + */ +#define APPLE_PS_VALID 0x00000001 /* Entry is valid */ +#define APPLE_PS_ALLOCATED 0x00000002 /* Entry is allocated */ +#define APPLE_PS_READABLE 0x00000010 /* Entry is readable */ +#define APPLE_PS_WRITABLE 0x00000020 /* Entry is writable */ + #ifdef DEBUG #define ELTORITO_DPRINTF(__x) printf __x #else @@ -574,15 +582,8 @@ cd9660_write_apm_partition_entry(FILE *fd, int idx, int total_partitions, uint32_t apm32, part_status; uint16_t apm16; - /* See Apple Tech Note 1189 for the details about the pmPartStatus - * flags. - * Below the flags which are default: - * - IsValid 0x01 - * - IsAllocated 0x02 - * - IsReadable 0x10 - * - IsWritable 0x20 - */ - part_status = 0x01 | 0x02 | 0x10 | 0x20; + part_status = APPLE_PS_VALID | APPLE_PS_ALLOCATED | APPLE_PS_READABLE | + APPLE_PS_WRITABLE; if (fseeko(fd, (off_t)(idx + 1) * sector_size, SEEK_SET) == -1) err(1, "fseeko");