chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
condition: internalize condition test functions
[elogind.git]
/
src
/
shared
/
base-filesystem.c
diff --git
a/src/shared/base-filesystem.c
b/src/shared/base-filesystem.c
index addd26ca39d1980b455c328ed27c37c7d16c480a..4c65a495d3596a6732b0499ad0739aeee57322fa 100644
(file)
--- a/
src/shared/base-filesystem.c
+++ b/
src/shared/base-filesystem.c
@@
-58,16
+58,17
@@
int base_filesystem_create(const char *root) {
int r;
fd = open(root, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
int r;
fd = open(root, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
- if (fd < 0)
+ if (fd < 0) {
+ log_error("Failed to open root file system: %m");
return -errno;
return -errno;
+ }
for (i = 0; i < ELEMENTSOF(table); i ++) {
for (i = 0; i < ELEMENTSOF(table); i ++) {
- if (table[i].target) {
- const char *target = NULL;
- const char *s;
+ if (faccessat(fd, table[i].dir, F_OK, AT_SYMLINK_NOFOLLOW) >= 0)
+ continue;
- if (faccessat(fd, table[i].dir, F_OK, AT_SYMLINK_NOFOLLOW) >= 0)
-
continue
;
+ if (table[i].target) {
+
const char *target = NULL, *s
;
/* check if one of the targets exists */
NULSTR_FOREACH(s, table[i].target) {
/* check if one of the targets exists */
NULSTR_FOREACH(s, table[i].target) {