ash: in tryexec(), ensure we don't try to run embedded scripts as applets

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

diff --git a/console-tools/resize.c b/console-tools/resize.c
index 52fdb26f445e53f526f2cf1bb87483ac20429eff..8aa487c41f73b077453b0c01c22b1596d8374848 100644 (file)
--- a/console-tools/resize.c
+++ b/console-tools/resize.c
@@ -2,46 +2,78 @@
 /*
  * 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 */
+//config:config RESIZE
+//config:      bool "resize (756 bytes)"
+//config:      default y
+//config:      help
+//config:      This program is used to (re)set the width and height of your current
+//config:      terminal.
+//config:
+//config:config FEATURE_RESIZE_PRINT
+//config:      bool "Print environment variables"
+//config:      default y
+//config:      depends on RESIZE
+//config:      help
+//config:      Prints the newly set size (number of columns and rows) of
+//config:      the terminal.
+//config:      E.g.:
+//config:      COLUMNS=80;LINES=44;export COLUMNS LINES;
+
+//applet:IF_RESIZE(APPLET_NOEXEC(resize, resize, BB_DIR_USR_BIN, BB_SUID_DROP, resize))
+/* bb_common_bufsiz1 usage here is safe wrt NOEXEC: not expecting it to be zeroed. */
+
+//kbuild:lib-$(CONFIG_RESIZE) += resize.o
+
+//usage:#define resize_trivial_usage
+//usage:       ""
+//usage:#define resize_full_usage "\n\n"
+//usage:       "Resize the screen"
+
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #define ESC "\033"
 
-struct termios old;
+#define old_termios_p ((struct termios*)bb_common_bufsiz1)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 static void
-onintr(int sig ATTRIBUTE_UNUSED)
+onintr(int sig UNUSED_PARAM)
 {
-       tcsetattr(STDERR_FILENO, TCSANOW, &old);
-       exit(1);
+       tcsetattr(STDERR_FILENO, TCSANOW, old_termios_p);
+       _exit(EXIT_FAILURE);
 }
 
-
-int resize_main(int argc, char **argv);
-int resize_main(int argc, char **argv)
+int resize_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int resize_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
        struct termios new;
-       struct winsize w = { 0,0,0,0 };
+       struct winsize w = { 0, 0, 0, 0 };
        int ret;
 
+       INIT_G();
+
        /* 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); /* fiddle echo */
-       new = old;
+       tcgetattr(STDERR_FILENO, old_termios_p); /* fiddle echo */
+//TODO: die if the above fails?
+       memcpy(&new, old_termios_p, sizeof(new));
        new.c_cflag |= (CLOCAL | CREAD);
        new.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG);
-       signal(SIGINT, onintr);
-       signal(SIGQUIT, onintr);
-       signal(SIGTERM, onintr);
-       signal(SIGALRM, onintr);
+       bb_signals(0
+               + (1 << SIGINT)
+               + (1 << SIGQUIT)
+               + (1 << SIGTERM)
+               + (1 << SIGALRM)
+               , onintr);
        tcsetattr(STDERR_FILENO, TCSANOW, &new);
 
        /* save_cursor_pos 7
@@ -52,6 +84,7 @@ int resize_main(int argc, char **argv)
         */
        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");
 
@@ -60,7 +93,7 @@ int resize_main(int argc, char **argv)
         * (gotten via TIOCGWINSZ) and recomputing *pixel values */
        ret = ioctl(STDERR_FILENO, TIOCSWINSZ, &w);
 
-       tcsetattr(STDERR_FILENO, TCSANOW, &old);
+       tcsetattr(STDERR_FILENO, TCSANOW, old_termios_p);
 
        if (ENABLE_FEATURE_RESIZE_PRINT)
                printf("COLUMNS=%d;LINES=%d;export COLUMNS LINES;\n",