diff --git a/doc/coreutils.texi b/doc/coreutils.texi index 332896d..d568bab 100644 --- a/doc/coreutils.texi +++ b/doc/coreutils.texi @@ -16902,7 +16902,7 @@ env -[v]S'[@var{option}]@dots{} [@var{name}=@var{value}]@dots{} @c env @end example -@exdent @command{env} is commonly used on first line of scripts (shebang line): +@command{env} is commonly used on first line of scripts (shebang line): @example #!/usr/bin/env @var{command} #!/usr/bin/env -[v]S[@var{option}]@dots{} [@var{name}=@var{value}]@dots{} @c diff --git a/src/env.c b/src/env.c index 68dcf88..53d2934 100644 --- a/src/env.c +++ b/src/env.c @@ -37,8 +37,8 @@ /* array of envvars to unset. */ static const char** usvars; -size_t usvars_alloc; -size_t usvars_used; +static size_t usvars_alloc; +static size_t usvars_used; /* Annotate the output with extra info to aid the user. */ static bool dev_debug; @@ -68,10 +68,7 @@ usage (int status) else { printf (_("\ -Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n"), - program_name); - printf (_("\ - or: %s -[v]S'[OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]'\n"), +Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n"), program_name); fputs (_("\ Set each NAME to VALUE in the environment and run COMMAND.\n\ @@ -88,8 +85,8 @@ Set each NAME to VALUE in the environment and run COMMAND.\n\ -C, --chdir=DIR change working directory to DIR\n\ "), stdout); fputs (_("\ - -S, --split-string=S process and split S into separate arguments\n\ - used to pass multiple arguments on shebang lines\n\ + -S, --split-string=S process and split S into separate arguments;\n\ + used to pass multiple arguments on shebang lines\n\ -v, --debug print verbose information for each processing step\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout);