From a514bc402cc5632e8986d55caeb49b664b6fe9e6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?P=C3=A1draig=20Brady?=
Date: Thu, 6 Sep 2012 10:34:00 +0100 Subject: [PATCH] nproc: disallow non option command line parameters * src/nproc.c (main): Error if any non option parameters. * NEWS: Mention the change in behavior. --- NEWS | 4 ++++ src/nproc.c | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/NEWS b/NEWS index 63fa042a33..995fafb776 100644 --- a/NEWS +++ b/NEWS @@ -23,6 +23,10 @@ GNU coreutils NEWS -*- outline -*- "Too many levels of symbolic links" diagnostic. [bug introduced in coreutils-8.6] +** Changes in behavior + + nproc now diagnoses with an error, non option command line parameters. + ** Improvements stat and tail work better with ZFS and VZFS. stat -f --format=%T now diff --git a/src/nproc.c b/src/nproc.c index a93ee536bb..98a1b9aca6 100644 --- a/src/nproc.c +++ b/src/nproc.c @@ -24,6 +24,7 @@ #include "system.h" #include "error.h" #include "nproc.h" +#include "quote.h" #include "xstrtol.h" /* The official name of this program (e.g., no 'g' prefix). */ @@ -113,6 +114,12 @@ main (int argc, char **argv) } } + if (argc != optind) + { + error (0, 0, _("extra operand %s"), quote (argv[optind])); + usage (EXIT_FAILURE); + } + nproc = num_processors (mode); if (ignore < nproc) -- 2.47.2