4d8335ad75
This is a pretty big commit, so let's run through it in parts: - All of the userspace changes are to switch away from syscall_wait Mostly, this is to waitpid; some things were tweaked to do things "properly" instead of waiting for particular processes. Init has been fixed to do a proper spin wait. - syscall_wait is gone - as are its uses. newlib bindings have been using just waitpid for a while now. - waitpid now performs like a Unix waitpid - process reaping is no longer a "do this on next change thing": it happens when a process is waited on, like it should (That means we can have real zombies: terminated processes that have not yet been waited on) - Reparenting of children to init has been implemented, so you can fork-daemonize! Overall, this is pretty big... So I hope it doesn't break everything.
109 lines
1.9 KiB
C
109 lines
1.9 KiB
C
/*
|
|
* cat
|
|
*
|
|
* Concatenates files together to standard output.
|
|
* In a supporting terminal, you can then pipe
|
|
* standard out to another file or other useful
|
|
* things like that.
|
|
*/
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <syscall.h>
|
|
#include <signal.h>
|
|
#include <termios.h>
|
|
#include <sys/wait.h>
|
|
|
|
#include "lib/pthread.h"
|
|
|
|
int fd = 0;
|
|
|
|
int child_pid = 0;
|
|
|
|
void *print_serial_stuff(void * garbage) {
|
|
child_pid = gettid();
|
|
while (1) {
|
|
char x;
|
|
read(fd, &x, 1);
|
|
fputc(x, stdout);
|
|
fflush(stdout);
|
|
}
|
|
|
|
pthread_exit(garbage);
|
|
}
|
|
|
|
struct termios old;
|
|
|
|
void set_unbuffered() {
|
|
tcgetattr(fileno(stdin), &old);
|
|
struct termios new = old;
|
|
new.c_lflag &= (~ICANON & ~ECHO);
|
|
tcsetattr(fileno(stdin), TCSAFLUSH, &new);
|
|
}
|
|
|
|
void set_buffered() {
|
|
tcsetattr(fileno(stdin), TCSAFLUSH, &old);
|
|
}
|
|
|
|
int main(int argc, char ** argv) {
|
|
pthread_t receive_thread;
|
|
pthread_t flush_thread;
|
|
char * device = argv[1];
|
|
|
|
if (argc < 1) {
|
|
device = "/dev/ttyS0";
|
|
}
|
|
|
|
set_unbuffered();
|
|
|
|
fd = syscall_open(device, 0, 0);
|
|
|
|
pthread_create(&receive_thread, NULL, print_serial_stuff, NULL);
|
|
|
|
while (1) {
|
|
char c = fgetc(stdin);
|
|
if (c == 27) {
|
|
char x = fgetc(stdin);
|
|
if (x == ']') {
|
|
while (1) {
|
|
printf("serial-console>\033[1561z ");
|
|
set_buffered();
|
|
fflush(stdout);
|
|
|
|
char line[1024];
|
|
fgets(line, 1024, stdin);
|
|
|
|
int i = strlen(line);
|
|
line[i-1] = '\0';
|
|
|
|
if (!strcmp(line, "quit")) {
|
|
kill(child_pid, SIGKILL);
|
|
printf("Waiting for threads to shut down...\n");
|
|
while (wait(NULL) != -1);
|
|
printf("Exiting.\n");
|
|
return 0;
|
|
} else if (!strcmp(line, "continue")) {
|
|
set_unbuffered();
|
|
fflush(stdout);
|
|
break;
|
|
}
|
|
}
|
|
} else {
|
|
ungetc(x, stdin);
|
|
}
|
|
}
|
|
char buf[1] = {c};
|
|
write(fd, buf, 1);
|
|
}
|
|
|
|
close(fd);
|
|
set_buffered();
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* vim:tabstop=4
|
|
* vim:noexpandtab
|
|
* vim:shiftwidth=4
|
|
*/
|