summaryrefslogtreecommitdiff
path: root/src/echo.c
diff options
context:
space:
mode:
authorEric Blake <ebb9@byu.net>2009-01-08 06:33:16 -0700
committerEric Blake <ebb9@byu.net>2009-01-08 07:57:36 -0700
commita99c35b04d9ab601e4fa98319c56fbdbde6b420a (patch)
tree264804f0a32ce73b8444dbbcced994058c758d1e /src/echo.c
parent5e3a5ae5193e0b14abd3d3428b1546bd15a20a8b (diff)
downloadcoreutils-a99c35b04d9ab601e4fa98319c56fbdbde6b420a.tar.xz
option handling: make exceptions more consistent
* doc/coreutils.texi (Common options): Not all utilities reject option abbreviations. * src/chroot.c (main): Report correct name on failure. * src/echo.c (usage): Clarify long option usage. * src/setuidgid.c (usage): Likewise. * src/hostid.c (usage): Condense.
Diffstat (limited to 'src/echo.c')
-rw-r--r--src/echo.c7
1 files changed, 5 insertions, 2 deletions
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\