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

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();

elkscmd/sys_utils/sercat.c

@@ -1,7 +1,7 @@
 /*
  * sercat.c - serial cat (for testing)
  *
- *	sercat [-v] [serial device] [> file]
+ *  sercat [-v] [serial device] [> file]
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -14,7 +14,7 @@
 
 #define DEFAULT_PORT "/dev/ttyS0"
 #define BUF_SIZE 4096
-#define CTRL_D	04
+#define CTRL_D  04
 
 #define errmsg(str) write(STDERR_FILENO, str, sizeof(str) - 1)
 #define errstr(str) write(STDERR_FILENO, str, strlen(str))
@@ -26,57 +26,71 @@ struct termios org, new;
 
 void sig_handler(int sig)
 {
-	errmsg("Interrupt\n");
-	tcsetattr(fd, TCSAFLUSH, &org);
-	close(fd);
-	exit(1);
+    errmsg("Interrupt\n");
+    tcsetattr(fd, TCSAFLUSH, &org);
+    close(fd);
+    exit(1);
 }
 
 void copyfile(int ifd, int ofd)
 {
-	int n;
+    int n;
 
-	while ((n = read(ifd, readbuf, BUF_SIZE)) > 0) {
-		if (n == 1 && readbuf[0] == CTRL_D)
-			return;
-		if (verbose) {
-			char *p = itoa(n);
-			errstr(p);
-			errmsg("  bytes read\n");
-		}
-		write(ofd, readbuf, n);
-	}
-	if (n < 0) perror("read");
+    while ((n = read(ifd, readbuf, BUF_SIZE)) > 0) {
+        if (n == 1 && readbuf[0] == CTRL_D)
+            return;
+        if (verbose) {
+            char *p = itoa(n);
+            errstr(p);
+            errmsg("  bytes read\n");
+        }
+        write(ofd, readbuf, n);
+    }
+    if (n < 0) perror("read");
 }
 
 int main(int argc, char **argv)
 {
-	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]);
-			return 1;
-		}
-	} else fd = STDIN_FILENO;
+    char *port = NULL;
+    char *tty;
 
-	if (tcgetattr(fd, &org) >= 0) {
-		new = org;
-		new.c_lflag &= ~(ICANON | ISIG | ECHO | ECHOE | ECHONL);
-		new.c_iflag &= ~(ICRNL);
-		new.c_cflag |= CS8 | CREAD;
-		new.c_cc[VMIN] = 255;			/* min bytes to read if VTIME = 0*/
-		new.c_cc[VTIME] = 1;			/* intercharacter timeout if VMIN > 0, timeout if VMIN = 0*/
-		tcsetattr(fd, TCSAFLUSH, &new);
-	} else errmsg("Can't set termios\n");
-	signal(SIGINT, sig_handler);
+    if (argc > 1 && !strcmp(argv[1], "-v")) {
+        verbose = 1;
+        argc--;
+        argv++;
+    }
+    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");
 
-	copyfile(fd, STDOUT_FILENO);
+    if (tcgetattr(fd, &org) >= 0) {
+        new = org;
+        new.c_lflag &= ~(ICANON | ISIG | ECHO | ECHOE | ECHONL);
+        new.c_iflag &= ~(ICRNL);
+        new.c_cflag |= CS8 | CREAD;
+        new.c_cc[VMIN] = 255;           /* min bytes to read if VTIME = 0*/
+        new.c_cc[VTIME] = 1;            /* intercharacter timeout if VMIN > 0, timeout if VMIN = 0*/
+        tcsetattr(fd, TCSAFLUSH, &new);
+    } else errmsg("Can't set termios\n");
+    signal(SIGINT, sig_handler);
 
-	tcsetattr(fd, TCSAFLUSH, &org);
-	close(fd);
-	return 0;
+    copyfile(fd, STDOUT_FILENO);
+
+    tcsetattr(fd, TCSAFLUSH, &org);
+    close(fd);
+    return 0;
 }