From nobody Wed Nov 19 11:19:26 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 4dBJsW01ypz6HYLh for ; Wed, 19 Nov 2025 11:19:27 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJsV4wtLz3WGk for ; Wed, 19 Nov 2025 11:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551166; 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=dG7S1gfwSUU2XDEmGbSaKd60+6xrg3dN3EIiWrcm9MM=; b=xW9SFV8+9i7bI24U+pnKB/fjYCAaO1P1u5e8aeU9F9I5MLUvHyMN+UCaSdWFmPE3VhzgkQ AuKOSGPnrZaFBEveDocljoqEO4iVS+zG9RwuaSYEIErBrImaAesl/0niYYqOiJeLFPBRPi vu7mU4dTMvZDBJfgTidmAHRcg+lS9Jh1X4tlsWSdsCo8VE8L5jNqCSxDqEqwyMqHbZthuD We4atUcq/ixR/t+ETtEkiKVGEqxPcl17AtLB900T31pcH9nc4of/IioOohsk1p5Fhbi2oR LL8KU6yONMd/qY/+zTZbFovEg1YeC3ZYUfJqf5fx330nHD8j5RXru4KBgDnLmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551166; 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=dG7S1gfwSUU2XDEmGbSaKd60+6xrg3dN3EIiWrcm9MM=; b=w9iu/EPuaw4VYNZdrJjtT2n8HfwszxJyeUbtVtDzz1KOdPP/3IJn4QELS1cErJxhHQNfpu Qfuu2o+BPS2gaZAHQd9NymCGIzIqVqACLiWpmzJ5jrkg1dnDLcdq+2ljvqTe7I0RAuQlWo fdiCjpAXbPR2Nzj43TCvkIAF494raTTb+Vqax1uEFtVBsv70rNFwDd07Q46FnTe/uvx7Ey yKh7d7uHIkYWTNtaM6HPrFQ7dcYdggnWhMMKiH+R7GVoPSFA3CtxQsLea9W+YH0tSuDh/x AMFlkcYE7akA+9pMCPVGFoV8BcapazPOVQRYRgQ1jE3MFHTU7/Sjy5eWaK5AtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551166; a=rsa-sha256; cv=none; b=kRtGNj+4WmJvedqqXfyUaTj6TlSEFiKvtGwVpG6UVMgxLjXzG60zZq67+XFYsK196d9MfB G7YGAo26y1T81H072zsO1rQA9SEoBzheQ1oIU4Pr4sBzZuyr33pFnnXybHJUfNuUfIuKy6 4uwXouumgsFWbqKo3xdbWRWovkmEqfaaefbM1kaQeRHi7ryfwycJhOZwUcCzqiR71h9Bl6 mpq776n/7f9s/HCWEZLd4sZ9LvJZQoKt9DB8U7ArKWDO52/icxLPhcHMDDEMkYTEI1rYZi Hc6FPU4G87PZCYSgzxWU1IQVtQAlM3yYaCbj+OJPK9dBe4KaqdxcMHUti0ZmIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJsV4Pv3zf41 for ; Wed, 19 Nov 2025 11:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ab0c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:19:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 179fa1d81c73 - stable/14 - quot: Rewrite -n mode input parser 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 179fa1d81c73ab7ef231e17da73f230e4f8ee5a2 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:19:26 +0000 Message-Id: <691da7be.ab0c.7c3d009a@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=179fa1d81c73ab7ef231e17da73f230e4f8ee5a2 commit 179fa1d81c73ab7ef231e17da73f230e4f8ee5a2 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-14 14:28:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 11:19:07 +0000 quot: Rewrite -n mode input parser The existing parser was needlessly complicated and wildly inconsistent in how it handled invalid input. Rewrite using getline() and treat invalid input consistently: silently ignore lines that don't begin with a number, and print a warning if the inode number is out of range. PR: 290992 MFC after: 1 week Reviewed by: obrien Differential Revision: https://reviews.freebsd.org/D53726 (cherry picked from commit fa272a5276865a97b01823fe6546940eaaf1b164) --- usr.sbin/quot/quot.8 | 3 ++- usr.sbin/quot/quot.c | 47 ++++++++++++++++++++++------------------ usr.sbin/quot/tests/quot_test.sh | 19 ++++++++++++++++ 3 files changed, 47 insertions(+), 22 deletions(-) diff --git a/usr.sbin/quot/quot.8 b/usr.sbin/quot/quot.8 index 0338457f6aeb..b777aef7288e 100644 --- a/usr.sbin/quot/quot.8 +++ b/usr.sbin/quot/quot.8 @@ -27,7 +27,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 8, 1994 +.Dd November 13, 2025 .Dt QUOT 8 .Os .Sh NAME @@ -65,6 +65,7 @@ By default, all sizes are reported in 512-byte block counts. Given a list of inodes (plus some optional data on each line) in the standard input, for each file print out the owner (plus the remainder of the input line). +Lines that do not begin with a number are ignored. This is traditionally used in the pipe: .Bd -literal -offset indent diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 5005622987dc..877fccd35f16 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -40,9 +40,10 @@ #include #include +#include #include #include -#include +#include #include #include #include @@ -480,43 +481,47 @@ douser(int fd, struct fs *super, char *name) static void donames(int fd, struct fs *super, char *name) { - int c; - ino_t maxino; - uintmax_t inode; union dinode *dp; + char *end, *line; + size_t cap; + ssize_t len; + intmax_t inode, maxino; maxino = super->fs_ncg * super->fs_ipg - 1; - /* first skip the name of the filesystem */ - while ((c = getchar()) != EOF && (c < '0' || c > '9')) - while ((c = getchar()) != EOF && c != '\n'); - ungetc(c,stdin); - while (scanf("%ju", &inode) == 1) { - if (inode > maxino) { - warnx("illegal inode %ju", inode); - return; + line = NULL; + cap = 0; + while ((len = getline(&line, &cap, stdin)) > 0) { + if (len > 0 && line[len - 1] == '\n') + line[--len] = '\0'; + inode = strtoimax(line, &end, 10); + /* + * Silently ignore lines that do not begin with a number. + * For backward compatibility reasons, we do not require + * the optional comment to be preceded by whitespace. + */ + if (end == line) + continue; + if (inode <= 0 || inode > maxino) { + warnx("invalid inode %jd", inode); + continue; } errno = 0; if ((dp = get_inode(fd,super,inode)) && !isfree(super, dp)) { printf("%s\t",user(DIP(super, dp, di_uid))->name); /* now skip whitespace */ - while ((c = getchar()) == ' ' || c == '\t'); + while (*end == ' ' || *end == '\t') + end++; /* and print out the remainder of the input line */ - while (c != EOF && c != '\n') { - putchar(c); - c = getchar(); - } - putchar('\n'); + printf("%s\n", end); } else { if (errno) { err(1, "%s", name); } /* skip this line */ - while ((c = getchar()) != EOF && c != '\n'); } - if (c == EOF) - break; } + free(line); } static void diff --git a/usr.sbin/quot/tests/quot_test.sh b/usr.sbin/quot/tests/quot_test.sh index 7da9d23ca11f..fd3d6df7b021 100644 --- a/usr.sbin/quot/tests/quot_test.sh +++ b/usr.sbin/quot/tests/quot_test.sh @@ -15,6 +15,8 @@ quot_setup() atf_check mount /dev/$dev "$mnt" echo "/dev/$dev:" >expect printf "%5d\t%5d\t%-8s\n" 8 2 "#0" >>expect + printf "%s\n" "/dev/$dev" >ninput + echo "/dev/$dev:" >nexpect } # Create a directory owned by a given UID @@ -23,12 +25,25 @@ quot_adduid() local uid=$1 atf_check install -d -o $uid -g 0 mnt/$uid printf "%5d\t%5d\t%-8s\n" 4 1 "#$uid" >>expect + ls -di mnt/$uid >>ninput + printf "%s\t%s\n" "#$uid" mnt/$uid >>nexpect } # Perform the tests quot_test() { local dev=$(cat dev) + # Deliberately add invalid lines to our -n input before the + # valid ones to verify that quot does not abort on first + # error. Note that quot deliberately ignores initial lines + # that don't start with a number, and that after encountering + # at least one line that does start with a number, quot would + # previously terminate on encountering one that doesn't (now + # it simply ignores them). This also tests that we don't + # require whitespace between the inode number and the comment. + echo "0zero" >>ninput + echo "invalid" >>ninput + echo "-1minusone" >>ninput # Create inodes owned by a large number of users to exercise # hash collisions and rehashing. The code uses an open hash # table that starts out with only 8 entries and doubles every @@ -49,6 +64,10 @@ quot_test() # that everything gets flushed to the memory disk. atf_check mount -ur /dev/$dev atf_check -o file:expect quot -fkN /dev/$dev + # Test -n option + atf_check -o file:nexpect \ + -e inline:"quot: invalid inode 0\nquot: invalid inode -1\n" \ + quot -Nn /dev/$dev