projects
/
project
/
procd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
json 0.12 fixes
[project/procd.git]
/
inittab.c
diff --git
a/inittab.c
b/inittab.c
index 0d62708f243a247270e9253475cb7332621918ed..623103de640b1e7609933a175fce3dfed716e715 100644
(file)
--- a/
inittab.c
+++ b/
inittab.c
@@
-14,6
+14,7
@@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/ioctl.h>
#include <fcntl.h>
#include <stdio.h>
#include <fcntl.h>
#include <stdio.h>
@@
-37,7
+38,7
@@
#define MAX_ARGS 8
struct init_action;
#define MAX_ARGS 8
struct init_action;
-c
onst char *console
;
+c
har *console = NULL
;
struct init_handler {
const char *name;
struct init_handler {
const char *name;
@@
-96,16
+97,21
@@
static void fork_worker(struct init_action *a)
a->proc.pid = fork();
if (!a->proc.pid) {
a->proc.pid = fork();
if (!a->proc.pid) {
- p = setsid( );
+ p = setsid();
+
fd = dev_open(a->id);
if (fd != -1)
{
dup2(fd, STDIN_FILENO);
dup2(fd, STDOUT_FILENO);
dup2(fd, STDERR_FILENO);
fd = dev_open(a->id);
if (fd != -1)
{
dup2(fd, STDIN_FILENO);
dup2(fd, STDOUT_FILENO);
dup2(fd, STDERR_FILENO);
- tcsetpgrp(fd, p);
- close(fd);
+ if (fd > STDERR_FILENO)
+
close(fd);
}
}
+
+ ioctl(STDIN_FILENO, TIOCSCTTY, 1);
+ tcsetpgrp(STDIN_FILENO, p);
+
execvp(a->argv[0], a->argv);
ERROR("Failed to execute %s\n", a->argv[0]);
exit(-1);
execvp(a->argv[0], a->argv);
ERROR("Failed to execute %s\n", a->argv[0]);
exit(-1);
@@
-172,19
+178,27
@@
static void askconsole(struct init_action *a)
int i;
tty = get_cmdline_val("console", line, sizeof(line));
int i;
tty = get_cmdline_val("console", line, sizeof(line));
- split = strchr(tty, ',');
- if (split)
- *split = '\0';
+ if (tty != NULL) {
+ split = strchr(tty, ',');
+ if (split != NULL)
+ *split = '\0';
+
+ if (!dev_exist(tty)) {
+ DEBUG(4, "skipping %s\n", tty);
+ return;
+ }
- if (!dev_exist(tty)) {
- DEBUG(4, "skipping %s\n", tty);
- return;
+ console = strdup(tty);
+ a->id = strdup(tty);
+ }
+ else {
+ console = NULL;
+ a->id = NULL;
}
a->tout.cb = respawn;
for (i = MAX_ARGS - 1; i >= 1; i--)
a->argv[i] = a->argv[i - 1];
}
a->tout.cb = respawn;
for (i = MAX_ARGS - 1; i >= 1; i--)
a->argv[i] = a->argv[i - 1];
- a->id = strdup(tty);
a->argv[0] = ask;
a->respawn = 500;
a->argv[0] = ask;
a->respawn = 500;