From e981643ae3e57affdf3f4f6aa8bf53cf06433f17 Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Thu, 30 Apr 2015 14:02:46 +0100 Subject: doc: standardize messages about the '-' stdin FILE * src/system.h (emit_stdin_note): A new function, refactoring the usage note about the '-' FILE implying stdin. * src/base64.c (usage): Use the new function to emit the note in a standard location and with standard separation. * src/cat.c (usage): Likewise. * src/csplit.c (usage): Likewise. * src/cut.c (usage): Likewise. * src/expand.c (usage): Likewise. * src/fmt.c (usage): Likewise. * src/head.c (usage): Likewise. * src/md5sum.c (usage): Likewise. * src/nl.c (usage): Likewise. * src/od.c (usage): Likewise. * src/paste.c (usage): Likewise. * src/pr.c (usage): Likewise. * src/ptx.c (usage): Likewise. * src/shred.c (usage): Likewise. * src/shuf.c (usage): Likewise. * src/sort.c (usage): Likewise. * src/sum.c (usage): Likewise. * src/tac.c (usage): Likewise. * src/tail.c (usage): Likewise. * src/tsort.c (usage): Likewise. * src/unexpand.c (usage): Likewise. * src/wc.c (usage): Likewise. * src/join.c (usage): Adjust the separation used for the message referring to FILE1 or FILE2 as stdin. * src/comm.c (usage): Add a message using the same wording (translation) as used in join. * src/split.c (usage): Reword to using FILE rather than INPUT, allowing use of emit_stdin_note(). Also remove the mention of "fixed-size" pieces as this isn't now always the case. Fixes http://pad.lv/1450179 --- src/od.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/od.c') diff --git a/src/od.c b/src/od.c index 2ea101b38..c1241f541 100644 --- a/src/od.c +++ b/src/od.c @@ -328,10 +328,12 @@ Usage: %s [OPTION]... [FILE]...\n\ Write an unambiguous representation, octal bytes by default,\n\ of FILE to standard output. With more than one FILE argument,\n\ concatenate them in the listed order to form the input.\n\ -With no FILE, or when FILE is -, read standard input.\n\ -\n\ "), stdout); + + emit_stdin_note (); + fputs (_("\ +\n\ If first and second call formats both apply, the second format is assumed\n\ if the last operand begins with + or (if there are 2 operands) a digit.\n\ An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n\ -- cgit v1.2.3-54-g00ecf