From nobody Mon Jan 24 18:30:02 2022 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 16EFE1977778; Mon, 24 Jan 2022 18:30:03 +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 4JjJSB5X6Qz4ncK; Mon, 24 Jan 2022 18:30:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643049002; 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=FUo3ocfjOu0UDqQTEvzUFBtelvRShp9r8lf02awDPjI=; b=Tt1jN7kGKOJ6RvvQvEHVbBEk7ss81RfrRvkobveCOQfbls5TKVegMD6B14YdLhGXBu0nYb VVd0kUjFVt8jtQoi/TGOESgDWV5QOIxYTkV1MPsuI8BkiaGVENXYI9VXdvhPWz3foG+t6d HdKpoBXZ2XoVPDiXDulPVzoVLx5GQjVFhyyoVZZuLKSVfnKAMKEiFIETk5KgWx9M5v9/EG pZOlrItYT6pz4ngGl/hOEDAH++tmPd+tZDjpOPCTcgBVyBb7AigiCocfeJAVrfSM6AD/aa 4OWkgUUz9FuwSqRuRfEQmRCJxwaF8W5oaW7wT4F0eMQz2njjyg4vqesup9TsQw== 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 7EB591B013; Mon, 24 Jan 2022 18:30:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20OIU2Zp070533; Mon, 24 Jan 2022 18:30:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20OIU2KW070531; Mon, 24 Jan 2022 18:30:02 GMT (envelope-from git) Date: Mon, 24 Jan 2022 18:30:02 GMT Message-Id: <202201241830.20OIU2KW070531@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: 0a88bd81b766 - main - awk: print the last two characters for bigram - not the second word 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: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a88bd81b76675288a0e62f5687c0c6dea710bc2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643049002; 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=FUo3ocfjOu0UDqQTEvzUFBtelvRShp9r8lf02awDPjI=; b=RG7MYnh5hSoczbm77mSRcB27rpFchr1Xrb2IJqWhvbdDhmi0sDGPvF8YtjT4jlOagelUfC r/yS0br7evWMCfv/BXNOsMMJCD7GtFJekVTONrDjsZu5mK2M1cT9YRRYhE30oxCzXuNFpd 1C+LL1Imf+Gx3sKGYNeoSjXFuOy6KLU+P36cRC/cFazZh892ZpO7BN56xz9yVJPBOg+NL8 9XzYRLw+PQLQf0eH/DkWgC0h6XaauJ8c4WsB9SKaUIADgp5DD6XDy+fkyDQEvTPiT3Ytr0 DZ9X0jfrLS4sQVFBgcyj+7nVVsFaTU1vZiknhlweG4QAL/5ca8pNzt2ysfV0vA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643049002; a=rsa-sha256; cv=none; b=cO9vrtPeRnxPVxQSusbOqL8ab7X5UodDDEiyFxzjzlY81kvEpCSL5O1yY2m4MApPWhp9XR mfX0qz4d+tInqUXMROnfhNXnsFo6/K/HZu626mdqe7jSrH0qDMXDZNn6SxkM8MQ6b4LhbF 6QDf0MIHbfzGBKjEYye0P3RPihalqrHE/tkb40R1RqtqVmRhx7BETK83/KwWaEM4p1FIaK lZ6epc6jkatEbz5NIBmKBFc3qnEgs6Gr7YzXTX/DvZ3oJn3KzFb67HYSGG9h4tm/SCNpHD pgGMJzU2Qjr4e1eEzu58IJdrtFU9ZoomQk00/xh61kigIC0wYB5dCbSIJnNR9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=0a88bd81b76675288a0e62f5687c0c6dea710bc2 commit 0a88bd81b76675288a0e62f5687c0c6dea710bc2 Author: Wolfram Schneider AuthorDate: 2022-01-24 18:06:07 +0000 Commit: Wolfram Schneider CommitDate: 2022-01-24 18:27:43 +0000 awk: print the last two characters for bigram - not the second word A bigram may contain a space character, and we always need two characters. --- usr.bin/locate/locate/concatdb.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.bin/locate/locate/concatdb.sh b/usr.bin/locate/locate/concatdb.sh index 28eb2d921c16..d9832cfbef5a 100644 --- a/usr.bin/locate/locate/concatdb.sh +++ b/usr.bin/locate/locate/concatdb.sh @@ -68,7 +68,8 @@ trap 'rm -f $bigrams' 0 1 2 3 5 10 15 for db do $locate -d $db / -done | $bigram | $sort -nr | awk 'NR <= 128 { printf $2 }' > $bigrams +done | $bigram | $sort -nr | \ + awk 'NR <= 128 && /^[ \t]*[1-9][0-9]*[ \t]+..$/ { printf("%s", substr($0, length($0)-1, 2)) }' > $bigrams for db do