Removed trailing \n from error_msg{,_and_die} messages.

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

diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c
index a5b5a03f01d1e8185bd5a00dc8c202e18f513401..b51fbaef442607dbdeb04160c3d07163e8907acf 100644 (file)
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -3,7 +3,7 @@
  * disalloc.c - aeb - 940501 - Disallocate virtual terminal(s)
  * Renamed deallocvt.
  */
-#include "internal.h"
+#include "busybox.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -11,35 +11,33 @@
 #include <sys/ioctl.h>
 
 /* From <linux/vt.h> */
-#define VT_DISALLOCATE  0x5608  /* free memory associated to vt */
+static const int VT_DISALLOCATE = 0x5608;  /* free memory associated to vt */
 
 int deallocvt_main(int argc, char *argv[])
 {
        int fd, num, i;
 
-       if ((argc > 2) || ((argv == 2) && (**(argv + 1) == '-')))
+       //if ((argc > 2) || ((argv == 2) && (**(argv + 1) == '-')))
+       if (argc > 2)
                usage(deallocvt_usage);
 
        fd = get_console_fd("/dev/console");
 
        if (argc == 1) {
                /* deallocate all unused consoles */
-               if (ioctl(fd, VT_DISALLOCATE, 0)) {
-                       perror("VT_DISALLOCATE");
-                       exit( FALSE);
-               }
-       } else
+               if (ioctl(fd, VT_DISALLOCATE, 0))
+                       perror_msg_and_die("VT_DISALLOCATE");
+       } else {
                for (i = 1; i < argc; i++) {
                        num = atoi(argv[i]);
                        if (num == 0)
-                               errorMsg("0: illegal VT number\n");
+                               error_msg("0: illegal VT number");
                        else if (num == 1)
-                               errorMsg("VT 1 cannot be deallocated\n");
-                       else if (ioctl(fd, VT_DISALLOCATE, num)) {
-                               perror("VT_DISALLOCATE");
-                               errorMsg("could not deallocate console %d\n", num);
-                               exit( FALSE);
-                       }
+                               error_msg("VT 1 cannot be deallocated");
+                       else if (ioctl(fd, VT_DISALLOCATE, num))
+                               perror_msg_and_die("VT_DISALLOCATE");
                }
-       return( TRUE);
+       }
+
+       return EXIT_SUCCESS;
 }