Update internal.h to conditionally include asm/string.h

[oweals/busybox.git] / deallocvt.c

diff --git a/deallocvt.c b/deallocvt.c
index ae4dbb5a8cc93f4d288f9f983cf0b78d6fa88b28..b65f7b098fb8cdfdc26a95b9dbe81cb3f17ec900 100644 (file)
--- a/deallocvt.c
+++ b/deallocvt.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * disalloc.c - aeb - 940501 - Disallocate virtual terminal(s)
  * Renamed deallocvt.
@@ -10,39 +11,45 @@
 #include <linux/vt.h>
 #include <stdio.h>
 
-extern int getfd(void);
 char *progname;
 
-int
-deallocvt_main(int argc, char *argv[]) {
-    int fd, num, i;
+int deallocvt_main(int argc, char *argv[])
+{
+       int fd, num, i;
 
-    if (argc < 1)              /* unlikely */
-      exit(1);
-    progname = argv[0];
+       if ((argc != 2) || (**(argv + 1) == '-')) {
+               usage
+                       ("deallocvt N\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+                        "\nDeallocate unused virtual terminal /dev/ttyN\n"
+#endif
+                        );
+       }
 
-    fd = get_console_fd("/dev/console");
+       progname = argv[0];
 
-    if (argc == 1) {
-       /* deallocate all unused consoles */
-       if (ioctl(fd,VT_DISALLOCATE,0)) {
-           perror("VT_DISALLOCATE");
-           exit(1);
-       }
-    } else
-    for (i = 1; i < argc; i++) {
-       num = atoi(argv[i]);
-       if (num == 0)
-           fprintf(stderr, "%s: 0: illegal VT number\n", progname);
-       else if (num == 1)
-           fprintf(stderr, "%s: VT 1 cannot be deallocated\n", progname);
-       else
-       if (ioctl(fd,VT_DISALLOCATE,num)) {
-           perror("VT_DISALLOCATE");
-           fprintf(stderr, "%s: could not deallocate console %d\n",
-                   progname, num);
-           exit(1);
-       }
-    }
-    exit(0);
+       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
+               for (i = 1; i < argc; i++) {
+                       num = atoi(argv[i]);
+                       if (num == 0)
+                               fprintf(stderr, "%s: 0: illegal VT number\n", progname);
+                       else if (num == 1)
+                               fprintf(stderr, "%s: VT 1 cannot be deallocated\n",
+                                               progname);
+                       else if (ioctl(fd, VT_DISALLOCATE, num)) {
+                               perror("VT_DISALLOCATE");
+                               fprintf(stderr, "%s: could not deallocate console %d\n",
+                                               progname, num);
+                               exit( FALSE);
+                       }
+               }
+       return( TRUE);
 }