projects
/
project
/
procd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
inittab: use more robust dev_exist() implementation
[project/procd.git]
/
inittab.c
diff --git
a/inittab.c
b/inittab.c
index
622601a
..
528396e
100644
(file)
--- a/
inittab.c
+++ b/
inittab.c
@@
-65,30
+65,23
@@
static char *ask = "/sbin/askfirst";
static LIST_HEAD(actions);
static LIST_HEAD(actions);
-static int dev_
open
(const char *dev)
+static int dev_
exist
(const char *dev)
{
{
- int fd = -1;
-
- if (dev) {
- if (chdir("/dev"))
- ERROR("failed to change dir to /dev\n");
- fd = open(dev, O_RDWR);
- if (chdir("/"))
- ERROR("failed to change dir to /\n");
- }
+ int dfd, fd;
- return fd;
-}
+ dfd = open("/dev", O_PATH|O_DIRECTORY);
-static int dev_exist(const char *dev)
-{
- int res;
+ if (dfd < 0)
+ return 0;
+
+ fd = openat(dfd, dev, O_RDONLY);
+ close(dfd);
- res = dev_open(dev);
- if (res != -1)
- close(res);
+ if (fd < 0)
+ return 0;
- return (res != -1);
+ close(fd);
+ return 1;
}
static void fork_worker(struct init_action *a)
}
static void fork_worker(struct init_action *a)