projects
/
project
/
procd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
trace: add missing limits.h include
[project/procd.git]
/
inittab.c
diff --git
a/inittab.c
b/inittab.c
index
622601a
..
55554b9
100644
(file)
--- a/
inittab.c
+++ b/
inittab.c
@@
-12,6
+12,7
@@
* GNU General Public License for more details.
*/
* GNU General Public License for more details.
*/
+#define _GNU_SOURCE
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
@@
-30,6
+31,10
@@
#include "procd.h"
#include "rcS.h"
#include "procd.h"
#include "rcS.h"
+#ifndef O_PATH
+#define O_PATH 010000000
+#endif
+
#define TAG_ID 0
#define TAG_RUNLVL 1
#define TAG_ACTION 2
#define TAG_ID 0
#define TAG_RUNLVL 1
#define TAG_ACTION 2
@@
-65,30
+70,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)
@@
-106,7
+104,7
@@
static void fork_worker(struct init_action *a)
tcsetpgrp(STDIN_FILENO, p);
execvp(a->argv[0], a->argv);
tcsetpgrp(STDIN_FILENO, p);
execvp(a->argv[0], a->argv);
- ERROR("Failed to execute %s\n", a->argv[0]);
+ ERROR("Failed to execute %s
: %m
\n", a->argv[0]);
exit(-1);
}
exit(-1);
}
@@
-230,6
+228,14
@@
static struct init_handler handlers[] = {
.name = "respawn",
.cb = rcrespawn,
.multi = 1,
.name = "respawn",
.cb = rcrespawn,
.multi = 1,
+ }, {
+ .name = "askconsolelate",
+ .cb = askconsole,
+ .multi = 1,
+ }, {
+ .name = "respawnlate",
+ .cb = rcrespawn,
+ .multi = 1,
}
};
}
};
@@
-272,14
+278,13
@@
void procd_inittab(void)
char *line;
if (!fp) {
char *line;
if (!fp) {
- ERROR("Failed to open %s\n", tab);
+ ERROR("Failed to open %s
: %m
\n", tab);
return;
}
regcomp(&pat_inittab, "([a-zA-Z0-9]*):([a-zA-Z0-9]*):([a-zA-Z0-9]*):(.*)", REG_EXTENDED);
line = malloc(LINE_LEN);
return;
}
regcomp(&pat_inittab, "([a-zA-Z0-9]*):([a-zA-Z0-9]*):([a-zA-Z0-9]*):(.*)", REG_EXTENDED);
line = malloc(LINE_LEN);
- a = malloc(sizeof(struct init_action));
- memset(a, 0, sizeof(struct init_action));
+ a = calloc(1, sizeof(struct init_action));
while (fgets(line, LINE_LEN, fp)) {
char *tags[TAG_PROCESS + 1];
while (fgets(line, LINE_LEN, fp)) {
char *tags[TAG_PROCESS + 1];
@@
-297,7
+302,7
@@
void procd_inittab(void)
if (regexec(&pat_inittab, line, 5, matches, 0))
continue;
if (regexec(&pat_inittab, line, 5, matches, 0))
continue;
- DEBUG(4, "Parsing inittab - %s", line);
+ DEBUG(4, "Parsing inittab - %s
\n
", line);
for (i = TAG_ID; i <= TAG_PROCESS; i++) {
line[matches[i].rm_eo] = '\0';
for (i = TAG_ID; i <= TAG_PROCESS; i++) {
line[matches[i].rm_eo] = '\0';
@@
-316,8
+321,7
@@
void procd_inittab(void)
if (add_action(a, tags[TAG_ACTION]))
continue;
line = malloc(LINE_LEN);
if (add_action(a, tags[TAG_ACTION]))
continue;
line = malloc(LINE_LEN);
- a = malloc(sizeof(struct init_action));
- memset(a, 0, sizeof(struct init_action));
+ a = calloc(1, sizeof(struct init_action));
}
fclose(fp);
}
fclose(fp);