X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=inittab.c;h=c27c3241f4e1b359eb69e7177f7ac633de7d5441;hp=528396e57534553309cdf482b87ba837772984a1;hb=fa5ce1c2b4fe3fa6bb4bbc6697961655b952d8d4;hpb=f2c77756933f22981c1202c039e7f7e24d7247f3;ds=sidebyside

diff --git a/inittab.c b/inittab.c
index 528396e..c27c324 100644
--- a/inittab.c
+++ b/inittab.c
@@ -12,6 +12,7 @@
  * GNU General Public License for more details.
  */
 
+#define _GNU_SOURCE
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
@@ -30,6 +31,10 @@
 #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
@@ -223,6 +228,14 @@ static struct init_handler handlers[] = {
 		.name = "respawn",
 		.cb = rcrespawn,
 		.multi = 1,
+	}, {
+		.name = "askconsolelate",
+		.cb = askconsole,
+		.multi = 1,
+	}, {
+		.name = "respawnlate",
+		.cb = rcrespawn,
+		.multi = 1,
 	}
 };
 
@@ -271,8 +284,7 @@ void procd_inittab(void)
 
 	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];
@@ -290,7 +302,7 @@ void procd_inittab(void)
 		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';
@@ -309,8 +321,7 @@ void procd_inittab(void)
 		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);