bug-coreutils
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

coreutils usage message improvements inspired by Debian


From: Paul Eggert
Subject: coreutils usage message improvements inspired by Debian
Date: Tue, 16 Nov 2004 12:48:12 -0800
User-agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (gnu/linux)

I installed this, inspired by similar changes in Debain coreutils 5.2.1-2.

2004-11-16  Paul Eggert  <address@hidden>

        * src/cut.c (usage): Improve documentation along the lines suggested
        by Debian 5.2.1-2.
        * src/echo.c (usage): Likewise.
        * src/expr.c (usage): Likewise.

Index: src/cut.c
===================================================================
RCS file: /fetish/cu/src/cut.c,v
retrieving revision 1.115
diff -p -u -r1.115 cut.c
--- src/cut.c   21 Sep 2004 22:26:42 -0000      1.115
+++ src/cut.c   16 Nov 2004 20:27:47 -0000
@@ -211,7 +211,9 @@ Mandatory arguments to long options are 
       fputs (_("\
 \n\
 Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n\
-range, or many ranges separated by commas.  Each range is one of:\n\
+range, or many ranges separated by commas.  Selected input is written\n\
+in the same order that it is read, and is written exactly once.\n\
+Each range is one of:\n\
 \n\
   N     N'th byte, character or field, counted from 1\n\
   N-    from N'th byte, character or field, to end of line\n\
Index: src/echo.c
===================================================================
RCS file: /fetish/cu/src/echo.c,v
retrieving revision 1.56
diff -p -u -r1.56 echo.c
--- src/echo.c  20 Sep 2004 06:32:10 -0000      1.56
+++ src/echo.c  16 Nov 2004 20:27:49 -0000
@@ -65,11 +65,16 @@ usage (int status)
       fputs (_("\
 Echo the STRING(s) to standard output.\n\
 \n\
-  -n              do not output the trailing newline\n\
-  -e              enable interpretation of the backslash-escaped characters\n\
-                    listed below\n\
-  -E              disable interpretation of those sequences in STRINGs\n\
+  -n             do not output the trailing newline\n\
 "), stdout);
+      fputs (_(DEFAULT_ECHO_TO_XPG
+              ? "\
+  -e             enable interpretation of backslash escapes (default)\n\
+  -E             disable interpretation of backslash escapes\n"
+              : "\
+  -e             enable interpretation of backslash escapes\n\
+  -E             disable interpretation of backslash escapes (default)\n"),
+            stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
       fputs (_("\
Index: src/expr.c
===================================================================
RCS file: /fetish/cu/src/expr.c,v
retrieving revision 1.96
diff -p -u -r1.96 expr.c
--- src/expr.c  5 Oct 2004 06:33:53 -0000       1.96
+++ src/expr.c  16 Nov 2004 20:27:50 -0000
@@ -154,6 +154,11 @@ Comparisons are arithmetic if both ARGs 
 Pattern matches return the string matched between \\( and \\) or null; if\n\
 \\( and \\) are not used, they return the number of characters matched or 0.\n\
 "), stdout);
+      fputs (_("\
+\n\
+Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is 
null\n\
+or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n\
+"), stdout);
       printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);




reply via email to

[Prev in Thread] Current Thread [Next in Thread]