[kernel,cmds] Fix tty SIGINT not handled when using sercat

ghaerr · Sep 5, 2024 · 01c5ad6 · 01c5ad6
1 parent a4f544f
commit 01c5ad6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/elks/arch/i86/drivers/char/ntty.c b/elks/arch/i86/drivers/char/ntty.c
@@ -335,6 +335,8 @@ size_t tty_read(struct inode *inode, struct file *file, char *data, size_t len)
                 break;
             ch = chq_wait_rd(&tty->inq, nonblock);
             if (ch < 0) {
+                if (current->signal)
+                    return -EINTR;
                 if (!icanon && vtime) {
                     if (jiffies < timeout) {
                         schedule();

diff --git a/elkscmd/sys_utils/sercat.c b/elkscmd/sys_utils/sercat.c
@@ -51,17 +51,31 @@ void copyfile(int ifd, int ofd)
 
 int main(int argc, char **argv)
 {
+    char *port = NULL;
+    char *tty;
+
 	if (argc > 1 && !strcmp(argv[1], "-v")) {
 		verbose = 1;
 		argc--;
 		argv++;
 	}
-	if (argc > 1) {
-		if ((fd = open(argv[1], O_RDONLY|O_EXCL)) < 0) {
-			perror(argv[1]);
+	if (argc > 1)
+        port = argv[1];
+    else {
+        /* default to /dev/ttyS0 if not run from serial port and no argument */
+        if (strncmp(ttyname(STDIN_FILENO), "/dev/ttyS", 9) != 0)
+            port = "/dev/ttyS0";
+    }
+    if (port) {
+		if ((fd = open(port, O_RDONLY|O_EXCL)) < 0) {
+			perror(port);
 			return 1;
 		}
 	} else fd = STDIN_FILENO;
+    tty = ttyname(fd);
+    errmsg("Reading from ");
+    errstr(tty);
+    errmsg("\n");
 
 	if (tcgetattr(fd, &org) >= 0) {
 		new = org;