clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-06 13:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

sysv-generator: always use fstatat() if we can

Browse Source 
(cherry picked from commit 805e5dda0a)
This commit is contained in:
Lennart Poettering
2015-01-16 09:40:08 -05:00
committed by Zbigniew Jędrzejewski-Szmek
parent 7bc3b3007e
commit 46c3a085f0
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sysv-generator/sysv-generator.c
+15 -10
View File
@@ -727,28 +727,34 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) {
}
while ((de = readdir(d))) {
SysvStub *service;
struct stat st;
_cleanup_free_ char *fpath = NULL, *name = NULL;
_cleanup_free_ SysvStub *service = NULL;
struct stat st;
int r;
if (ignore_file(de->d_name))
continue;
fpath = strjoin(*path, "/", de->d_name, NULL);
if (!fpath)
return log_oom();
if (stat(fpath, &st) < 0)
if (fstatat(dirfd(d), de->d_name, &st, 0) < 0) {
log_warning("stat() failed on %s/%s: %s",
*path, de->d_name, strerror(-r));
continue;
}
if (!(st.st_mode & S_IXUSR))
continue;
if (!S_ISREG(st.st_mode))
continue;
name = sysv_translate_name(de->d_name);
if (!name)
return log_oom();
fpath = strjoin(*path, "/", de->d_name, NULL);
if (!fpath)
return log_oom();
if (hashmap_contains(all_services, name))
continue;
@@ -761,12 +767,11 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) {
service->path = fpath;
r = hashmap_put(all_services, service->name, service);
if (r < 0) {
free(service);
if (r < 0)
return log_oom();
}
name = fpath = NULL;
service = NULL;
}
}