From nobody Wed Feb 28 12:49:06 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 4TlDgk68fmz5DFlk; Wed, 28 Feb 2024 12:49:06 +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 4TlDgk5Qy5z4Wg2; Wed, 28 Feb 2024 12:49:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709124546; 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=LvbF6Sof0585vc65+UQcRgb7/tyaJtED6HvKVBkHz1Q=; b=CixNlky+ZKsYi3EiUc7pbnjqnLsE+4VDZPpTrZPIVxtSyl0pSjP0X7OvmmNOxX0rg74ZWl 6NOhFJebwd0ywzwm2RrfU74k+/tzc5eN9Pvj0xRnVExKnG1Yjjkui3oVvamKjQ6FiTEiU3 RngGY9V2HRtL6aHc4slj/F+czGjPAVe5GUXh/FE0lCVNmZxxy5L24opXm8hcdhk3uJVWzi dISOCS9DKxrL7Ybfv6Zsc6oef/f6U7wh+4EOgljVCVCvI4uRmEaWYJEfoxDa91MKvIoSoK rCnE8uDe2nS2KXCM9ntU3YKhehJcWul3hODgriRfPhI/x4emDJ0OuPc08TAutw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709124546; a=rsa-sha256; cv=none; b=hg+IpK45gOHOZreiHZPC2EF/IpA9X1/7iPVqbiMpUfgMphIKyJDWJdl9NvP0aDp9LBrSfC NNGw2M4fgLQNf/7bo0vuAxT6ZvBCVN1zwOGlMHw4HI67S0mjVX42lXETvGH6IGO9NZdlUw YjcyQijjQjzJIw/8IA9n5gvDhZzSskoUDwrPYWzfl5j0Hg3gp+ah9aizElF1zPGbg4bqwJ Kx9TbMdbwIJ5trv6CBBlfLuRtPR51msfm1hJsqRpwDtdLge5Gwnr2b/RKaZ4GVewk99O6r ZW/idbhus7ZeymACaMhsECM8w1CJ3BMlLlJo1f+PQ1it2oBPYQxKWX9ENgSJug== 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=1709124546; 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=LvbF6Sof0585vc65+UQcRgb7/tyaJtED6HvKVBkHz1Q=; b=ruC/a+siT2BDqx4wwyQpjE+4Tr6Ua7YNm5M9KjWKBhcmCQ86gwawnORTfTNDT+4F0zf9Th dg3jvdVHV68AGIjYW8dorR3BaBaXAcPNFf5sUy6tpWxMNpPz0uTXPgTx7CoSP8ZWat3Kz5 5HYyEqKwTmGy4SRaVZbmUjYOk1LVOZBF+YMbYcR989B2IUD3ZPOE1wmQmmxJhsDf8zOh0j rpMbh58zliwCqs6Fct67JOmu76HO0p0ecIxI39BK90C/FEKRRz+kl74Vtl7zAH2LoyR6L+ Td8Biw1VWIgHcyPHeqF4zR74WP9cVHntVCifFZqCNdSUgn1DtJAjAEwsB5j9QQ== 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 4TlDgk4SKZzxTp; Wed, 28 Feb 2024 12:49:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41SCn6BO012803; Wed, 28 Feb 2024 12:49:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41SCn6pf012800; Wed, 28 Feb 2024 12:49:06 GMT (envelope-from git) Date: Wed, 28 Feb 2024 12:49:06 GMT Message-Id: <202402281249.41SCn6pf012800@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: fa399b889f70 - stable/14 - ls: Fix -v and associated test 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fa399b889f70dafb429e548919b0677a619677ef Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fa399b889f70dafb429e548919b0677a619677ef commit fa399b889f70dafb429e548919b0677a619677ef Author: Warner Losh AuthorDate: 2024-02-19 16:48:05 +0000 Commit: Gordon Bergling CommitDate: 2024-02-28 12:47:33 +0000 ls: Fix -v and associated test The cleanup of d854370fa86b7 had a cut and paste error (so f_verssort was set to 1 and then to 0 rather thame f_timesort being set to 0). Fixes: d854370fa86b7 Sponsored by: Netflix (cherry picked from commit ef75877fc2d93199aab2b509089136c433af1f20) --- bin/ls/ls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/ls/ls.c b/bin/ls/ls.c index d358ece2d89e..59ff12547787 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -339,7 +339,7 @@ main(int argc, char *argv[]) case 'v': f_verssort = 1; f_sizesort = 0; - f_verssort = 0; + f_timesort = 0; break; /* Other flags. Please keep alphabetic. */ case ',': @@ -578,6 +578,7 @@ main(int argc, char *argv[]) blocksize /= 512; } } + /* Select a sort function. */ if (f_reversesort) { if (f_sizesort)