MirrorMirror
/
riju
mirror of https://github.com/radian-software/riju.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a number of things

This commit is contained in:
Radon Rosborough 2021-08-12 17:48:59 -07:00
parent 63b9e400df
commit 62d67160d7
2 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
system/src/riju-pty.c
View File

@ -1,5 +1,6 @@
#define _GNU_SOURCE #define _GNU_SOURCE
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
@ -7,12 +8,13 @@
#include <string.h> #include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h>
#include <termios.h> #include <termios.h>
#include <unistd.h> #include <unistd.h>
void __attribute__((noreturn)) die(char *msg) void __attribute__((noreturn)) die(char *msg)
{ {
fprintf(stderr, "%s\n", msg); fprintf(stderr, "%s (errno %d)\n", msg, errno);
exit(1); exit(1);
} }
@ -20,7 +22,11 @@ void die_with_usage() { die("usage: riju-pty CMDLINE..."); }
struct termios orig_termios; struct termios orig_termios;
void restore_termios() { tcsetattr(STDIN_FILENO, TCSAFLUSH, &orig_termios); } void cleanup()
{
if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &orig_termios) < 0)
die("tcsetattr failed");
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
@ -36,6 +42,18 @@ int main(int argc, char **argv)
char *pty_slave_name = ptsname(pty_master_fd); char *pty_slave_name = ptsname(pty_master_fd);
if (pty_slave_name == NULL) if (pty_slave_name == NULL)
die("ptsname failed"); die("ptsname failed");
if (tcgetattr(STDIN_FILENO, &orig_termios) < 0)
die("tcgetattr failed");
struct termios raw = orig_termios;
// https://viewsourcecode.org/snaptoken/kilo/02.enteringRawMode.html
raw.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON);
raw.c_oflag &= ~(OPOST);
raw.c_cflag |= (CS8);
raw.c_lflag &= ~(ECHO | ICANON | IEXTEN | ISIG);
if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &raw) < 0)
die("tcsetattr failed");
if (atexit(cleanup) < 0)
die("atexit failed");
pid_t exec_pid = fork(); pid_t exec_pid = fork();
if (exec_pid < 0) if (exec_pid < 0)
die("fork failed"); die("fork failed");
@ -55,37 +73,45 @@ int main(int argc, char **argv)
execvp(argv[1], &argv[1]); execvp(argv[1], &argv[1]);
die("execvp failed"); die("execvp failed");
} }
char buf[1024];
int len, len_written;
int pid = fork(); int pid = fork();
if (pid < 0)
die("fork failed");
else if (pid > 0) {
int wstatus;
if (waitpid(exec_pid, &wstatus, 0) != exec_pid)
die("waitpid failed");
if (signal(SIGTERM, SIG_IGN) == SIG_ERR)
die("signal failed");
if (kill(0, SIGTERM) < 0)
die("kill failed");
return WEXITSTATUS(wstatus);
}
char buf[1024];
int len, len_written;
pid = fork();
if (pid < 0) if (pid < 0)
die("fork failed"); die("fork failed");
else if (pid == 0) { else if (pid == 0) {
if (tcgetattr(STDIN_FILENO, &orig_termios) < 0)
die("tcgetattr failed");
if (atexit(restore_termios) != 0)
die("atexit failed");
struct termios raw = orig_termios;
// https://viewsourcecode.org/snaptoken/kilo/02.enteringRawMode.html
raw.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON);
raw.c_oflag &= ~(OPOST);
raw.c_cflag |= (CS8);
raw.c_lflag &= ~(ECHO | ICANON | IEXTEN | ISIG);
if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &raw) < 0)
die("tcsetattr failed");
while ((len = read(STDIN_FILENO, buf, 1024)) > 0) { while ((len = read(STDIN_FILENO, buf, 1024)) > 0) {
char *ptr = buf; char *ptr = buf;
while (len > 0) { while (len > 0) {
if (*ptr == '\x03') { switch (*ptr) {
case 3:
if (kill(exec_pid, SIGINT) < 0) if (kill(exec_pid, SIGINT) < 0)
die("kill failed"); die("kill failed");
len -= 1; len -= 1;
ptr += 1; ptr += 1;
continue; continue;
case 26:
if (kill(exec_pid, SIGTSTP) < 0)
die("kill failed");
len -= 1;
ptr += 1;
continue;
} }
int limit = len; int limit = len;
for (int idx = 0; idx < len; ++idx) { for (int idx = 0; idx < len; ++idx) {
if (buf[idx] == '\x03') { if (buf[idx] == 3 || buf[idx] == 26) {
limit = idx; limit = idx;
break; break;
} }

2
system/src/riju-system-privileged.c
View File

@ -18,7 +18,7 @@
void __attribute__((noreturn)) die(char *msg) void __attribute__((noreturn)) die(char *msg)
{ {
fprintf(stderr, "%s\n", msg); fprintf(stderr, "%s (errno %d)\n", msg, errno);
exit(1); exit(1);
} }