mirror of
https://github.com/troglobit/finit.git
synced 2026-11-01 13:10:32 +00:00
Restore pre built-in run_getty() as run_getty2()
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
1 parent
b629348973
commit
7c50d86a55
2 files changed
+55
No files matched your search
+54
@@ -27,6 +27,7 @@
|
|||||||
#include <ctype.h> /* isdigit() */
|
#include <ctype.h> /* isdigit() */
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
#include <sys/ioctl.h>
|
||||||
#include <sys/prctl.h>
|
#include <sys/prctl.h>
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
#include <lite/lite.h>
|
#include <lite/lite.h>
|
||||||
@@ -238,10 +239,63 @@ pid_t run_getty(char *tty, char *speed, char *term, int noclear, int console)
|
|||||||
|
|
||||||
return pid;
|
return pid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pid_t run_getty2(char *tty, char *cmd, char *args[], int console)
|
||||||
|
{
|
||||||
|
pid_t pid;
|
||||||
|
|
||||||
|
pid = fork();
|
||||||
|
if (!pid) {
|
||||||
|
int i, fd;
|
||||||
|
struct sigaction sa;
|
||||||
|
|
||||||
/* Reset signal handlers that were set by the parent process */
|
/* Reset signal handlers that were set by the parent process */
|
||||||
|
for (i = 1; i < NSIG; i++)
|
||||||
|
DFLSIG(sa, i, 0);
|
||||||
|
|
||||||
|
/* Detach from initial controlling TTY */
|
||||||
|
vhangup();
|
||||||
|
|
||||||
|
close(STDERR_FILENO);
|
||||||
|
close(STDOUT_FILENO);
|
||||||
|
close(STDIN_FILENO);
|
||||||
|
|
||||||
|
/* Attach TTY to console */
|
||||||
|
fd = open(tty, O_RDWR);
|
||||||
|
if (fd != STDIN_FILENO)
|
||||||
|
exit(1);
|
||||||
|
|
||||||
|
dup2(fd, STDIN_FILENO);
|
||||||
|
dup2(fd, STDOUT_FILENO);
|
||||||
|
dup2(fd, STDERR_FILENO);
|
||||||
|
|
||||||
|
prepare_tty(tty, "getty", console);
|
||||||
|
|
||||||
|
if (ioctl(STDIN_FILENO, TIOCSCTTY, 1) < 0)
|
||||||
|
_pe("Failed TIOCSCTTY");
|
||||||
|
|
||||||
|
while (!fexist(SYNC_SHUTDOWN)) {
|
||||||
|
char c;
|
||||||
|
static const char msg[] = "\nPlease press Enter to activate this console.";
|
||||||
|
|
||||||
|
if (fexist(SYNC_STOPPED)) {
|
||||||
|
sleep(1);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
(void)write(STDERR_FILENO, msg, sizeof(msg));
|
||||||
|
while (read(STDIN_FILENO, &c, 1) == 1 && c != '\n')
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (fexist(SYNC_STOPPED))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
execv(cmd, args);
|
||||||
|
}
|
||||||
|
|
||||||
|
close(fd);
|
||||||
|
vhangup();
|
||||||
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
return pid;
|
return pid;
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ int complete (char *cmd, int pid);
|
|||||||
int run (char *cmd);
|
int run (char *cmd);
|
||||||
int run_interactive (char *cmd, char *fmt, ...);
|
int run_interactive (char *cmd, char *fmt, ...);
|
||||||
pid_t run_getty (char *tty, char *speed, char *term, int noclear, int console);
|
pid_t run_getty (char *tty, char *speed, char *term, int noclear, int console);
|
||||||
|
pid_t run_getty2 (char *tty, char *cmd, char *args[], int console);
|
||||||
int run_parts (char *dir, char *cmd);
|
int run_parts (char *dir, char *cmd);
|
||||||
|
|
||||||
static inline void create(char *path, mode_t mode, uid_t uid, gid_t gid)
|
static inline void create(char *path, mode_t mode, uid_t uid, gid_t gid)
|
||||||
|
|||||||
Reference in new issue
Block a user