From a99c35b04d9ab601e4fa98319c56fbdbde6b420a Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 8 Jan 2009 06:33:16 -0700 Subject: 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. --- src/echo.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/echo.c') 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\ -- cgit v1.2.3-54-g00ecf