Fix the pwd and group functions. The bb_ stuff was a leftover from

[oweals/busybox.git] / chvt.c

diff --git a/chvt.c b/chvt.c
index 87a1248fd70f105799c7de11cc6d8f403a775b15..c715e67ded859d60783983cc2ce96c85ab6ab687 100644 (file)
--- a/chvt.c
+++ b/chvt.c
@@ -4,7 +4,7 @@
  *
  * busyboxed by Erik Andersen
  */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
@@ -12,8 +12,8 @@
 #include <sys/ioctl.h>
 
 /* From <linux/vt.h> */
-#define VT_ACTIVATE     0x5606  /* make vt active */
-#define VT_WAITACTIVE   0x5607  /* wait for vt active */
+static const int VT_ACTIVATE = 0x5606;  /* make vt active */
+static const int VT_WAITACTIVE = 0x5607;  /* wait for vt active */
 
 int chvt_main(int argc, char **argv)
 {
@@ -23,15 +23,11 @@ int chvt_main(int argc, char **argv)
                usage (chvt_usage);
        fd = get_console_fd("/dev/console");
        num = atoi(argv[1]);
-       if (ioctl(fd, VT_ACTIVATE, num)) {
-               perror("VT_ACTIVATE");
-               exit(FALSE);
-       }
-       if (ioctl(fd, VT_WAITACTIVE, num)) {
-               perror("VT_WAITACTIVE");
-               exit(FALSE);
-       }
-       return(TRUE);
+       if (ioctl(fd, VT_ACTIVATE, num))
+               perror_msg_and_die("VT_ACTIVATE");
+       if (ioctl(fd, VT_WAITACTIVE, num))
+               perror_msg_and_die("VT_WAITACTIVE");
+       return EXIT_SUCCESS;
 }