niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

perf tools: Fix rm_rf() to handle non-regular files correctly

Browse source 
Fix rm_rf() to handle non-regular files correctly. This fix includes two
changes;

 - Fix to use lstat(3) instead of stat(3) since if the target
   file is a symbolic link, rm_rf() should unlink the symbolic
   link itself, not the file which pointed by the symlink.
 - Fix to unlink non-regular files (except for directory),
   including symlink.

Even though the first one fixes to stat symlink itself, without second
fix, it still failed because the symlink is not a regular file.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Hemant Kumar <hemant@linux.vnet.ibm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20160608092911.3116.90929.stgit@devbox
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Masami Hiramatsu 2016-06-08 18:29:11 +09:00 • committed by Arnaldo Carvalho de Melo
parent 826424cc91
commit 2a1ef032cf
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tools/perf/util/util.c
View file

@ -97,20 +97,17 @@ int rm_rf(char *path)
scnprintf(namebuf, sizeof(namebuf), "%s/%s", scnprintf(namebuf, sizeof(namebuf), "%s/%s",
path, d->d_name); path, d->d_name);
ret = stat(namebuf, &statbuf); /* We have to check symbolic link itself */
ret = lstat(namebuf, &statbuf);
if (ret < 0) { if (ret < 0) {
pr_debug("stat failed: %s\n", namebuf); pr_debug("stat failed: %s\n", namebuf);
break; break;
} }
if (S_ISREG(statbuf.st_mode)) if (S_ISDIR(statbuf.st_mode))
ret = unlink(namebuf);
else if (S_ISDIR(statbuf.st_mode))
ret = rm_rf(namebuf); ret = rm_rf(namebuf);
else { else
pr_debug("unknown file: %s\n", namebuf); ret = unlink(namebuf);
ret = -1;
}
} }
closedir(dir); closedir(dir);