From nobody Wed Jan 24 10:05:58 2024 X-Original-To: dev-commits-src-main@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 4TKfjg0ncdz57x71; Wed, 24 Jan 2024 10:05:59 +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 4TKfjg07hbz4634; Wed, 24 Jan 2024 10:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706090759; 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=ZxNvih30DzHq7wfgbfjzE4jLee5zGTDLmfzxcl9m11A=; b=J8tGLEP5OQTBa27eH1zx+7ikjBdLTM3d4H2QyIKvQ+A5VAdxYGQ7lfM8sS2a8xDFqsNucH Q1OnIUJwkwSB+u15htsjvHgdoPnLJiolPdaY7JlzJQQWMMx9bPss+WIVizDTflYq2K9PfP 5B4n6Mfczkpkh+m3mQswM4+AlDnpfA5T5XE+OYnnCoitBiu4teK55qwgIUJz11wDIBJdbd zjqaqTUj0V9/7jUU/wf40YNUwwkiUJ6wkExr+H41dMpj2veGYScnLIwlS3txO2smOCLQ2W YSAFzrHktTkBqSxzA6A/7PtqYZnsz5ru09V85Up1xsDVDwUZjN5hwuypag3AdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706090759; 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=ZxNvih30DzHq7wfgbfjzE4jLee5zGTDLmfzxcl9m11A=; b=he6bkg91LPfN7rRKBTSgDND5aTyNCtLwaqpplYWGLnmIdgbVoXmV4IDx6Xt9Pyeond4qr0 8kzEcvSFhUo+WXp2GsoDgrUxYTY24zyf+K5UXNhN8hehGj+tW/Z9+Y2myJ5hVT92CQ98oa 0MutGq5dE37LLxhmvd7UXc7qRZIKzfS/Ccepp4vh3h8aCQa+2WAM+clEBAfu2BlykHPT68 1U58zBmXj5tKoEwO90hn5KYowV9KPxKuJ+o0AgyDGCVyjXYCbz9kvdMtTNuWhaLd57UEFM EueiU4LJ4Fp1M99aO4JCjaLUQLi5G8PE3Ul4/vNW70i5E59cTf5vq+GGjoYwvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706090759; a=rsa-sha256; cv=none; b=A60jb6EulZVWt9kl7RyKGvdYoxuQYGvakQF/y3Zphlt1MF0U42AWhvDOmpO98/dQTJTnp2 VRBakN4OEFg1sMX6JlNpM/o05bs13pOOjqxeH4Ov1Dgnyz4mtiStjVHkcgEO93zIU9AsTQ 1vV4ev72PxeTmFeWxBFYX6cd0OXZa62mbLPgSGTFI1gwxpltrOOysBCfJXbnCymcklRa9w h81ERifn2EgSgLooBA+wW3uPNssZaQydKOulQgKy6qcI/uD+/+vYXRQB0KU3FdM8BgBcNQ LDHGvKREiWXb4HzMWISuNC3kC0RawAsqmrq7vI2hCWoQdgA18/vZK8gDVfczYQ== 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 4TKfjf63Rlz18Qd; Wed, 24 Jan 2024 10:05:58 +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 40OA5w5r029145; Wed, 24 Jan 2024 10:05:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OA5wob029142; Wed, 24 Jan 2024 10:05:58 GMT (envelope-from git) Date: Wed, 24 Jan 2024 10:05:58 GMT Message-Id: <202401241005.40OA5wob029142@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tijl Coosemans Subject: git: 95bf75895ddc - main - join(1): Fix ordering in case of missing fields List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 95bf75895ddcf17402b1f69dce26cb821c922476 Auto-Submitted: auto-generated The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/src/commit/?id=95bf75895ddcf17402b1f69dce26cb821c922476 commit 95bf75895ddcf17402b1f69dce26cb821c922476 Author: Tijl Coosemans AuthorDate: 2024-01-22 10:35:31 +0000 Commit: Tijl Coosemans CommitDate: 2024-01-24 09:58: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 MFC after: 1 week --- 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 09263ea16c22..b1be8cd81690 100644 --- a/usr.bin/join/join.c +++ b/usr.bin/join/join.c @@ -380,9 +380,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])); }