Tito sent more size tweaks.

git-svn-id: svn://busybox.net/trunk/busybox@11390 69ca8d6d-28ef-0310-b511-8ec308f3f277

4 files changed, 11 insertions, 19 deletions

diff --git a/console-tools/chvt.c b/console-tools/chvt.c
index 3398892f5..b1a429eb3 100644
--- a/console-tools/chvt.c
+++ b/console-tools/chvt.c
@@ -42,11 +42,9 @@ int chvt_main(int argc, char **argv)
 
         fd = get_console_fd();
         num =  bb_xgetlarg(argv[1], 10, 0, INT_MAX);
-        if (ioctl(fd, VT_ACTIVATE, num)) {
-                bb_perror_msg_and_die("VT_ACTIVATE");
-        }
-        if (ioctl(fd, VT_WAITACTIVE, num)) {
-                bb_perror_msg_and_die("VT_WAITACTIVE");
+        if((-1 == ioctl(fd, VT_ACTIVATE, num)) ||
+           (-1 == ioctl(fd, VT_WAITACTIVE, num))) {
+                bb_perror_msg_and_die("ioctl");
         }
         return EXIT_SUCCESS;
 }
diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c
index 08a9d2122..00ddf4236 100644
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -42,14 +42,14 @@ int deallocvt_main(int argc, char *argv[])
                 case 2:
                         if((num = bb_xgetlarg(argv[1], 10, 0, INT_MAX)) == 0)
                                 bb_error_msg_and_die("0: illegal VT number");
-                /* Falltrough */
+                /* Fallthrough */
                 case 1:
                         break;
                 default:
                         bb_show_usage();
         }
 
-        if (ioctl( get_console_fd(), VT_DISALLOCATE, num )) {
+        if (-1 == ioctl( get_console_fd(), VT_DISALLOCATE, num )) {
                 bb_perror_msg_and_die("VT_DISALLOCATE");
         }
         return EXIT_SUCCESS;
diff --git a/console-tools/openvt.c b/console-tools/openvt.c
index 5f244579c..d9f49bbea 100644
--- a/console-tools/openvt.c
+++ b/console-tools/openvt.c
@@ -64,10 +64,8 @@ int openvt_main(int argc, char **argv)
                 fd = bb_xopen(vtname, O_RDWR);
 
                 /* Reassign stdout and sterr */
-                close(1);
-                close(2);
-                dup(fd);
-                dup(fd);
+                dup2(fd, STDOUT_FILENO);
+                dup2(fd, STDERR_FILENO);
 
                 execvp(argv[0], argv);
                 _exit(1);
diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c
index 53ff1ad1e..5806f21ed 100644
--- a/console-tools/setconsole.c
+++ b/console-tools/setconsole.c
@@ -37,9 +37,8 @@ static const struct option setconsole_long_options[] = {
 
 int setconsole_main(int argc, char **argv)
 {
-        int con;
         unsigned long flags;
-        const char *device = "/dev/tty";
+        const char *device = CURRENT_TTY;
 
         bb_applet_long_options = setconsole_long_options;
         flags = bb_getopt_ulflags(argc, argv, "r");
@@ -53,14 +52,11 @@ int setconsole_main(int argc, char **argv)
                 device = argv[optind];
         } else {
                 if (flags & OPT_SETCONS_RESET)
-                        device = "/dev/console";
+                        device = CONSOLE_DEV;
         }
 
-        if (-1 == (con = open(device, O_RDONLY))) {
-                bb_perror_msg_and_die("open %s", device);
-        }
-        if (-1 == ioctl(con, TIOCCONS)) {
-                bb_perror_msg_and_die("ioctl TIOCCONS");
+        if (-1 == ioctl(bb_xopen(device, O_RDONLY), TIOCCONS)) {
+                bb_perror_msg_and_die("TIOCCONS");
         }
         return EXIT_SUCCESS;
 }