Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936131AbcKNIWJ (ORCPT ); Mon, 14 Nov 2016 03:22:09 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:36557 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932343AbcKNIWA (ORCPT ); Mon, 14 Nov 2016 03:22:00 -0500 From: Taeung Song To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, Jiri Olsa , Namhyung Kim , Ingo Molnar , Peter Zijlstra , Wang Nan , Taeung Song Subject: [PATCH v2 4/7] perf config: Parse arguments before setting functionality Date: Mon, 14 Nov 2016 17:21:39 +0900 Message-Id: <1479111702-5989-5-git-send-email-treeze.taeung@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479111702-5989-1-git-send-email-treeze.taeung@gmail.com> References: <1479111702-5989-1-git-send-email-treeze.taeung@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2291 Lines: 91 For upcoming setting functionality, parse both config variables and values of arguments. If setting the sort order of report functionality to srcline, # perf config report.sort-order=srcline we can parse config variables and values with parse_config_arg() Cc: Namhyung Kim Cc: Jiri Olsa Cc: Wang Nan Signed-off-by: Taeung Song --- tools/perf/builtin-config.c | 43 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c index 02def73..098d2df 100644 --- a/tools/perf/builtin-config.c +++ b/tools/perf/builtin-config.c @@ -82,10 +82,10 @@ static int show_config(struct perf_config_set *set) return 0; } -static int parse_config_arg(const char *arg, char **var) +static int parse_config_arg(const char *arg, char **var, char **value) { const char *last_dot; - char *key; + char *key, *val; key = strdup(arg); if (!key) { @@ -107,7 +107,37 @@ static int parse_config_arg(const char *arg, char **var) goto out_err; } - *var = key; + val = strchr(key, '='); + if (val == NULL) { + *var = key; + return 0; + } else if (!strcmp(val, "=")) { + pr_err("The config variable does not contain a value: %s\n", arg); + goto out_err; + } else { + char *v, *ptr; + + *value = strdup(val + 1); /* excluding a first character '=' */ + if (*value == NULL) { + pr_err("%s: strdup failed\n", __func__); + goto out_err; + } + + ptr = key; + v = strsep(&key, "="); + if (v[0] == '\0') { + pr_err("invalid config variable: %s\n", arg); + goto out_err; + } + + *var = strdup(v); + free(ptr); + if (*var == NULL) { + pr_err("%s: strdup failed\n", __func__); + return -1; + } + } + return 0; out_err: free(key); @@ -169,11 +199,14 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused) for (i = 0; argv[i]; i++) { char *var = NULL; + char *value = NULL; - if (parse_config_arg(argv[i], &var) < 0) + if (parse_config_arg(argv[i], &var, &value) < 0) break; - ret = show_spec_config(set, var); + if (value == NULL) + ret = show_spec_config(set, var); free(var); + free(value); } } -- 2.7.4