From nobody Thu Aug 01 16:46:52 2024 X-Original-To: dev-commits-src-all@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 4WZZcX564Rz5T32F; Thu, 01 Aug 2024 16:46:52 +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 4WZZcX48r0z4nJc; Thu, 1 Aug 2024 16:46:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722530812; 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=n+/vAr0wWjpFHUSQtqipWFB4FQXreiZolpZdB+LsHvM=; b=gA2RZRIfFpjj4/gnM0jRmlZMcPnSlAMOZPh6/F12RleQHArlFbIXQRwODKQQHAUdcLoroH rmE0IbuqNTyOW71vHOm7dogUhctZcAQHGEjNIvGsLndaMm8S0UzSdCZx24c3O2Tn5kYKiO nqXV6/NuRVqh87Z5vPu2aQgdK9aYy0b+rE6+4vNz/Bcqgif/MqXhrdDsKC1l0TiOlg0/LN H5jj1MYLV5hj1yCY/lifwJyy0i6FobRrd+mmAI7XkDsIsJbwKNGGBJsTg5ylOBjGq5nIoS afzRK5VStTALaZBPtX4NnHmqwDPzfKfb+bEgxZauz27K2UzjWPmX92YsgwE/ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722530812; a=rsa-sha256; cv=none; b=Ae4I2QvKMH1g7IymhZzjFqoGkMw2wWzGQbEZWIu61Gj0fy3UUVDa2tpmizcC2lWCNZi9xW WqwrBDRMOAaqOjDIIojI3qjn27dbL9fnnxkCr+To1cHaFRyQ82mOmc2bOit+4lAJv7Fq2h aSBx5gv8zPdNCkNo541muWN5hMfgH7f7y3tSiOSOhUkcUOiDIMwewTmNYirB7y2dkwpDuq nmp0OFNZjVNrEPXkhkQdHSYQfA0M8yeAM2g/HXPYSACFxckz57yCc6L65OFbbLTqTpiqbY sAwcOV6gtRjObXyUbCIKluwOeSM50flQhGSDnYXMGGS6jty4Vu5COYd+of2mBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722530812; 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=n+/vAr0wWjpFHUSQtqipWFB4FQXreiZolpZdB+LsHvM=; b=Q2E78QRuOHNd49RdzVkeV9y4v6L3iFw9fM8oRMW51hbu8Id9Rf+aAYoLQFOpnsUaESWoSn UuTIzuUCteRfv7gOJDO7v+meS5KZE/D/NUb8v8yEYvGuuPk11CjGiMO7DUGLnr6NTV5xBt WfpwxQGuIF6oWpKiLLtT3v1IvY0rERm9Gm36PhMuTVtto/T1+NVOuOaNutZdZrYHdjXZQ1 gDfCbF5UrCVyqqm7TvwD+5Dq+z3ZLO3dfe0uJsvOOcK6pl2A/r806Wt0Nacu0hBhUoCy/8 wl8RAXFEvkmTYUXBHsHdjXHXn4wNMuD8gdkjkHYImYRnkzqF/ZsY0H5I+vicCA== 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 4WZZcX3f5SzsSn; Thu, 1 Aug 2024 16:46:52 +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 471GkqL9046463; Thu, 1 Aug 2024 16:46:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471GkqPB046460; Thu, 1 Aug 2024 16:46:52 GMT (envelope-from git) Date: Thu, 1 Aug 2024 16:46:52 GMT Message-Id: <202408011646.471GkqPB046460@gitrepo.freebsd.org> 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=B8rgrav?= Subject: git: 600504767528 - stable/13 - ls: Make -, apply to -s as well as -l. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 600504767528cce6b0e4f9eb44e9d4cec856abc8 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=600504767528cce6b0e4f9eb44e9d4cec856abc8 commit 600504767528cce6b0e4f9eb44e9d4cec856abc8 Author: Dag-Erling Smørgrav AuthorDate: 2024-07-24 20:06:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-08-01 16:42:33 +0000 ls: Make -, apply to -s as well as -l. While here, remove a bogus comment about a gcc bug. The bug was in ls, which used an incorrect format string, and in libc, which accepted it. MFC after: 1 week Reviewed by: brooks Differential Revision: https://reviews.freebsd.org/D46067 (cherry picked from commit 647d4a8cafd2c9b291cab388191bc7fcfe12a66b) --- bin/ls/ls.1 | 4 +++- bin/ls/ls.c | 3 ++- bin/ls/print.c | 14 ++++++-------- bin/ls/tests/ls_tests.sh | 16 ++++++++++++++++ 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/bin/ls/ls.1 b/bin/ls/ls.1 index e8b9835e6038..ccb9087dd764 100644 --- a/bin/ls/ls.1 +++ b/bin/ls/ls.1 @@ -31,7 +31,7 @@ .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 .\" -.Dd October 31, 2022 +.Dd July 22, 2024 .Dt LS 1 .Os .Sh NAME @@ -439,6 +439,8 @@ output is not to a terminal. .It Fl , (Comma) When the .Fl l +or +.Fl s option is set, print file sizes grouped and separated by thousands using the non-monetary separator returned by .Xr localeconv 3 , diff --git a/bin/ls/ls.c b/bin/ls/ls.c index a04e455e8b06..6338e8c19581 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -968,7 +968,8 @@ label_out: d.maxlen = maxlen; if (needstats) { d.btotal = btotal; - d.s_block = snprintf(NULL, 0, "%lu", howmany(maxblock, blocksize)); + d.s_block = snprintf(NULL, 0, f_thousands ? "%'ld" : "%ld", + howmany(maxblock, blocksize)); d.s_flags = maxflags; d.s_label = maxlabelstr; d.s_group = maxgroup; diff --git a/bin/ls/print.c b/bin/ls/print.c index 3d6feff1fdb7..e67596c198ba 100644 --- a/bin/ls/print.c +++ b/bin/ls/print.c @@ -227,7 +227,7 @@ printlong(const DISPLAY *dp) (void)printf("%*ju ", dp->s_inode, (uintmax_t)sp->st_ino); if (f_size) - (void)printf("%*jd ", + (void)printf(f_thousands ? "%'*jd " : "%*jd ", dp->s_block, howmany(sp->st_blocks, blocksize)); strmode(sp->st_mode, buf); aclmode(buf, p); @@ -404,7 +404,7 @@ printaname(const FTSENT *p, u_long inodefield, u_long sizefield) chcnt += printf("%*ju ", (int)inodefield, (uintmax_t)sp->st_ino); if (f_size) - chcnt += printf("%*jd ", + chcnt += printf(f_thousands ? "%'*jd " : "%*jd ", (int)sizefield, howmany(sp->st_blocks, blocksize)); #ifdef COLORLS if (f_color) @@ -757,12 +757,10 @@ printsize(size_t width, off_t bytes) humanize_number(buf, sizeof(buf), (int64_t)bytes, "", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL); (void)printf("%*s ", (u_int)width, buf); - } else if (f_thousands) { /* with commas */ - /* This format assignment needed to work round gcc bug. */ - const char *format = "%*j'd "; - (void)printf(format, (u_int)width, bytes); - } else - (void)printf("%*jd ", (u_int)width, bytes); + } else { + (void)printf(f_thousands ? "%'*jd " : "%*jd ", + (u_int)width, bytes); + } } /* diff --git a/bin/ls/tests/ls_tests.sh b/bin/ls/tests/ls_tests.sh index 682682691b7a..780376b9de3c 100755 --- a/bin/ls/tests/ls_tests.sh +++ b/bin/ls/tests/ls_tests.sh @@ -799,6 +799,21 @@ s_flag_body() done } +atf_test_case scomma_flag +scomma_flag_head() +{ + atf_set "descr" "Verify that -s, prints out the size with ',' delimiters" +} + +scomma_flag_body() +{ + export LC_ALL=en_US.UTF-8 + atf_check -e ignore dd if=/dev/urandom of=file bs=65536 count=64 + blocks=$(stat -f "%b" file) + cblocks=$(printf "%'d" $blocks) + atf_check -e empty -o match:"$cblocks[[:space:]]+file" ls -s, file +} + atf_test_case t_flag t_flag_head() { @@ -971,6 +986,7 @@ atf_init_test_cases() atf_add_test_case q_flag_and_w_flag atf_add_test_case r_flag atf_add_test_case s_flag + atf_add_test_case scomma_flag atf_add_test_case t_flag atf_add_test_case u_flag atf_add_test_case v_flag