- patch from Denis Vlasenko to add and use bb_xchdir()

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

diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c
index 363ecdf12abf906111f9c4a41a7410d66c318452..853b2b48975f4387677660d8b986b51720fdebd1 100644 (file)
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -3,13 +3,13 @@
  * Disallocate virtual terminal(s)
  *
  * Copyright (C) 2003 by Tito Ragusa <farmatito@tiscali.it>
- * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -30,26 +30,26 @@
 #include "busybox.h"
 
 /* From <linux/vt.h> */
-static const int VT_DISALLOCATE = 0x5608;  /* free memory associated to vt */
+enum { VT_DISALLOCATE = 0x5608 }; /* free memory associated to vt */
 
 int deallocvt_main(int argc, char *argv[])
 {
        /* num = 0 deallocate all unused consoles */
        int num = 0;
 
-       switch(argc)
-       {
+       switch (argc) {
                case 2:
-                       if((num = bb_xgetlarg(argv[1], 10, 0, INT_MAX)) == 0)
+                       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;