aboutsummaryrefslogtreecommitdiff
path: root/console-tools/openvt.c
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-04-19 03:44:45 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-04-19 03:44:45 +0000
commit1b2d0b28213d7f0cc03cb9546fa41318c95f6215 (patch)
tree0714625a9f7b0d8d119467d0f134cdb41c674b7d /console-tools/openvt.c
parent50d068cb76baa7d37b948d021d3b16e2798ed7cf (diff)
downloadbusybox-1b2d0b28213d7f0cc03cb9546fa41318c95f6215.tar.gz
busybox-1b2d0b28213d7f0cc03cb9546fa41318c95f6215.tar.bz2
openvt: handle -ws correctly. By James Simmons <jsimmons AT infradead.org>
function old new delta openvt_main 343 429 +86
Diffstat (limited to 'console-tools/openvt.c')
-rw-r--r--console-tools/openvt.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/console-tools/openvt.c b/console-tools/openvt.c
index 6f2aa19c4..3bb0a9210 100644
--- a/console-tools/openvt.c
+++ b/console-tools/openvt.c
@@ -107,6 +107,7 @@ int openvt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int openvt_main(int argc ATTRIBUTE_UNUSED, char **argv)
{
char vtname[sizeof(VC_FORMAT) + sizeof(int)*3];
+ struct vt_stat vtstat;
char *str_c;
int vtno;
int flags;
@@ -137,6 +138,7 @@ int openvt_main(int argc ATTRIBUTE_UNUSED, char **argv)
close(0);
/*setsid(); - BAD IDEA: after we exit, child is SIGHUPed... */
xopen(vtname, O_RDWR);
+ xioctl(0, VT_GETSTATE, &vtstat);
if (flags & OPT_s) {
xioctl(0, VT_ACTIVATE, (void*)(ptrdiff_t)vtno);
@@ -163,9 +165,16 @@ int openvt_main(int argc ATTRIBUTE_UNUSED, char **argv)
vfork_child(argv);
if (flags & OPT_w) {
- wait(NULL);
-// TODO: -ws handling should be here
+ /* We have only one child, wait for it */
+ safe_waitpid(-1, NULL, 0); /* loops on EINTR */
+ if (flags & OPT_s) {
+ xioctl(0, VT_ACTIVATE, (void*)(ptrdiff_t)(vtstat.v_active));
+ xioctl(0, VT_WAITACTIVE, (void*)(ptrdiff_t)(vtstat.v_active));
+ // Compat: even with -c N (try to) disallocate:
+ // # /usr/app/kbd-1.12/bin/openvt -f -c 9 -ws sleep 5
+ // openvt: could not deallocate console 9
+ xioctl(0, VT_DISALLOCATE, (void*)(ptrdiff_t)vtno);
+ }
}
-
return EXIT_SUCCESS;
}