X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=console-tools%2Fchvt.c;h=b9c974f4a49e9f29b1d7ad3fbc355b24f4b72858;hb=45dc96c8a6dce3aeea983f6c32572d4cee646b5d;hp=b1a429eb38ce21f1a233fb4d451fca5b9a67629a;hpb=9f0e00fc61858a0e3cc6711b78e95c57b484ef7c;p=oweals%2Fbusybox.git diff --git a/console-tools/chvt.c b/console-tools/chvt.c index b1a429eb3..b9c974f4a 100644 --- a/console-tools/chvt.c +++ b/console-tools/chvt.c @@ -4,56 +4,20 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ -/* no options, no getopt */ +//usage:#define chvt_trivial_usage +//usage: "N" +//usage:#define chvt_full_usage "\n\n" +//usage: "Change the foreground virtual terminal to /dev/ttyN" -#include -#include -#include -#include -#include -#include "busybox.h" +#include "libbb.h" -/* From */ -static const int VT_ACTIVATE = 0x5606; /* make vt active */ -static const int VT_WAITACTIVE = 0x5607; /* wait for vt active */ - -int chvt_main(int argc, char **argv) +int chvt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int chvt_main(int argc UNUSED_PARAM, char **argv) { - int fd, num; - - if (argc != 2) { - bb_show_usage(); - } - - fd = get_console_fd(); - num = bb_xgetlarg(argv[1], 10, 0, INT_MAX); - if((-1 == ioctl(fd, VT_ACTIVATE, num)) || - (-1 == ioctl(fd, VT_WAITACTIVE, num))) { - bb_perror_msg_and_die("ioctl"); - } + int num = xatou_range(single_argv(argv), 1, 63); + console_make_active(get_console_fd_or_die(), num); return EXIT_SUCCESS; } - - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/