shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-29 06:50:16 +03:00
Code

util.c: simplify rm_rf_children_dangerous

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-06-18 12:43:02 -04:00
parent 4a336a69fd
commit dede0e335d
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/shared/util.c
View File

@ -2671,7 +2671,7 @@ finish:
}
int rm_rf_children_dangerous(int fd, bool only_dirs, bool honour_sticky, struct stat *root_dev) {
DIR *d;
_cleanup_closedir_ DIR *d = NULL;
int ret = 0;
assert(fd >= 0);
@ -2694,15 +2694,12 @@ int rm_rf_children_dangerous(int fd, bool only_dirs, bool honour_sticky, struct
errno = 0;
de = readdir(d);
if (!de && errno != 0) {
if (ret == 0)
if (!de) {
if (errno != 0 && ret == 0)
ret = -errno;
break;
return ret;
}
if (!de)
break;
if (streq(de->d_name, ".") || streq(de->d_name, ".."))
continue;
@ -2758,10 +2755,6 @@ int rm_rf_children_dangerous(int fd, bool only_dirs, bool honour_sticky, struct
}
}
}
closedir(d);
return ret;
}
_pure_ static int is_temporary_fs(struct statfs *s) {