diff options
| author | Sami Kerola | 2013-08-17 20:15:13 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-08-23 10:58:55 +0200 |
| commit | 1bd68aab3b3495f62b9eb596524e7fab73e7135d (patch) | |
| tree | 367cd289b2c71e5fe567d2d1e72abffbef4f228f /login-utils | |
| parent | last: use carefulput() for printable character output (diff) | |
| download | kernel-qcow2-util-linux-1bd68aab3b3495f62b9eb596524e7fab73e7135d.tar.gz kernel-qcow2-util-linux-1bd68aab3b3495f62b9eb596524e7fab73e7135d.tar.xz kernel-qcow2-util-linux-1bd68aab3b3495f62b9eb596524e7fab73e7135d.zip | |
last: check expected numeric user input is number
This commit also changes the line count to use unsigned integers, as
negative numbers in this context does not make sense.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'login-utils')
| -rw-r--r-- | login-utils/Makemodule.am | 2 | ||||
| -rw-r--r-- | login-utils/last.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am index e4361ede2..8d65cc583 100644 --- a/login-utils/Makemodule.am +++ b/login-utils/Makemodule.am @@ -4,7 +4,7 @@ usrbin_exec_PROGRAMS += last dist_man_MANS += \ login-utils/last.1 \ login-utils/lastb.1 -last_SOURCES = login-utils/last.c +last_SOURCES = login-utils/last.c lib/strutils.c install-exec-hook-last: cd $(DESTDIR)$(usrsbin_execdir) && ln -sf last lastb diff --git a/login-utils/last.c b/login-utils/last.c index f08632bbf..f188092c8 100644 --- a/login-utils/last.c +++ b/login-utils/last.c @@ -46,6 +46,7 @@ #include "xalloc.h" #include "closestream.h" #include "carefulputc.h" +#include "strutils.h" #ifndef SHUTDOWN_TIME # define SHUTDOWN_TIME 254 @@ -72,8 +73,8 @@ struct utmplist *utmplist = NULL; #define R_TIMECHANGE 7 /* NEW_TIME or OLD_TIME */ /* Global variables */ -static int maxrecs = 0; /* Maximum number of records to list. */ -static int recsdone = 0; /* Number of records listed */ +static unsigned int maxrecs = 0; /* Maximum number of records to list. */ +static unsigned int recsdone = 0; /* Number of records listed */ static int showhost = 1; /* Show hostname too? */ static int altlist = 0; /* Show hostname at the end. */ static int usedns = 0; /* Use DNS to lookup the hostname. */ @@ -540,7 +541,7 @@ int main(int argc, char **argv) extended = 1; break; case 'n': - maxrecs = atoi(optarg); + maxrecs = strtos32_or_err(optarg, _("failed to parse number")); break; case 'f': altufile = xstrdup(optarg); |