getty: do not emit bogus error message on EOF

[oweals/busybox.git] / console-tools / resize.c

diff --git a/console-tools/resize.c b/console-tools/resize.c
index 2fe5526fb6d4aacbd7c23cda3e143e62a597acb1..828b5bb42960022d8b8a4e4f63d20f3659da7350 100644 (file)
--- a/console-tools/resize.c
+++ b/console-tools/resize.c
@@ -2,38 +2,70 @@
 /*
  * resize - set terminal width and height.
  *
- * Copyright 2006 Bernhard Fischer
+ * Copyright 2006 Bernhard Reutner-Fischer
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 /* no options, no getopt */
-#include "busybox.h"
+#include "libbb.h"
 
-int resize_main(int argc, char **argv);
-int resize_main(int argc, char **argv)
+#define ESC "\033"
+
+#define old_termios_p ((struct termios*)&bb_common_bufsiz1)
+
+static void
+onintr(int sig UNUSED_PARAM)
+{
+       tcsetattr(STDERR_FILENO, TCSANOW, old_termios_p);
+       exit(EXIT_FAILURE);
+}
+
+int resize_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int resize_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
-       struct termios old, new;
-       struct winsize w = {0,0,0,0};
+       struct termios new;
+       struct winsize w = { 0, 0, 0, 0 };
        int ret;
 
-       tcgetattr(STDOUT_FILENO, &old); /* fiddle echo */
-       new = old;
+       /* We use _stderr_ in order to make resize usable
+        * in shell backticks (those redirect stdout away from tty).
+        * NB: other versions of resize open "/dev/tty"
+        * and operate on it - should we do the same?
+        */
+
+       tcgetattr(STDERR_FILENO, old_termios_p); /* fiddle echo */
+       memcpy(&new, old_termios_p, sizeof(new));
        new.c_cflag |= (CLOCAL | CREAD);
        new.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG);
-       tcsetattr(STDOUT_FILENO, TCSANOW, &new);
+       bb_signals(0
+               + (1 << SIGINT)
+               + (1 << SIGQUIT)
+               + (1 << SIGTERM)
+               + (1 << SIGALRM)
+               , onintr);
+       tcsetattr(STDERR_FILENO, TCSANOW, &new);
+
        /* save_cursor_pos 7
         * scroll_whole_screen [r
         * put_cursor_waaaay_off [$x;$yH
         * get_cursor_pos [6n
         * restore_cursor_pos 8
         */
-       printf("\0337\033[r\033[999;999H\033[6n");
-       scanf("\033[%hu;%huR", &w.ws_row, &w.ws_col);
-       ret = ioctl(STDOUT_FILENO, TIOCSWINSZ, &w);
-       printf("\0338");
-       tcsetattr(STDOUT_FILENO, TCSANOW, &old);
+       fprintf(stderr, ESC"7" ESC"[r" ESC"[999;999H" ESC"[6n");
+       alarm(3); /* Just in case terminal won't answer */
+       scanf(ESC"[%hu;%huR", &w.ws_row, &w.ws_col);
+       fprintf(stderr, ESC"8");
+
+       /* BTW, other versions of resize recalculate w.ws_xpixel, ws.ws_ypixel
+        * by calculating character cell HxW from old values
+        * (gotten via TIOCGWINSZ) and recomputing *pixel values */
+       ret = ioctl(STDERR_FILENO, TIOCSWINSZ, &w);
+
+       tcsetattr(STDERR_FILENO, TCSANOW, old_termios_p);
+
        if (ENABLE_FEATURE_RESIZE_PRINT)
                printf("COLUMNS=%d;LINES=%d;export COLUMNS LINES;\n",
                        w.ws_col, w.ws_row);
+
        return ret;
 }