From nobody Thu Apr 27 16:52:53 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 4Q6hck09ljz47QNx; Thu, 27 Apr 2023 16:52:54 +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 4Q6hcj6pQzz3m1w; Thu, 27 Apr 2023 16:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682614374; 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=iYLdbBIqpAhMb68Ieazr+wqWpM65k3oIN9u/GZR9HiA=; b=U2uehXqMIPqwVPVqVgNBepfvbyWyix8TFGpXXmw/Z7yriAIcK7bmHttJ7zZ4w4r4HSjPH1 pbjl17dO/ssT9vu7+p6dUz0DQfwF4RmY4/C+fPSln/zqgLrrRshKruv35vqWCj038LA0ZJ c8osq+AfEOQsdJQyKLQLv5bXDG3Y/z6+tBeDxNuIoHBKzm9o0RXT1St/1gPdySp4P6JgX9 lMNo+sDFCETgUeN/FOnAfpPLeJPCICBGzjH7ZvzJCTbIEdZ32aI502szPyFUkKtKk17M4T zkHFN+9uhIP8Q1sqcLW3gmXYF8s3BStA6I8aAQhord8+kNMdc8JXXCHp84NuGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682614374; 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=iYLdbBIqpAhMb68Ieazr+wqWpM65k3oIN9u/GZR9HiA=; b=qxHQ7xcqJLIzLSBDNcTpLgBwqgufhfHA5FDTavvXES0EY2BeLRdc5v8T7ua9i0DuzWWuuy kfsGhxnY3UVVqYUxcZHKzeSJVOfBOd37lFAkg7Kx/j73Bm3Y2bcVhsU1gJFSWdcM5/qjL5 ObH2HOVTdVqDnPr8s0fSWGg/THLYbRGRs2snDfeGEOcW39ru3eVm5EUXBnkKKLpycZFZdt SQcZC7JcNRORTNxZlKLODnCgBN93n3eE/F5V4CBTBBrJZSXG7YxqlbJFofxS6hAmlBatq+ GwZnjOBVUpr+5psASSa/fhXau1IYKX3A6nYk6ehoupwTTwfFMpkkZnMKKZibfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682614374; a=rsa-sha256; cv=none; b=aclWZgiyG3lI1U2XEd2hFiVc7W30utZTTniwJcoPEjm758Pg2QME0MkV9iAA/OQQwHm/jQ 0MTDoFUzHlYirg+/rBhZF0uy5Do4nsS06x2Z7WzuL9Nt9KazmqId8NreUenmEQOn+YTtJ3 83h9ZJLFr7J7Dc9M7FLrlnSFCKqKtMZFwSHwup3BcbrWjzP6Us519mvhlry3GID/+Os/Zq MUVQRsGojwtEvFKcLSS4XsYzPRtTDqZ3qAQqxytm+36zcxXlwuk1QWOz3qAoKr05/bnDMr JCvzm7RZ0Ez6EvYGjp5qgUZndX4AE2fFIMP+WpD9IoOCDTwgHlMr51XtXiXQ8g== 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 4Q6hcj5sW4zQXM; Thu, 27 Apr 2023 16:52:53 +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 33RGqrTd030227; Thu, 27 Apr 2023 16:52:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RGqrCQ030226; Thu, 27 Apr 2023 16:52:53 GMT (envelope-from git) Date: Thu, 27 Apr 2023 16:52:53 GMT Message-Id: <202304271652.33RGqrCQ030226@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: 0001406ae235 - stable/13 - makefs: set cd9660 Rock Ridge timestamps for . and .. 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: 0001406ae235412745951ecf5832c688ee6079da Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0001406ae235412745951ecf5832c688ee6079da commit 0001406ae235412745951ecf5832c688ee6079da Author: Ed Maste AuthorDate: 2023-04-18 13:57:29 +0000 Commit: Ed Maste CommitDate: 2023-04-27 16:45:37 +0000 makefs: set cd9660 Rock Ridge timestamps for . and .. DOT and DOTDOT entries have special handling, and previously only Rock Ridge PX (POSIX attributes) entries were attached. Add TF (timestamp) entries as well. PR: 203531 Reported by: Thomas Schmitt Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39662 (cherry picked from commit dd9059b3e9a1711d54c1d511a2cbb23e6e23f556) --- usr.sbin/makefs/cd9660/iso9660_rrip.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.c b/usr.sbin/makefs/cd9660/iso9660_rrip.c index 1107688aa21e..e1b8fc993a3a 100644 --- a/usr.sbin/makefs/cd9660/iso9660_rrip.c +++ b/usr.sbin/makefs/cd9660/iso9660_rrip.c @@ -394,6 +394,12 @@ cd9660_rrip_initialize_node(iso9660_disk *diskStructure, cd9660node *node, SUSP_ENTRY_RRIP_PX, "PX", SUSP_LOC_ENTRY); cd9660node_rrip_px(current, parent->node); TAILQ_INSERT_TAIL(&node->head, current, rr_ll); + + /* TF - timestamp */ + current = cd9660node_susp_create_node(SUSP_TYPE_RRIP, + SUSP_ENTRY_RRIP_TF, "TF", SUSP_LOC_ENTRY); + cd9660node_rrip_tf(current, parent->node); + TAILQ_INSERT_TAIL(&node->head, current, rr_ll); } } else if (node->type & CD9660_TYPE_DOTDOT) { if (grandparent != NULL && grandparent->node != NULL && @@ -403,6 +409,12 @@ cd9660_rrip_initialize_node(iso9660_disk *diskStructure, cd9660node *node, SUSP_ENTRY_RRIP_PX, "PX", SUSP_LOC_ENTRY); cd9660node_rrip_px(current, grandparent->node); TAILQ_INSERT_TAIL(&node->head, current, rr_ll); + + /* TF - timestamp */ + current = cd9660node_susp_create_node(SUSP_TYPE_RRIP, + SUSP_ENTRY_RRIP_TF, "TF", SUSP_LOC_ENTRY); + cd9660node_rrip_tf(current, grandparent->node); + TAILQ_INSERT_TAIL(&node->head, current, rr_ll); } /* Handle PL */ if (parent != NULL && parent->rr_real_parent != NULL) {