aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chvt.c12
-rw-r--r--console-tools/chvt.c12
2 files changed, 8 insertions, 16 deletions
diff --git a/chvt.c b/chvt.c
index 790964586..76d4b53a6 100644
--- a/chvt.c
+++ b/chvt.c
@@ -23,14 +23,10 @@ int chvt_main(int argc, char **argv)
23 usage (chvt_usage); 23 usage (chvt_usage);
24 fd = get_console_fd("/dev/console"); 24 fd = get_console_fd("/dev/console");
25 num = atoi(argv[1]); 25 num = atoi(argv[1]);
26 if (ioctl(fd, VT_ACTIVATE, num)) { 26 if (ioctl(fd, VT_ACTIVATE, num))
27 perror("VT_ACTIVATE"); 27 perror_msg_and_die("VT_ACTIVATE");
28 return EXIT_FAILURE; 28 if (ioctl(fd, VT_WAITACTIVE, num))
29 } 29 perror_msg_and_die("VT_WAITACTIVE");
30 if (ioctl(fd, VT_WAITACTIVE, num)) {
31 perror("VT_WAITACTIVE");
32 return EXIT_FAILURE;
33 }
34 return EXIT_SUCCESS; 30 return EXIT_SUCCESS;
35} 31}
36 32
diff --git a/console-tools/chvt.c b/console-tools/chvt.c
index 790964586..76d4b53a6 100644
--- a/console-tools/chvt.c
+++ b/console-tools/chvt.c
@@ -23,14 +23,10 @@ int chvt_main(int argc, char **argv)
23 usage (chvt_usage); 23 usage (chvt_usage);
24 fd = get_console_fd("/dev/console"); 24 fd = get_console_fd("/dev/console");
25 num = atoi(argv[1]); 25 num = atoi(argv[1]);
26 if (ioctl(fd, VT_ACTIVATE, num)) { 26 if (ioctl(fd, VT_ACTIVATE, num))
27 perror("VT_ACTIVATE"); 27 perror_msg_and_die("VT_ACTIVATE");
28 return EXIT_FAILURE; 28 if (ioctl(fd, VT_WAITACTIVE, num))
29 } 29 perror_msg_and_die("VT_WAITACTIVE");
30 if (ioctl(fd, VT_WAITACTIVE, num)) {
31 perror("VT_WAITACTIVE");
32 return EXIT_FAILURE;
33 }
34 return EXIT_SUCCESS; 30 return EXIT_SUCCESS;
35} 31}
36 32