Fix the bandaid.

diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c
index a5b5a03f01d1e8185bd5a00dc8c202e18f513401..bb9632fdec3e8ff278520864f182fb71dfe1cdca 100644 (file)
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -17,18 +17,21 @@ 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) {
+printf("erik: A\n");
                /* deallocate all unused consoles */
                if (ioctl(fd, VT_DISALLOCATE, 0)) {
                        perror("VT_DISALLOCATE");
                        exit( FALSE);
                }
        } else
+printf("erik: B\n");
                for (i = 1; i < argc; i++) {
                        num = atoi(argv[i]);
                        if (num == 0)
@@ -37,9 +40,9 @@ int deallocvt_main(int argc, char *argv[])
                                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);
+                               fatalError("could not deallocate console %d\n", num);
                        }
                }
+printf("erik: C\n");
        return( TRUE);
 }

diff --git a/deallocvt.c b/deallocvt.c
index a5b5a03f01d1e8185bd5a00dc8c202e18f513401..bb9632fdec3e8ff278520864f182fb71dfe1cdca 100644 (file)
--- a/deallocvt.c
+++ b/deallocvt.c
@@ -17,18 +17,21 @@ 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) {
+printf("erik: A\n");
                /* deallocate all unused consoles */
                if (ioctl(fd, VT_DISALLOCATE, 0)) {
                        perror("VT_DISALLOCATE");
                        exit( FALSE);
                }
        } else
+printf("erik: B\n");
                for (i = 1; i < argc; i++) {
                        num = atoi(argv[i]);
                        if (num == 0)
@@ -37,9 +40,9 @@ int deallocvt_main(int argc, char *argv[])
                                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);
+                               fatalError("could not deallocate console %d\n", num);
                        }
                }
+printf("erik: C\n");
        return( TRUE);
 }