Received: by 10.223.185.116 with SMTP id b49csp1076153wrg; Fri, 23 Feb 2018 11:29:22 -0800 (PST) X-Google-Smtp-Source: AH8x227iniBqUUV2ZnLCjgexdTxef5ftowPbanz334+bHqdO0opTdPVuwdgA9UNWPLUM+Th9zLkv X-Received: by 2002:a17:902:9a01:: with SMTP id v1-v6mr2587103plp.76.1519414162556; Fri, 23 Feb 2018 11:29:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519414162; cv=none; d=google.com; s=arc-20160816; b=hb3WGMlpTw63l6gH4fK+OoKLQL9YNqecq6FE2JHln4fclDCQgd3npvvKaaiN5T9iMW 92dIB3lcVB7F5xO1LQyTNlbwAclMS1DKwqwJVEAlKz9+adCtsDQeWKMnSScL6qTK5qVT kgWwMqfr/WYHCFeJh8buW8ei1hJnOcpANqgQrCdHqpnHjwdTg34v0FmCLuECLvd8pOuD zVKj3pwkKt5iYKc3+9FhHMgYlnsYqgo0l3Va77H9Dihb87BAG5fMk8dMhBSaBJAZ5o6R Lq+k+3bultNd+CJ5yQWOfC2ekleoQeKxz7epnVbOpUKVxCVPUGjeZkhmum4EB6d7SJbn ULNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=aksAzK3ez7JnA2McNze1Wjrmst1Zh3cf6VS2dlvX/gQ=; b=moA/StNKqKtvPuyJbSUTEHETSftCBhFvUE4+PLg/BD1UW4s9fLuNBmxFWl2C/E8TOK p3F1AbCEm6Xd2gmcNMTFQPEz4mgYTsMI4fU0Vf8LL8BB1PTvGjuM3AfZriPGdbvbfRqj FfD6U9Bk8HNXcL1GOUv3wmJ5yJcKbkZRisU4CCEx6v2Ekvk33xjf8pyJBvFvsTCKbG2N b2FgXHt29SHEyv3GebtIRBjQkfRGk/P1Pb6ba11YJtQ5bLvomYSNxjI0CuMt92Q8yxUi /I9IlAbFNcvbrH5P0CaZABpdv3TGUGuj6h8hLd8nAhVYUcTtBENPkwZjUsTcNvAgfsoQ c6+g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 26si741024pfl.261.2018.02.23.11.29.08; Fri, 23 Feb 2018 11:29:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932453AbeBWT1W (ORCPT + 99 others); Fri, 23 Feb 2018 14:27:22 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:46894 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934871AbeBWSwY (ORCPT ); Fri, 23 Feb 2018 13:52:24 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 5D43AF2D; Fri, 23 Feb 2018 18:52:23 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnaldo Carvalho de Melo , Namhyung Kim , Taeung Song , Jiri Olsa , Sihyeon Jang , kernel-team@lge.com, Sasha Levin Subject: [PATCH 4.14 069/159] perf help: Fix a bug during strstart() conversion Date: Fri, 23 Feb 2018 19:26:17 +0100 Message-Id: <20180223170751.975883725@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Namhyung Kim [ Upstream commit af98f2273fd0af31ce327cd1406b67c7be0b6734 ] The commit 8e99b6d4533c changed prefixcmp() to strstart() but missed to change the return value in some place. It makes perf help print annoying output even for sane config items like below: $ perf help '.root': unsupported man viewer sub key. ... Reported-by: Arnaldo Carvalho de Melo Signed-off-by: Namhyung Kim Tested-by: Arnaldo Carvalho de Melo Tested-by: Taeung Song Cc: Jiri Olsa Cc: Sihyeon Jang Cc: kernel-team@lge.com Link: http://lkml.kernel.org/r/20171114001542.GA16464@sejong Fixes: 8e99b6d4533c ("tools include: Adopt strstarts() from the kernel") Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- tools/perf/builtin-help.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/tools/perf/builtin-help.c +++ b/tools/perf/builtin-help.c @@ -284,7 +284,7 @@ static int perf_help_config(const char * add_man_viewer(value); return 0; } - if (!strstarts(var, "man.")) + if (strstarts(var, "man.")) return add_man_viewer_info(var, value); return 0; @@ -314,7 +314,7 @@ static const char *cmd_to_page(const cha if (!perf_cmd) return "perf"; - else if (!strstarts(perf_cmd, "perf")) + else if (strstarts(perf_cmd, "perf")) return perf_cmd; return asprintf(&s, "perf-%s", perf_cmd) < 0 ? NULL : s;