find:: get rid of nested function (it's a gcc-ism)

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

diff --git a/console-tools/resize.c b/console-tools/resize.c
index ea7fe5fcac0aafd21f1909a0fcba2d668e0914bd..4b0d63a03c8086a802e8d889aeeeb38b549f601f 100644 (file)
--- a/console-tools/resize.c
+++ b/console-tools/resize.c
@@ -2,22 +2,28 @@
 /*
  * 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.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 /* no options, no getopt */
+
+//usage:#define resize_trivial_usage
+//usage:       ""
+//usage:#define resize_full_usage "\n\n"
+//usage:       "Resize the screen"
+
 #include "libbb.h"
 
 #define ESC "\033"
 
-#define old_termios (*(struct termios*)&bb_common_bufsiz1)
+#define old_termios_p ((struct termios*)&bb_common_bufsiz1)
 
 static void
 onintr(int sig UNUSED_PARAM)
 {
-       tcsetattr(STDERR_FILENO, TCSANOW, &old_termios);
-       exit(EXIT_FAILURE);
+       tcsetattr(STDERR_FILENO, TCSANOW, old_termios_p);
+       _exit(EXIT_FAILURE);
 }
 
 int resize_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -33,8 +39,8 @@ int resize_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         * and operate on it - should we do the same?
         */
 
-       tcgetattr(STDERR_FILENO, &old_termios); /* fiddle echo */
-       new = old_termios;
+       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);
        bb_signals(0
@@ -53,6 +59,7 @@ int resize_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         */
        fprintf(stderr, ESC"7" ESC"[r" ESC"[999;999H" ESC"[6n");
        alarm(3); /* Just in case terminal won't answer */
+//BUG: death by signal won't restore termios
        scanf(ESC"[%hu;%huR", &w.ws_row, &w.ws_col);
        fprintf(stderr, ESC"8");
 
@@ -61,7 +68,7 @@ int resize_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         * (gotten via TIOCGWINSZ) and recomputing *pixel values */
        ret = ioctl(STDERR_FILENO, TIOCSWINSZ, &w);
 
-       tcsetattr(STDERR_FILENO, TCSANOW, &old_termios);
+       tcsetattr(STDERR_FILENO, TCSANOW, old_termios_p);
 
        if (ENABLE_FEATURE_RESIZE_PRINT)
                printf("COLUMNS=%d;LINES=%d;export COLUMNS LINES;\n",