nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made the shell more compatible with signals.

This commit is contained in:
Jonas 'Sortie' Termansen 2012-08-03 15:40:11 +02:00
parent 51e3de971c
commit f1f0c44a12
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
utils/mxsh.cpp
View File

@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
COPYRIGHT(C) JONAS 'SORTIE' TERMANSEN 2011, 2012. Copyright(C) Jonas 'Sortie' Termansen 2011, 2012.
This program is free software: you can redistribute it and/or modify it This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free under the terms of the GNU General Public License as published by the Free
@ -29,10 +29,16 @@
#include <errno.h> #include <errno.h>
#include <error.h> #include <error.h>
#include <fcntl.h> #include <fcntl.h>
#include <signal.h>
#include <termios.h> #include <termios.h>
int status = 0; int status = 0;
void on_sigint(int signum)
{
printf("^C\n");
}
void updatepwd() void updatepwd()
{ {
const size_t CWD_SIZE = 512; const size_t CWD_SIZE = 512;
@ -175,6 +181,10 @@ readcmd:
goto readcmd; goto readcmd;
} }
// TODO: Hack, use the right macros!
if ( status == 128 + SIGINT )
printf("^C\n");
result = status; result = status;
goto out; goto out;
} }
@ -240,7 +250,7 @@ out:
return result; return result;
} }
void command() void get_and_run_command()
{ {
unsigned termmode = TERMMODE_UNICODE unsigned termmode = TERMMODE_UNICODE
| TERMMODE_SIGNAL | TERMMODE_SIGNAL
@ -260,8 +270,20 @@ void command()
{ {
char c; char c;
ssize_t bytesread = read(1, &c, sizeof(c)); ssize_t bytesread = read(1, &c, sizeof(c));
if ( bytesread < 0 && errno == EINTR )
return;
if ( bytesread < 0 ) { error(64, errno, "read stdin"); } if ( bytesread < 0 ) { error(64, errno, "read stdin"); }
if ( !bytesread ) { break; } if ( !bytesread )
{
if ( getppid() == 1 )
printf("\nType exit to shutdown the system.\n");
else
{
printf("exit\n");
exit(status);
}
break;
}
if ( !c ) { continue; } if ( !c ) { continue; }
if ( c == '\n' ) { break; } if ( c == '\n' ) { break; }
if ( commandsize <= commandused ) { continue; } if ( commandsize <= commandused ) { continue; }
@ -310,6 +332,7 @@ void command()
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
signal(SIGINT, on_sigint);
char pidstr[32]; char pidstr[32];
char ppidstr[32]; char ppidstr[32];
sprintf(pidstr, "%i", getpid()); sprintf(pidstr, "%i", getpid());
@ -319,6 +342,6 @@ int main(int argc, char* argv[])
setenv("PPID", ppidstr, 1); setenv("PPID", ppidstr, 1);
setenv("?", "0", 1); setenv("?", "0", 1);
updatepwd(); updatepwd();
while ( true ) { command(); } while ( true ) { get_and_run_command(); }
} }