From 96088db02b2802049f1edbd44d5f8c2ea838f3f2 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 12 Feb 2013 00:31:13 +0100 Subject: [PATCH] journalctl: allow both "-n 55" and "-n55" on the command line, as equivalent syntaxes https://bugs.freedesktop.org/show_bug.cgi?id=60596 --- src/journal/journalctl.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 0ec2f331d..0afeef932 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -244,8 +244,25 @@ static int parse_argv(int argc, char *argv[]) { log_error("Failed to parse lines '%s'", optarg); return -EINVAL; } - } else - arg_lines = 10; + } else { + int n; + + /* Hmm, no argument? Maybe the next + * word on the command line is + * supposed to be the argument? Let's + * see if there is one, and is + * parsable as a positive + * integer... */ + + if (optind < argc && + safe_atoi(argv[optind], &n) >= 0 && + n >= 0) { + + arg_lines = n; + optind++; + } else + arg_lines = 10; + } break; -- 2.30.2