Fix the bandaid.

This commit is contained in:
Eric Andersen 2000-09-23 19:55:59 +00:00
parent 96bdde97fb
commit 32e95f988d
2 changed files with 12 additions and 6 deletions

View File

@ -17,18 +17,21 @@ int deallocvt_main(int argc, char *argv[])
{ {
int fd, num, i; int fd, num, i;
if ((argc > 2) || ((argv == 2) && (**(argv + 1) == '-'))) //if ((argc > 2) || ((argv == 2) && (**(argv + 1) == '-')))
if (argc > 2)
usage(deallocvt_usage); usage(deallocvt_usage);
fd = get_console_fd("/dev/console"); fd = get_console_fd("/dev/console");
if (argc == 1) { if (argc == 1) {
printf("erik: A\n");
/* deallocate all unused consoles */ /* deallocate all unused consoles */
if (ioctl(fd, VT_DISALLOCATE, 0)) { if (ioctl(fd, VT_DISALLOCATE, 0)) {
perror("VT_DISALLOCATE"); perror("VT_DISALLOCATE");
exit( FALSE); exit( FALSE);
} }
} else } else
printf("erik: B\n");
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
num = atoi(argv[i]); num = atoi(argv[i]);
if (num == 0) if (num == 0)
@ -37,9 +40,9 @@ int deallocvt_main(int argc, char *argv[])
errorMsg("VT 1 cannot be deallocated\n"); errorMsg("VT 1 cannot be deallocated\n");
else if (ioctl(fd, VT_DISALLOCATE, num)) { else if (ioctl(fd, VT_DISALLOCATE, num)) {
perror("VT_DISALLOCATE"); perror("VT_DISALLOCATE");
errorMsg("could not deallocate console %d\n", num); fatalError("could not deallocate console %d\n", num);
exit( FALSE);
} }
} }
printf("erik: C\n");
return( TRUE); return( TRUE);
} }

View File

@ -17,18 +17,21 @@ int deallocvt_main(int argc, char *argv[])
{ {
int fd, num, i; int fd, num, i;
if ((argc > 2) || ((argv == 2) && (**(argv + 1) == '-'))) //if ((argc > 2) || ((argv == 2) && (**(argv + 1) == '-')))
if (argc > 2)
usage(deallocvt_usage); usage(deallocvt_usage);
fd = get_console_fd("/dev/console"); fd = get_console_fd("/dev/console");
if (argc == 1) { if (argc == 1) {
printf("erik: A\n");
/* deallocate all unused consoles */ /* deallocate all unused consoles */
if (ioctl(fd, VT_DISALLOCATE, 0)) { if (ioctl(fd, VT_DISALLOCATE, 0)) {
perror("VT_DISALLOCATE"); perror("VT_DISALLOCATE");
exit( FALSE); exit( FALSE);
} }
} else } else
printf("erik: B\n");
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
num = atoi(argv[i]); num = atoi(argv[i]);
if (num == 0) if (num == 0)
@ -37,9 +40,9 @@ int deallocvt_main(int argc, char *argv[])
errorMsg("VT 1 cannot be deallocated\n"); errorMsg("VT 1 cannot be deallocated\n");
else if (ioctl(fd, VT_DISALLOCATE, num)) { else if (ioctl(fd, VT_DISALLOCATE, num)) {
perror("VT_DISALLOCATE"); perror("VT_DISALLOCATE");
errorMsg("could not deallocate console %d\n", num); fatalError("could not deallocate console %d\n", num);
exit( FALSE);
} }
} }
printf("erik: C\n");
return( TRUE); return( TRUE);
} }