From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 2E06C1FAF4 for ; Tue, 15 Nov 2022 19:33:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1668540822; bh=zNSeUsAewbQNVWrBQY3tMEN2SqxhKu/p/5Y0BwrU87c=; h=From:To:Subject:Date:In-Reply-To:References:From; b=jthpQO/wVVrxMmvLBenPBEeflM6jD6HNV0qHC5QXk/07QU/iKRvfo5VbSE+S3SGBc tJAbze9OwEQckwta3WHW1xzDrpWkyz0aISsImSC/zy/0el3eV7bSIW4XtccsFKRuG/ BWuB1ZAonk/Djc/hGnR62vwOmEdHdK0KJ1Lx59tU= From: Eric Wong To: mwrap-perl@80x24.org Subject: [PATCH 5/6] mwrap-perl: use grep and fix regexp Date: Tue, 15 Nov 2022 19:33:40 +0000 Message-Id: <20221115193341.3948245-6-e@80x24.org> In-Reply-To: <20221115193341.3948245-1-e@80x24.org> References: <20221115193341.3948245-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: There's no need to pay O(n) cost to create a short-lived hash table and the original regexp was obviously wrong :x --- script/mwrap-perl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/script/mwrap-perl b/script/mwrap-perl index 4350fcc..78e71e3 100644 --- a/script/mwrap-perl +++ b/script/mwrap-perl @@ -8,10 +8,9 @@ defined($so) or die 'Mwrap.so not loaded'; my $cur = $ENV{LD_PRELOAD}; if (defined $cur) { my @cur = split(/[: \t]+/, $cur); - my %cur = map { $_ => 1 } @cur; - if (!$cur{$so}) { + if (!grep(/\A\Q$so\E\z/, @cur)) { # drop old redundant versions - my @keep = grep(!m!/Mwrap\.so\$!, @cur); + my @keep = grep(!m!/Mwrap\.so$!, @cur); $ENV{LD_PRELOAD} = join(':', $so, @keep); } } else {