diff options
| author | Pádraig Brady <P@draigBrady.com> | 2009-10-28 10:59:05 +0000 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2009-10-28 17:01:29 +0000 |
| commit | c07b181396ca6d20b9852c448239bacc3d0baf54 (patch) | |
| tree | 37ae1305812ff8bde3ceccc62db1ee2c810be17b | |
| parent | 2904d675a49cdd7cb2372f50592a6823106aa0f7 (diff) | |
| download | coreutils-c07b181396ca6d20b9852c448239bacc3d0baf54.tar.xz | |
doc: improve the echo and printf help on escapes
* src/printf.c (usage): Merge strings with echo.c to
aid translators. Move the description for \NNN beside
the other numeric escape codes. Don't mention
"character" as that suggests character conversion.
* src/echo.c (usage): Likewise.
Also mention the \xHH escape sequence.
| -rw-r--r-- | src/echo.c | 25 | ||||
| -rw-r--r-- | src/printf.c | 6 |
2 files changed, 16 insertions, 15 deletions
diff --git a/src/echo.c b/src/echo.c index 65e8c80e4..b0cbe2294 100644 --- a/src/echo.c +++ b/src/echo.c @@ -63,19 +63,22 @@ Echo the STRING(s) to standard output.\n\ \n\ If -e is in effect, the following sequences are recognized:\n\ \n\ - \\0NNN the character whose ASCII code is NNN (octal)\n\ - \\\\ backslash\n\ - \\a alert (BEL)\n\ - \\b backspace\n\ "), stdout); fputs (_("\ - \\c produce no further output\n\ - \\e escape\n\ - \\f form feed\n\ - \\n new line\n\ - \\r carriage return\n\ - \\t horizontal tab\n\ - \\v vertical tab\n\ + \\\\ backslash\n\ + \\a alert (BEL)\n\ + \\b backspace\n\ + \\c produce no further output\n\ + \\e escape\n\ + \\f form feed\n\ + \\n new line\n\ + \\r carriage return\n\ + \\t horizontal tab\n\ + \\v vertical tab\n\ +"), stdout); + fputs (_("\ + \\0NNN byte with octal value NNN (1 to 3 digits)\n\ + \\xHH byte with hexadecimal value HH (1 to 2 digits)\n\ "), stdout); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); emit_ancillary_info (); diff --git a/src/printf.c b/src/printf.c index 540d7db3f..c0badd1de 100644 --- a/src/printf.c +++ b/src/printf.c @@ -102,23 +102,21 @@ Print ARGUMENT(s) according to FORMAT, or execute according to OPTION:\n\ FORMAT controls the output as in C printf. Interpreted sequences are:\n\ \n\ \\\" double quote\n\ - \\NNN character with octal value NNN (1 to 3 digits)\n\ - \\\\ backslash\n\ "), stdout); fputs (_("\ + \\\\ backslash\n\ \\a alert (BEL)\n\ \\b backspace\n\ \\c produce no further output\n\ \\e escape\n\ \\f form feed\n\ -"), stdout); - fputs (_("\ \\n new line\n\ \\r carriage return\n\ \\t horizontal tab\n\ \\v vertical tab\n\ "), stdout); fputs (_("\ + \\NNN byte with octal value NNN (1 to 3 digits)\n\ \\xHH byte with hexadecimal value HH (1 to 2 digits)\n\ \\uHHHH Unicode (ISO/IEC 10646) character with hex value HHHH (4 digits)\n\ \\UHHHHHHHH Unicode character with hex value HHHHHHHH (8 digits)\n\ |