From nobody Fri Jul 25 22:25:17 2025 X-Original-To: dev-commits-src-main@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 4bpj9n66vwz62R7s; Fri, 25 Jul 2025 22:25:17 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bpj9n4p8Kz4FJd; Fri, 25 Jul 2025 22:25:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753482317; 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=Vw+SxXqXZhlBgJDHXxkcXIkBCfR9QtXEAGVHybRVUcA=; b=hB9fspSocnRZfeoCaef4iWcG8R0K+nTOHs4eoX3fYfSKKsWF99ooOocJzXSLcjOhHerxU/ G46J9StORV4m4PfGXEEGqhfSBIi8e1tesDuw2yhisWE/VhYtAMboSg9G/PB/L9ff75upWg g2PH/RjatE7R5l0uydOSh5pJQA74PdRXLhs6sjJNeLFMlEHzUcQAVxSGZkirH4vMh80Ezs Or2miPs5m2548gXbSvMAuZdpMW34K7OvfQUir0KlQJFubOQBFL6KhtftfpOkPj7F5Ji2GD utLjbsoIa15i1wFXAbSaK1JFTKbHmdYpEtQIrkDeIRdxhvqLyqk1QsYjBIE1eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753482317; 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=Vw+SxXqXZhlBgJDHXxkcXIkBCfR9QtXEAGVHybRVUcA=; b=NjNMeEy1YxJsUI662FfM3m63sH9nDgj0JEm968eTKjIrJqllE36opW6oSHubiTUnOlLoLg Y9MK2EspNh+UZeFQ3q70YfBWF6Ib/oYAGdRY5J+4xiZSh44gnUAvyPvpwmZYc+gpUDH8yq JgNQ+B3/GtYQGezD691/a++0rFlIuYAkoswRp+JWFez+4v03LcGDxDXH1xSBzQ/Nr+B6Rn nYC7thYH51/OmMs0clzvX0lTG24gb5WYz6apEXow07e2wa77dq6kRfSZaiirLL8vpDhVua 2VcmWvFZiMqqJdijUysoW6WelsBwnZkrl28WQUTNJTowx9ql4QO/TLOGNbWO6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753482317; a=rsa-sha256; cv=none; b=If1yhKCFdyMHyRk4AkHZDAqIkT7t17xfiw8ZDTpCkwnMxmQcmjNLhMYjGlbFKy7pFRnxyt GZkcPyaSCeY/+SN+roWV1PYIT3BLag6YnvAVQ8IOHRSL7rGoYjRWexNpZ91CuL+q8FJ2KL gueRhLoGkve+H+olx/sY/IpS7AWU11uC09VTZHOtOIJkzEZWpdMd2ECgg6B3vsgCHrH6TT iFC6ttWBl3nO4R2QDFpVNbhkM1+uf6zWaqoOwwVPPkFxxf3VEScwjszh7bAf7fJNgsVPeZ k551L4IjvML+tkFitGCifWl0wJCqJSUQKOTbKjC5zZOKioLm2R7GwOcjPQzvxg== 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 4bpj9n4GlLz12qt; Fri, 25 Jul 2025 22:25:17 +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 56PMPHfS058978; Fri, 25 Jul 2025 22:25:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56PMPHkN058975; Fri, 25 Jul 2025 22:25:17 GMT (envelope-from git) Date: Fri, 25 Jul 2025 22:25:17 GMT Message-Id: <202507252225.56PMPHkN058975@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fd186cd16eaf - main - find: Fix items from the review I missed for printf List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd186cd16eafabfa28aa95175d8df97cbf08b0c7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fd186cd16eafabfa28aa95175d8df97cbf08b0c7 commit fd186cd16eafabfa28aa95175d8df97cbf08b0c7 Author: Warner Losh AuthorDate: 2025-07-25 22:24:49 +0000 Commit: Warner Losh CommitDate: 2025-07-25 22:24:49 +0000 find: Fix items from the review I missed for printf Minor fixes I missed in a review comment until after the commit. Pointy-hat-to: imp Fixes: 7b9c912c41f4 Sponsored by: Netflix --- usr.bin/find/function.c | 5 ++++- usr.bin/find/printf.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c index ac7fe4dd4e98..11455b395022 100644 --- a/usr.bin/find/function.c +++ b/usr.bin/find/function.c @@ -1450,7 +1450,10 @@ c_printf(OPTION *option, char ***argvp) PLAN *new; isoutput = 1; - ftsoptions &= ~FTS_NOSTAT; + /* + * XXX We could scan the format looking for stat-dependent formats, and + * turn off the stat if there's none: `%p`/`%f`/`%h` don't need a stat. + */ new = palloc(option); new->c_data = nextarg(option, argvp); diff --git a/usr.bin/find/printf.c b/usr.bin/find/printf.c index 643f04b9cef5..6ca018d58f34 100644 --- a/usr.bin/find/printf.c +++ b/usr.bin/find/printf.c @@ -279,7 +279,7 @@ do_printf(PLAN *plan, FTSENT *entry, FILE *fout) case 'c': /* status change time ctime */ fp_ctime(fp, sb->st_ctime); break; - case 'C': /* statuc change time with next char strftime format */ + case 'C': /* status change time with next char strftime format */ fp_strftime(fp, sb->st_ctime, *fmt++); break; case 't': /* modification change time ctime */