diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/chroot.c | 5 | ||||
-rw-r--r-- | src/echo.c | 7 | ||||
-rw-r--r-- | src/hostid.c | 8 | ||||
-rw-r--r-- | src/setuidgid.c | 6 |
4 files changed, 14 insertions, 12 deletions
diff --git a/src/chroot.c b/src/chroot.c index 1eb443c24..6d3fddf77 100644 --- a/src/chroot.c +++ b/src/chroot.c @@ -1,5 +1,5 @@ /* chroot -- run command or shell with special root directory - Copyright (C) 95, 96, 1997, 1999-2004, 2007-2008 + Copyright (C) 95, 96, 1997, 1999-2004, 2007-2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -83,7 +83,8 @@ main (int argc, char **argv) } if (chroot (argv[optind]) != 0) - error (EXIT_FAILURE, errno, _("cannot change root directory to %s"), argv[1]); + error (EXIT_FAILURE, errno, _("cannot change root directory to %s"), + argv[optind]); if (chdir ("/")) error (EXIT_FAILURE, errno, _("cannot chdir to root directory")); diff --git a/src/echo.c b/src/echo.c index d549cda2b..c4b7ca939 100644 --- a/src/echo.c +++ b/src/echo.c @@ -1,5 +1,5 @@ /* echo.c, derived from code echo.c in Bash. - Copyright (C) 87,89, 1991-1997, 1999-2005, 2007-2008 Free Software + Copyright (C) 87,89, 1991-1997, 1999-2005, 2007-2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -41,7 +41,10 @@ usage (int status) program_name); else { - printf (_("Usage: %s [OPTION]... [STRING]...\n"), program_name); + printf (_("\ +Usage: %s [SHORT-OPTION]... [STRING]...\n\ + or: %s LONG-OPTION\n\ +"), program_name, program_name); fputs (_("\ Echo the STRING(s) to standard output.\n\ \n\ diff --git a/src/hostid.c b/src/hostid.c index f3cabc47b..1da5a0c5c 100644 --- a/src/hostid.c +++ b/src/hostid.c @@ -1,6 +1,6 @@ /* print the hexadecimal identifier for the current host - Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2007-2008 Free + Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2007-2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -42,12 +42,10 @@ usage (int status) else { printf (_("\ -Usage: %s\n\ - or: %s OPTION\n\ +Usage: %s [OPTION]\n\ Print the numeric identifier (in hexadecimal) for the current host.\n\ \n\ -"), - program_name, program_name); +"), program_name); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); emit_bug_reporting_address (); diff --git a/src/setuidgid.c b/src/setuidgid.c index 057002cbf..beff04acb 100644 --- a/src/setuidgid.c +++ b/src/setuidgid.c @@ -1,5 +1,5 @@ /* setuidgid - run a command with the UID and GID of a specified user - Copyright (C) 2003-2008 Free Software Foundation, Inc. + Copyright (C) 2003-2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -48,8 +48,8 @@ usage (int status) else { printf (_("\ -Usage: %s OPTION USER COMMAND [ARGUMENT]...\n\ - or: %s OPTION\n\ +Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n\ + or: %s LONG-OPTION\n\ "), program_name, program_name); |