Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/console-tools/resize.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/console-tools/resize.c (modified) (4 diffs)

branches/2.2.9/mindi-busybox/console-tools/resize.c

@@ -3 +3 @@
  * 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 */
@@ -12 +12 @@
 #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 ATTRIBUTE_UNUSED)
+onintr(int sig UNUSED_PARAM)
 {
-    tcsetattr(STDERR_FILENO, TCSANOW, &old_termios);
-    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;
 
@@ -34 +34 @@
      */
 
-    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);
-    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);
 
@@ -60 +62 @@
     ret = ioctl(STDERR_FILENO, TIOCSWINSZ, &w);
 
-    tcsetattr(STDERR_FILENO, TCSANOW, &old_termios);
+    tcsetattr(STDERR_FILENO, TCSANOW, old_termios_p);
 
     if (ENABLE_FEATURE_RESIZE_PRINT)