Commit 05a48659 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo

perf tools: Add depth checking to rm_rf

Adding depth argument to rm_rf (and renaming it to rm_rf_depth) to
specify the depth we will go searching for files to remove.

It will be used to specify single depth for perf.data directory removal
in following patch.
Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/20190224190656.30163-2-jolsa@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2d4f2799
...@@ -117,7 +117,12 @@ int mkdir_p(char *path, mode_t mode) ...@@ -117,7 +117,12 @@ int mkdir_p(char *path, mode_t mode)
return (stat(path, &st) && mkdir(path, mode)) ? -1 : 0; return (stat(path, &st) && mkdir(path, mode)) ? -1 : 0;
} }
int rm_rf(const char *path) /*
* The depth specify how deep the removal will go.
* 0 - will remove only files under the 'path' directory
* 1 .. x - will dive in x-level deep under the 'path' directory
*/
static int rm_rf_depth(const char *path, int depth)
{ {
DIR *dir; DIR *dir;
int ret; int ret;
...@@ -155,7 +160,7 @@ int rm_rf(const char *path) ...@@ -155,7 +160,7 @@ int rm_rf(const char *path)
} }
if (S_ISDIR(statbuf.st_mode)) if (S_ISDIR(statbuf.st_mode))
ret = rm_rf(namebuf); ret = depth ? rm_rf_depth(namebuf, depth - 1) : 0;
else else
ret = unlink(namebuf); ret = unlink(namebuf);
} }
...@@ -167,6 +172,11 @@ int rm_rf(const char *path) ...@@ -167,6 +172,11 @@ int rm_rf(const char *path)
return rmdir(path); return rmdir(path);
} }
int rm_rf(const char *path)
{
return rm_rf_depth(path, INT_MAX);
}
/* A filter which removes dot files */ /* A filter which removes dot files */
bool lsdir_no_dot_filter(const char *name __maybe_unused, struct dirent *d) bool lsdir_no_dot_filter(const char *name __maybe_unused, struct dirent *d)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment