emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openvt: handle -ws correctly. By James Simmons <jsimmons AT infradead.org>

Browse Source 
function                                             old     new   delta
openvt_main                                          343     429     +86
This commit is contained in:
Denis Vlasenko 2008-04-19 03:44:45 +00:00
parent 50d068cb76
commit 1b2d0b2821
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
console-tools/openvt.c
View File

@ -107,6 +107,7 @@ int openvt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int openvt_main(int argc ATTRIBUTE_UNUSED, char **argv) int openvt_main(int argc ATTRIBUTE_UNUSED, char **argv)
{ {
char vtname[sizeof(VC_FORMAT) + sizeof(int)*3]; char vtname[sizeof(VC_FORMAT) + sizeof(int)*3];
struct vt_stat vtstat;
char *str_c; char *str_c;
int vtno; int vtno;
int flags; int flags;
@ -137,6 +138,7 @@ int openvt_main(int argc ATTRIBUTE_UNUSED, char **argv)
close(0); close(0);
/*setsid(); - BAD IDEA: after we exit, child is SIGHUPed... */ /*setsid(); - BAD IDEA: after we exit, child is SIGHUPed... */
xopen(vtname, O_RDWR); xopen(vtname, O_RDWR);
xioctl(0, VT_GETSTATE, &vtstat);
if (flags & OPT_s) { if (flags & OPT_s) {
xioctl(0, VT_ACTIVATE, (void*)(ptrdiff_t)vtno); xioctl(0, VT_ACTIVATE, (void*)(ptrdiff_t)vtno);
@ -163,9 +165,16 @@ int openvt_main(int argc ATTRIBUTE_UNUSED, char **argv)
vfork_child(argv); vfork_child(argv);
if (flags & OPT_w) { if (flags & OPT_w) {
wait(NULL); /* We have only one child, wait for it */
// TODO: -ws handling should be here 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; return EXIT_SUCCESS;
} }