From nobody Wed Jan 31 09:20:03 2024 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 4TPxMS247Zz57M9m; Wed, 31 Jan 2024 09:20:04 +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 4TPxMS1WDjz47tV; Wed, 31 Jan 2024 09:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706692804; 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=W6P0o4fSH3L7antwhm6YY3qxeE5BXRkUU0/ySytLG3o=; b=N3ET0WUTKKMICHlhRGNElsmAHSTTQM1PfFbiq9pSVfNeN/AaDkOmkgGIzKoDbIEMDNhnhk GYv9OVL2nqMdgXC1pdqXkN4/xAy4GQOWu6NyVYnenYtYqds3k00a8SOMIgxke8X8gX0kK+ l4FVRWgkz/2oaLGXaqkHqb/S50bL4Ka4lAUi3k+V54f6Nr6c0oF3Yk2aiCVnlz94V6HDvi Drizp+yymdyPgj3u0s7+vJYAR/CN3mN5lRoed4ByyoWqaBHpLnzDtbCD7P/tbJZhiGdn0K 3w+jii9hXnP8Be4kAfX3sN5Uv2cHAhJjApjR9hcmCSxaVMt4zK8/gEQDX5IhSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706692804; 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=W6P0o4fSH3L7antwhm6YY3qxeE5BXRkUU0/ySytLG3o=; b=BUBzdVdmaXHCJAQ0z8gheQXP1oc012ba99P1WTggoxIZCARhiWQj5otDdgOCzczc6hNNqm iXGyS4nPz5LtzYVmuav1l27CZ9QhvqLMwVEvCNIsQdqnpzi1pKXy7R8TDz9OBoVCYVps74 LNKNZB2LwSYS8tFnJi6d0Btj3I2knZBxJ9kGo52kyTu6dtgo1vTwDXXa/aBijpZe4XNtFR Dw1aEYFTPHWevQbgPLi3IMxxbWb3QJwmZQZpFyn41ULVy0VFdwogL6c05Ro988YcqbqKd/ esfodBhqmB6hIeLt8G6Nsr47X6eanSDiB/pCK/ZiBXkrS//wrBwic4HQ33vUfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706692804; a=rsa-sha256; cv=none; b=rEFC1gzsGqSLWfAyrhHVOCi6FPteYhBljj9MezNmmOlT7ptzqAp5V1+OysPq0+lYir9g81 9/PkWbgyp3ufvC+rJ/H7F0IRRKzzc07BHz6gedhkMi6E4KL4Y/X27xpYnFUlxZU04mjALz pREVUKLOLlR/ZtSBampqSRH9+KBWMIBxVtqvJYynxG0XhwhRcXKNnQ7eb3k6FZCn+p0JCm Taj4BYfjVwqWYBjlS0iuQZq0/7D3WiOhFYN65LFBxT53gHRL8Q4a06yWLnH1VxNbRJ8vdv mOhonLjahACMMrPK2TmLzkEzcFaEotgJyAlhjFa2h7+NIBAbQXBhgBGuhhIp7Q== 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 4TPxMS0SkTz1C1q; Wed, 31 Jan 2024 09:20:04 +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 40V9K3KM025158; Wed, 31 Jan 2024 09:20:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40V9K3Kw025153; Wed, 31 Jan 2024 09:20:03 GMT (envelope-from git) Date: Wed, 31 Jan 2024 09:20:03 GMT Message-Id: <202401310920.40V9K3Kw025153@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Tijl Coosemans Subject: git: 085ab2c143eb - stable/13 - join(1): Fix ordering in case of missing fields 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tijl X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 085ab2c143eb5192ea18b8dd52bd8fa69c9f2d06 Auto-Submitted: auto-generated The branch stable/13 has been updated by tijl: URL: https://cgit.FreeBSD.org/src/commit/?id=085ab2c143eb5192ea18b8dd52bd8fa69c9f2d06 commit 085ab2c143eb5192ea18b8dd52bd8fa69c9f2d06 Author: Tijl Coosemans AuthorDate: 2024-01-22 10:35:31 +0000 Commit: Tijl Coosemans CommitDate: 2024-01-31 09:19:00 +0000 join(1): Fix ordering in case of missing fields The comparison function had the ordering reversed causing join(1) to miss some matching lines. PR: 232405 Submitted by: Martijn van Duren (cherry picked from commit 95bf75895ddcf17402b1f69dce26cb821c922476) --- usr.bin/join/join.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c index 35b327c89ee4..c4bd42728fa7 100644 --- a/usr.bin/join/join.c +++ b/usr.bin/join/join.c @@ -392,9 +392,9 @@ static int cmp(LINE *lp1, u_long fieldno1, LINE *lp2, u_long fieldno2) { if (lp1->fieldcnt <= fieldno1) - return (lp2->fieldcnt <= fieldno2 ? 0 : 1); + return (lp2->fieldcnt <= fieldno2 ? 0 : -1); if (lp2->fieldcnt <= fieldno2) - return (-1); + return (1); return (mbscoll(lp1->fields[fieldno1], lp2->fields[fieldno2])); }