diff options
| author | Eric Andersen <andersen@codepoet.org> | 2000-09-23 19:55:59 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2000-09-23 19:55:59 +0000 |
| commit | 32e95f988d3a395de375296ac4f955cc330d39bf (patch) | |
| tree | 6856d72dad548c58f8e1357815a3c491218b5305 | |
| parent | 96bdde97fb7ebb44a89404bb87dc8e8cd4ec7446 (diff) | |
Fix the bandaid.
| -rw-r--r-- | console-tools/deallocvt.c | 9 | ||||
| -rw-r--r-- | deallocvt.c | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c index a5b5a03f0..bb9632fde 100644 --- 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 a5b5a03f0..bb9632fde 100644 --- 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); } |