Commit afc45cf5 authored Jan 27, 2017 by Arnaldo Carvalho de Melo

perf config: Do not consider an error not to have any perfconfig file

While propagating the errors from perf_config(), which were being
completely ignored, everything stopped working for people without a
~/.perfconfig file, because the perf_config_set__init() was considering
an error not to have a .perfconfig file, duh, fix it by checking the
errno after the failed stat() call.

It should also not return an error when it says it is ignoring the file,
and also a empty file should not return an error either.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Taeung Song <treeze.taeung@gmail.com>
Cc: Wang Nan <wangnan0@huawei.com>
Fixes: 8beeb00f ("perf config: Use new perf_config_set__init() to initialize config set")
Link: http://lkml.kernel.org/n/tip-ygpbab3apbs6l8wr97xedwks@git.kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent e572d088

tools/perf/util/config.c

+8 −6

Original line number	Diff line number	Diff line
		@@ -646,8 +646,13 @@ static int perf_config_set__init(struct perf_config_set *set)
		goto out;
		}

		if (stat(user_config, &st) < 0)
		if (stat(user_config, &st) < 0) {
		if (errno == ENOENT)
		ret = 0;
		goto out_free;
		}

		ret = 0;

		if (st.st_uid && (st.st_uid != geteuid())) {
		warning("File %s not owned by current user or root, "
		@@ -655,11 +660,8 @@ static int perf_config_set__init(struct perf_config_set *set)
		goto out_free;
		}

		if (!st.st_size)
		goto out_free;

		if (st.st_size)
		ret = perf_config_from_file(collect_config, user_config, set);

		out_free:
		free(user_config);
		}

Admin message