From 1266a13e1f687d34052ae7e2469048d035633e58 Mon Sep 17 00:00:00 2001 From: Erik Andersen Date: Wed, 29 Dec 1999 22:19:46 +0000 Subject: * sed now supports addresses (numeric or regexp, with negation) and has an append command, thanks to Marco Pantaleoni * Fixed dmesg. It wasn't parsing its options (-n or -s) properly. * Some cosmetic fixes to ls output formatting to make it behave more like GNU ls. -Erik --- util-linux/dmesg.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'util-linux') diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c index aa26f5836..e38fd5555 100644 --- a/util-linux/dmesg.c +++ b/util-linux/dmesg.c @@ -44,10 +44,15 @@ int dmesg_main( int argc, char** argv ) int level = 0; int lastc; int cmd = 3; + int stopDoingThat; + + argc--; + argv++; /* Parse any options */ while (argc && **argv == '-') { - while (*++(*argv)) + stopDoingThat = FALSE; + while (stopDoingThat == FALSE && *++(*argv)) { switch (**argv) { case 'c': cmd = 4; @@ -57,19 +62,22 @@ int dmesg_main( int argc, char** argv ) if (--argc == 0) goto end; level = atoi (*(++argv)); - --argc; - ++argv; + if (--argc > 0) + ++argv; + stopDoingThat = TRUE; break; case 's': if (--argc == 0) goto end; bufsize = atoi (*(++argv)); - --argc; - ++argv; + if (--argc > 0) + ++argv; + stopDoingThat = TRUE; break; default: goto end; } + } } if (argc > 1) { -- cgit v1.2.3