Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[cmds] Enhance getty to work outside of init #526

Merged
merged 1 commit into from
Apr 7, 2020
Merged

[cmds] Enhance getty to work outside of init #526

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 28 additions & 13 deletions elkscmd/sys_utils/getty.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* elkscmd/sysutils/getty.c
* elkscmd/sys_utils/getty.c
*
* Copyright (C) 1998 Alistair Riddoch <[email protected]>
*
Expand Down Expand Up @@ -67,7 +67,7 @@

char * progname;
char Buffer[64];
int ch, col = 0, fd;
int ch, col = 0;

void consolemsg(const char *str, ...)
{
Expand Down Expand Up @@ -211,7 +211,7 @@ static speed_t convert_baudrate(speed_t baudrate)
int main(int argc, char **argv)
{
char *ptr;
int n;
int n, fd;
speed_t baud = 0;
struct termios termios;

Expand All @@ -223,10 +223,28 @@ int main(int argc, char **argv)
exit(3);
}

if (argc == 2) debug("'%s'\n", argv[1]);
if (argc == 2)
debug("startup args '%s'\n", argv[1]);
else if (argc == 3) {
baud = atol(argv[2]);
debug("'%s' %ld\n", argv[1], baud);
debug("startup args '%s' %ld\n", argv[1], baud);
}

/* allow execution outside of init*/
if (getppid() > 1) {
int tty = open(argv[1], O_RDWR);
if (tty < 0) {
consolemsg("cannot open terminal %s\n", argv[1]);
exit(4);
}

debug("redirecting stdio to %s\n", argv[1]);
close(0); close(1); close(2); /* close inherited stdio */
if (dup2(tty, 0) != 0 || dup2(tty, 1) != 1 || dup2(tty, 2) != 2) {
consolemsg("cannot redirect stdio (error %d)\n", errno);
exit(5);
}
close(tty);
}

fd = open(ISSUE, O_RDONLY);
Expand Down Expand Up @@ -303,14 +321,9 @@ int main(int argc, char **argv)
state(Host);
break;
case 'L': /* Line used */
if (argc > 1) {
ptr = rindex(argv[1],'/');
if (ptr == NULL)
ptr = argv[1];
} else
ptr = NULL;
ptr = rindex(argv[1],'/');
if (ptr == NULL)
ptr = "tty";
ptr = argv[1];
state(ptr);
break;
case 'S': /* System */
Expand Down Expand Up @@ -347,6 +360,7 @@ int main(int argc, char **argv)

/* setup tty termios state*/
baud = convert_baudrate(baud);
if (baud) debug("setting termio baudcode %ld\n", baud);
if (tcgetattr(STDIN_FILENO, &termios) >= 0) {
termios.c_lflag |= ISIG | ICANON | ECHO | ECHOE | ECHONL;
termios.c_lflag &= ~(IEXTEN | ECHOK | NOFLSH);
Expand All @@ -369,7 +383,7 @@ int main(int argc, char **argv)
state("login: ");
n=read(STDIN_FILENO,Buffer,sizeof(Buffer)-1);
if (n < 1) {
debug("read fail errno %d\n", errno);
debug("read fail on stdin, errno %d\n", errno);
if (errno != -EINTR)
exit(1);
continue;
Expand All @@ -381,6 +395,7 @@ int main(int argc, char **argv)
if (*Buffer) {
char *nargv[3];

debug("calling login: %s\n", Buffer);
nargv[0] = LOGIN;
nargv[1] = Buffer;
nargv[2] = NULL;
Expand Down