[PATCH 01/20] perf tools: Add depth checking to rm_rf

From: Jiri Olsa
Date: Sun Feb 24 2019 - 14:07:11 EST


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.

Link: http://lkml.kernel.org/n/tip-sylld4txjlqjc18nzhitaokc@xxxxxxxxxxxxxx
Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
---
tools/perf/util/util.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index 3ee410fc047a..bcf436892155 100644
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -117,7 +117,12 @@ int mkdir_p(char *path, mode_t mode)
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;
int ret;
@@ -155,7 +160,7 @@ int rm_rf(const char *path)
}

if (S_ISDIR(statbuf.st_mode))
- ret = rm_rf(namebuf);
+ ret = depth ? rm_rf_depth(namebuf, depth - 1) : 0;
else
ret = unlink(namebuf);
}
@@ -167,6 +172,11 @@ int rm_rf(const char *path)
return rmdir(path);
}

+int rm_rf(const char *path)
+{
+ return rm_rf_depth(path, INT_MAX);
+}
+
/* A filter which removes dot files */
bool lsdir_no_dot_filter(const char *name __maybe_unused, struct dirent *d)
{
--
2.17.2