From 55dbbb7b3f726aa6fb836961f35d6128b6aa8adb Mon Sep 17 00:00:00 2001 From: sin Date: Mon, 30 Jun 2014 16:50:29 +0100 Subject: [PATCH] Use estrtol() instead of atoi() Some more stylistic fixes. --- chvt.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/chvt.c b/chvt.c index b0087be..b73712c 100644 --- a/chvt.c +++ b/chvt.c @@ -1,10 +1,11 @@ +/* See LICENSE file for copyright and license details. */ +#include #include #include #include -#include -#include -#include #include +#include +#include #include "util.h" #define KDGKBTYPE 0x4B33 /* get keyboard type */ @@ -32,25 +33,25 @@ main(int argc, char *argv[]) int fd; char c; - if(argc!=2 || strspn(argv[1], "1234567890") != strlen(argv[1])) + if (argc != 2 || strspn(argv[1], "1234567890") != strlen(argv[1])) usage(); - n = atoi(argv[1]); - for(i = 0; i < LEN(vts); i++) { + n = estrtol(argv[1], 10); + for (i = 0; i < LEN(vts); i++) { fd = open(vts[i], O_RDONLY); - if(fd < 1) + if (fd < 1) continue; c = 0; - if(ioctl(fd, KDGKBTYPE, &c) == 0) + if (ioctl(fd, KDGKBTYPE, &c) == 0) goto VTfound; close(fd); } eprintf("couldn't find a console.\n"); VTfound: - if(ioctl(fd, VT_ACTIVATE, n) == -1) + if (ioctl(fd, VT_ACTIVATE, n) == -1) eprintf("VT_ACTIVATE %d:", n); - if(ioctl(fd, VT_WAITACTIVE, n) == -1) + if (ioctl(fd, VT_WAITACTIVE, n) == -1) eprintf("VT_WAITACTIVE %d:", n); close(fd);