From nobody Mon Feb 19 16:51:27 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 4TdpTW5Gxpz5C9tK; Mon, 19 Feb 2024 16:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdpTW4qWmz4rhF; Mon, 19 Feb 2024 16:51:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361487; 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=Dx9j0Zygs+0wrbH2xjiuNNwR80raQ4s1NOvb5Q+iqZ8=; b=eV+UGlfJeBZK1dW7jaJqAYSHsZuOrJvtx1UVw2TMjJPNcmTSd03yRYytAantb1hK2vxVP3 NQpUtfPXSOMj7fHwArTT9NW1pzVfmypvgJt/vD6+f3g/qcbvBxeQ0a5zkfyK2zaEwkpNyI ZJrAzvzRrYTYN/H2rzfLvQDl+ZQho85rT5kpCR8rFvxUofLeTjw6J0kUZ6TLy/7+VPEopU sflqLiGhWe/7j45OgH3ItFo1el8dKMioGPGQqXBosX+tXnA71chIoGKvNbbHE6An3yGooD eSIHyx8EO5XidMrm+AsAgydOxy5YMevRpxhO89OEKy+3Iq1VxrPDzH13GPWKNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361487; 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=Dx9j0Zygs+0wrbH2xjiuNNwR80raQ4s1NOvb5Q+iqZ8=; b=gZeGJY8ZvwMUInbsZeZR9BDpm4erMTlIj2f5DwXL69N88v/8UMUKYKbXq35B7fbeAjXy2F y50uo/AeAqwS5YEwNq5VNgLBcnoUDvI0NN3yVEmZWnx/mkP6THGdvsBF2QvXDBgak0aMdv Tm7tIAwps33phPSRgH7Mv25xnOOne1ePlQwmZ0dqRUBbGJs4hCwD6VuhdKB5IzhVcre2nC bs0L//EvQIBshcbHzqf9ipGc/Dgm64pkxoq90t1sLA6mZHjTE4SWWPzzM0h/ehebfk5Ryj evrt/iaB6bIWW4XJUmVqHiFBlkYfuyOwihkZQmiNWBliCOH5z0opBa4tdeagVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708361487; a=rsa-sha256; cv=none; b=whsFTNbB9MBDudHJuWmFf4Xx/Jgn+OB5u8YBcmQLC0ra7MO248Uap7vpUiPGP6fLpNLK0Z aPnOR1lnSLYzTWTEyhA9eqspKBRYuQsHocyrgTShfDa9jxWObE9m5NC7nPaSeuu5TxY5Ei TOacX9yDdtgzxiERwAW3sfe5lPDG3yTTy4XbqT53Og6nA6uIyTEQVCJaqs5RNW5pFaNRrI tlB+pzsvELBffo/Ft/dKT3wlBehHfYwK/I8kl6Di6VCe81OufYOt2YoD3ynV1+iDvkXUJs /t8/hRBhEBkIHKdDmUAS0ImGMEYMx+j/SBSPTaN9pjKfeu80WACSRF0QzoAnEg== 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 4TdpTW3vSGzjQX; Mon, 19 Feb 2024 16:51:27 +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 41JGpRq8010134; Mon, 19 Feb 2024 16:51:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JGpRb1010131; Mon, 19 Feb 2024 16:51:27 GMT (envelope-from git) Date: Mon, 19 Feb 2024 16:51:27 GMT Message-Id: <202402191651.41JGpRb1010131@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: ef75877fc2d9 - main - 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef75877fc2d93199aab2b509089136c433af1f20 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ef75877fc2d93199aab2b509089136c433af1f20 commit ef75877fc2d93199aab2b509089136c433af1f20 Author: Warner Losh AuthorDate: 2024-02-19 16:48:05 +0000 Commit: Warner Losh CommitDate: 2024-02-19 16:50:04 +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 --- 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 7ebcc5383863..b5e3578f27bb 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -327,7 +327,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 ',': @@ -566,6 +566,7 @@ main(int argc, char *argv[]) blocksize /= 512; } } + /* Select a sort function. */ if (f_reversesort) { if (f_sizesort)