From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 4CC5B4E33; Thu, 04 Sep 2025 23:47:57 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 4B7E24D19; Thu, 04 Sep 2025 23:47:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mail-yb1-xb2c.google.com (mail-yb1-xb2c.google.com [IPv6:2607:f8b0:4864:20::b2c]) by atuin.qyliss.net (Postfix) with ESMTPS id B10A94C84 for ; Thu, 04 Sep 2025 23:47:47 +0000 (UTC) Received: by mail-yb1-xb2c.google.com with SMTP id 3f1490d57ef6-e98b64d7000so1556083276.3 for ; Thu, 04 Sep 2025 16:47:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757029666; x=1757634466; darn=spectrum-os.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ktsQHBpqIiX6nLMVMK4LrMenBv/X3BUPbouFh4wravo=; b=kN4nojFzRdBwhuriKBrHsxdoj6PwqIAc+1zluK12RENK6DyYqYMq9qNcXPhtoGFRsa MMQ9S01dmVeVQMnyreUY+ELAO6CpdIFQ11/YIasC1oOOBKfz5mAQxmGEoZExEz9SBKvU mAzjiGj++F64n03yLRcFWRLbg+y5YBlm3VZZhfFxmnr7FG+j/0y/gsFsIwPCuda9iCpK n7mra/R/XGqhT75MuD/QqtIZbmg8iDDP64ouz2JVLQu8xr49kF2GjT8qStjv9Ytndan0 FioB5MByrNHHCdlIw1MqzTqoVJwqVUVo/97d4dYUC1WVh2C27km29rxbkxLtPn5mL+iN 3tkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757029666; x=1757634466; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ktsQHBpqIiX6nLMVMK4LrMenBv/X3BUPbouFh4wravo=; b=w0q/VRH8Lkd9SnkxWPYCGTesm3K8s9HJxQoEVs/FfDcG/AJNMblLAT8jz10FUqH+Y2 J9OBUdjW8MMgeKTa9Q9+UCNjon2Dkr9y3AtzacXXM6SBsNmKR1lt6OxH6uQRopQrgz/h dd9q/MqIaUVU+FAC4nKrn2GU7NUJ7G7M1m2LLvTmD75eFeFkSukka7bBsL8ssAj3hRbt R9Wp7GMrlEkLRyMNxvICSZ/IvkDG3+kQi/06fzcRwaJf3XJ3906ecudAgMbNlx4QTc3r Z4HWL76UKW6Jm/OUwCogkugVZx/UwZt+wPtdnspI3Ut+QIhQvhvty5v8bJN9dPJavYUn EaiQ== X-Gm-Message-State: AOJu0YyVlqQvxwCPKSR4+RkaTlderjPB0PDIcEzjZXmk3esNiS84f77K wb156JKbmZACZnATls15zpMZoDmOZp5xats6us2H7NZeVJ9NJCS1BUOQ4X0kCjQx X-Gm-Gg: ASbGnctOyDi3X0u1BlUzhlbEzunM0RSNhfyRBxddylY+z/fTida1k1k9wi8qY5dpdn3 VWZi4Hm9pXtMQ1QjFCLcA3aDyU5dCNMWdgX2OmGATuYuJdauzuDrCGGCwHa4FwvEHrEKiGzVtnN F8ANyIScr3SAf5vf5RhZdlWNwzpQQMJRx1MRTpikXRyNPuDnS8JacfkxUFmNppFPBWxxGTnURXn tmfqGArwXmWP6w/HNNaIH67JZmOi8tM2/YfyLGSt8blKVOpMSS6C4/YvhB/1b5hLnE2WkHd2RU0 /VuY01bnqFM6YTZEE++ZgCdMW60jVDF0PU9o+VD1OIPFVOsmZZmQQFcPWCBVMsloJuQNg+utA24 HNCoBPlvvE5HUjPW6vCpNErkmhuI0Pz3w/dP9JZzFwolvk68+rewyEuwgPqhujqnMYEOZxMVQLD 0bpxG/VSORNoBgaaQzFyBaoP9OK2AWiO+mJF9ivld9bstxcKswzjtIVA== X-Google-Smtp-Source: AGHT+IGhDLonicBNayrNcU4Et07VX8h9QI4XC6wM0vZHN2vQ3FSTBL+4G2YZ6eRzeE9oK6BNXG2wAw== X-Received: by 2002:a05:690e:2507:b0:5f3:c350:7bad with SMTP id 956f58d0204a3-601774c1445mr3242544d50.22.1757029666401; Thu, 04 Sep 2025 16:47:46 -0700 (PDT) Received: from localhost.localdomain (h96-60-249-169.cncrtn.broadband.dynamic.tds.net. [96.60.249.169]) by smtp.gmail.com with UTF8SMTPSA id 00721157ae682-723a855c00esm24842377b3.59.2025.09.04.16.47.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Sep 2025 16:47:46 -0700 (PDT) From: Demi Marie Obenour Date: Thu, 04 Sep 2025 17:26:27 -0400 Subject: [PATCH 05/20] scripts/make-erofs.sh: Avoid unneeded calls to dirname MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250904-systemd-v1-5-2a63b790a913@gmail.com> References: <20250904-systemd-v1-0-2a63b790a913@gmail.com> In-Reply-To: <20250904-systemd-v1-0-2a63b790a913@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1757021182; l=941; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=HF1mHyZGhbPXIB4qYMsu2SpTADLfoIqy6+B9VBovuNE=; b=T3lNUKbs6B0ntt4APuFP7E0ylCAKpOR9q/zkiZ1ILDGBAxI8lqNTeiOb3fpuWKl1LzMwuOhyC auJPXQyGZo4Da6+PWuRq5vF17A+xyipzHWIqU6hz27Q4tOlx+trPyA5 X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: SUKSQGGAPPEP2JMYQLF7OEGG26Y5R2DD X-Message-ID-Hash: SUKSQGGAPPEP2JMYQLF7OEGG26Y5R2DD X-MailFrom: demiobenour@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Demi Marie Obenour , Alyssa Ross X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Use builtin string manipulation instead. Signed-off-by: Demi Marie Obenour --- scripts/make-erofs.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/scripts/make-erofs.sh b/scripts/make-erofs.sh index cf942972910c76e1835dc5b0084c2d04bf084a9d..93cb3245f409b24c24be05e9307a1b2e12c867fe 100755 --- a/scripts/make-erofs.sh +++ b/scripts/make-erofs.sh @@ -78,7 +78,19 @@ while read -r arg1; do check_path "$arg1" "$arg2" - parent=$(dirname "$arg2") + # The below simple version of dirname(1) can only handle + # a subset of all paths, but this subset includes all of + # the paths that check_path doesn't reject. + case $arg2 in + (*/*) + # Create the parent directory if it doesn't already + # exist. + parent=${arg2%/*} + ;; + (*) + parent=. + ;; + esac mkdir -p -- "$root/$parent" cp -RT -- "$arg1" "$root/$arg2" done -- 2.51.0