diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-04-18 10:33:48 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-04-19 12:01:53 -0400 |
commit | 9a3993d408bc61b839de1a2c6c783477a04860bb (patch) | |
tree | fb0a02b5e3dae58ac3a1d871b69b7df2aa91b279 /tools/perf/util/path.c | |
parent | b0742e90f5ab904aa835350c28bcec48e9109379 (diff) |
perf tools: Move path related functions to util/path.h
Disentangling util.h header mess a bit more.
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: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-aj6je8ly377i4upedmjzdsq6@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/path.c')
-rw-r--r-- | tools/perf/util/path.c | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/tools/perf/util/path.c b/tools/perf/util/path.c index 7c7630be5a89..50ec3bc87a60 100644 --- a/tools/perf/util/path.c +++ b/tools/perf/util/path.c | |||
@@ -11,8 +11,13 @@ | |||
11 | * which is what it's designed for. | 11 | * which is what it's designed for. |
12 | */ | 12 | */ |
13 | #include "cache.h" | 13 | #include "cache.h" |
14 | #include "util.h" | 14 | #include "path.h" |
15 | #include <linux/kernel.h> | ||
15 | #include <limits.h> | 16 | #include <limits.h> |
17 | #include <stdio.h> | ||
18 | #include <sys/types.h> | ||
19 | #include <sys/stat.h> | ||
20 | #include <unistd.h> | ||
16 | 21 | ||
17 | static char bad_path[] = "/bad-path/"; | 22 | static char bad_path[] = "/bad-path/"; |
18 | /* | 23 | /* |
@@ -50,3 +55,24 @@ char *mkpath(const char *fmt, ...) | |||
50 | return bad_path; | 55 | return bad_path; |
51 | return cleanup_path(pathname); | 56 | return cleanup_path(pathname); |
52 | } | 57 | } |
58 | |||
59 | int path__join(char *bf, size_t size, const char *path1, const char *path2) | ||
60 | { | ||
61 | return scnprintf(bf, size, "%s%s%s", path1, path1[0] ? "/" : "", path2); | ||
62 | } | ||
63 | |||
64 | int path__join3(char *bf, size_t size, const char *path1, const char *path2, const char *path3) | ||
65 | { | ||
66 | return scnprintf(bf, size, "%s%s%s%s%s", path1, path1[0] ? "/" : "", | ||
67 | path2, path2[0] ? "/" : "", path3); | ||
68 | } | ||
69 | |||
70 | bool is_regular_file(const char *file) | ||
71 | { | ||
72 | struct stat st; | ||
73 | |||
74 | if (stat(file, &st)) | ||
75 | return false; | ||
76 | |||
77 | return S_ISREG(st.st_mode); | ||
78 | } | ||