From nobody Wed Jan 15 02:35:39 2025 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 4YXqqH5hXJz5kmJC; Wed, 15 Jan 2025 02:35:39 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YXqqH4D0tz3gxv; Wed, 15 Jan 2025 02:35:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736908539; 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=iSGvd0G71uvEupleuYBeqnZQQLaJGk49CCEW2QnR+0I=; b=xNNmafMDrlQsIT/7a1Wi2uaw7sCDauyqLq1RfFhABAk1Xy3IBrZfuS/v+AU5Wd2ivRxySV HEAj78+tHSiV96HQJ4bA5N0dSBcJbGukzAlG2PK2nQ5KW21KC62dXxSWkXUt/3pjAZluk1 1DJeAvHLc63hkvDGjgSXQMgJ1Q6Hv7NgWWsixSqMgU2c83BFWeORq9rPE9ZSx+tMOImhpJ cRUgU3Nx0TtPs64HZyzXrXl1iTmys8RxrbqQ35IKsNLKjIwdMsOfY4DJ315qMMDZDJFlZq uo7hZIJUxVouuzmpU2vgelHzSCkipfDJJDkxt4aaqK3tEXZrJ0Kh+5EVDvZjQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736908539; 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=iSGvd0G71uvEupleuYBeqnZQQLaJGk49CCEW2QnR+0I=; b=NkjLEdzPW8CV9qi0f6C5DdSDnOdpGbberD/E8e8oCC1x2HyWgt3llud0KaS2YFaDvHX8jJ a8m67IjhVzqkZp862Jts8VaVCf5arrgJKCXu1UVUPs+Q5z8DNhAmNolZIVMHRGiJT3KIBA trP7uPCz0ATk7HSiLIabAAuiu+H4uysKytH79bsgaB76vfPwAufLQVW0yStBcZVcozARg6 jCtigI1XKCV1UpOQbw0sAqXY4qnzAVwmI8qqvFr02dmv3SrYU/gwcwqC8DW7xPU5ai6lsK gi1kyWYnPzcCQsqnTrQfhi3/0uT+cXvuKKqCRvyt0+IDiyL9V2ilUb/qc9sjdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736908539; a=rsa-sha256; cv=none; b=MfcDgSblE5ud9L9OSgr24OjvjTQOUFhdfs9JW4ZRS4cM7AKVA4MnoeEKDWbkV9/eW8gRE0 tr1Fa5/mqlKlqaLqQHTHzzbhYj/e/prYwXBdXHMf2rKjH6n4keZn5ioF64CRquSIfDzhHS nx0AiahgIjPgsHC0R656Yw6iTAyCiFTxfR1xfQzDMGVDUEHr8n8LZ3pW9K/Azq60++N5aM bHCTDj2oUmi+przLYf1ZJuCEtnrwFoJ6/99V4rnICf4+jRt9udjJjJIWsPvgCD6IFZeacL 2B8cmMkzAmzPWD27LzPcAc1uHlepkmqpfHTvHUSa76zkAU/tXSkU5Djqth54Bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YXqqH3VppzCCN; Wed, 15 Jan 2025 02:35:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50F2Zdl1047354; Wed, 15 Jan 2025 02:35:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50F2Zd1B047351; Wed, 15 Jan 2025 02:35:39 GMT (envelope-from git) Date: Wed, 15 Jan 2025 02:35:39 GMT Message-Id: <202501150235.50F2Zd1B047351@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: f81286d19230 - stable/13 - makefs: Exit with error if writing cd image fails 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: f81286d192304bba45697ec157c73a8e44ff57eb Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f81286d192304bba45697ec157c73a8e44ff57eb commit f81286d192304bba45697ec157c73a8e44ff57eb Author: Ed Maste AuthorDate: 2024-12-23 15:54:32 +0000 Commit: Ed Maste CommitDate: 2025-01-15 02:35:28 +0000 makefs: Exit with error if writing cd image fails Obtained from: OpenBSD c8f48d9b1ea9 Sponsored by: The FreeBSD Foundation (cherry picked from commit b45f84cc6213854ead00a4bfc7973332eda65676) (cherry picked from commit afb7a85e52c323aca544f0d235b67123bf87d342) --- usr.sbin/makefs/cd9660.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 654285057378..17fab3a8cfdf 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -467,7 +467,7 @@ cd9660_makefs(const char *image, const char *dir, fsnode *root, fsinfo_t *fsopts) { int64_t startoffset; - int numDirectories; + int ret, numDirectories; uint64_t pathTableSectors; int64_t firstAvailableSector; int64_t totalSpace; @@ -613,7 +613,7 @@ cd9660_makefs(const char *image, const char *dir, fsnode *root, if (diskStructure->include_padding_areas) diskStructure->totalSectors += 150; - cd9660_write_image(diskStructure, image); + ret = cd9660_write_image(diskStructure, image); if (diskStructure->verbose_level > 1) { debug_print_volume_descriptor_information(diskStructure); @@ -625,7 +625,10 @@ cd9660_makefs(const char *image, const char *dir, fsnode *root, cd9660_free_structure(real_root); if (diskStructure->verbose_level > 0) - printf("%s: done\n", __func__); + printf("%s: done ret = %d\n", __func__, ret); + + if (ret == 0) /* cd9660_write_image() failed */ + exit(1); } /* Generic function pointer - implement later */