diff options
author | Rob Landley <rob@landley.net> | 2008-01-26 23:18:08 -0600 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2008-01-26 23:18:08 -0600 |
commit | 5c4a217cfbcb795a5ebc345a9efe9a1990801d1b (patch) | |
tree | 80e631a96a107a1881c665f062533cb626de26dc | |
parent | 5c010f7e4464c89ec38fca61362982aca33edfe1 (diff) | |
download | toybox-5c4a217cfbcb795a5ebc345a9efe9a1990801d1b.tar.gz |
Comment and whitespace cleanups by Charlie Shepherd (code's the same).
-rw-r--r-- | toys/chvt.c | 46 |
1 files changed, 19 insertions, 27 deletions
diff --git a/toys/chvt.c b/toys/chvt.c index c32a021f..445b8f71 100644 --- a/toys/chvt.c +++ b/toys/chvt.c @@ -1,7 +1,7 @@ /* vi: set sw=4 ts=4: * - * chvt.c switch virtual terminals - * + * chvt.c - switch virtual terminals + * * Copyright (C) 2008 David Anders <danders@amltd.com> * * Not in SUSv3. @@ -23,47 +23,39 @@ config CHVT #include "toys.h" -#define VT_ACTIVATE 0x5606 +#define VT_ACTIVATE 0x5606 #define VT_WAITACTIVE 0x5607 -/* note get_console_fb() will need to be moved into a seperate lib section */ +/* Note: get_console_fb() will need to be moved into a seperate lib section */ int get_console_fd() { - int fd; + int fd; - fd = open("/dev/console", O_RDWR); - if (fd >= 0) - return fd; + fd = open("/dev/console", O_RDWR); + if (fd >= 0) return fd; - fd = open("/dev/vc/0", O_RDWR); - if (fd >= 0) - return fd; + fd = open("/dev/vc/0", O_RDWR); + if (fd >= 0) return fd; - fd = open("/dev/tty", O_RDWR); - if (fd >= 0) - return fd; + fd = open("/dev/tty", O_RDWR); + if (fd >= 0) return fd; - return -1; + return -1; } void chvt_main(void) { - int vtnum,fd; + int vtnum, fd; - if(!*toys.optargs) - return; + if(!*toys.optargs) return; - vtnum=atoi(*toys.optargs); + vtnum=atoi(*toys.optargs); - fd=get_console_fd(); - if (fd < 0) - return; + fd=get_console_fd(); + if (fd < 0) return; - if (ioctl(fd,VT_ACTIVATE,vtnum)) - return; - - if (ioctl(fd,VT_WAITACTIVE,vtnum)) - return; + if (ioctl(fd,VT_ACTIVATE,vtnum)) return; + if (ioctl(fd,VT_WAITACTIVE,vtnum)) return; } |