aboutsummaryrefslogtreecommitdiff
path: root/toys/posix/echo.c
diff options
context:
space:
mode:
Diffstat (limited to 'toys/posix/echo.c')
-rw-r--r--toys/posix/echo.c132
1 files changed, 64 insertions, 68 deletions
diff --git a/toys/posix/echo.c b/toys/posix/echo.c
index 1bf4d399..28284bfb 100644
--- a/toys/posix/echo.c
+++ b/toys/posix/echo.c
@@ -1,6 +1,4 @@
-/* vi: set sw=4 ts=4:
- *
- * echo.c - echo supporting -n and -e.
+/* echo.c - echo supporting -n and -e.
*
* Copyright 2007 Rob Landley <rob@landley.net>
*
@@ -9,27 +7,27 @@
USE_ECHO(NEWTOY(echo, "^?en", TOYFLAG_BIN))
config ECHO
- bool "echo"
- default y
- help
- usage: echo [-ne] [args...]
+ bool "echo"
+ default y
+ help
+ usage: echo [-ne] [args...]
- Write each argument to stdout, with one space between each, followed
- by a newline.
+ Write each argument to stdout, with one space between each, followed
+ by a newline.
- -n No trailing newline.
- -e Process the following escape sequences:
- \\ backslash
- \0NNN octal values (1 to 3 digits)
- \a alert (beep/flash)
- \b backspace
- \c stop output here (avoids trailing newline)
- \f form feed
- \n newline
- \r carriage return
- \t horizontal tab
- \v vertical tab
- \xHH hexadecimal values (1 to 2 digits)
+ -n No trailing newline.
+ -e Process the following escape sequences:
+ \\ backslash
+ \0NNN octal values (1 to 3 digits)
+ \a alert (beep/flash)
+ \b backspace
+ \c stop output here (avoids trailing newline)
+ \f form feed
+ \n newline
+ \r carriage return
+ \t horizontal tab
+ \v vertical tab
+ \xHH hexadecimal values (1 to 2 digits)
*/
#define FOR_echo
@@ -37,58 +35,56 @@ config ECHO
void echo_main(void)
{
- int i = 0, out;
- char *arg, *from = "\\abfnrtv", *to = "\\\a\b\f\n\r\t\v", *c;
+ int i = 0, out;
+ char *arg, *from = "\\abfnrtv", *to = "\\\a\b\f\n\r\t\v", *c;
- for (;;) {
- arg = toys.optargs[i];
- if (!arg) break;
- if (i++) xputc(' ');
+ for (;;) {
+ arg = toys.optargs[i];
+ if (!arg) break;
+ if (i++) xputc(' ');
- // Should we output arg verbatim?
+ // Should we output arg verbatim?
- if (!(toys.optflags&FLAG_e)) {
- xprintf("%s", arg);
- continue;
- }
+ if (!(toys.optflags & FLAG_e)) {
+ xprintf("%s", arg);
+ continue;
+ }
- // Handle -e
+ // Handle -e
- for (c=arg;;) {
- if (!(out = *(c++))) break;
+ for (c=arg;;) {
+ if (!(out = *(c++))) break;
- // handle \escapes
- if (out == '\\' && *c) {
- int n = 0, slash = *(c++);
- char *found = strchr(from, slash);
- if (found) out = to[found-from];
- else if (slash == 'c') goto done;
- else if (slash == '0') {
- out = 0;
- while (*c>='0' && *c<='7' && n++<3)
- out = (out*8)+*(c++)-'0';
- } else if (slash == 'x') {
- out = 0;
- while (n++<2) {
- if (*c>='0' && *c<='9')
- out = (out*16)+*(c++)-'0';
- else {
- int temp = tolower(*c);
- if (temp>='a' && temp<='f') {
- out = (out*16)+temp-'a'+10;
- c++;
- } else break;
- }
- }
- // Slash in front of unknown character, print literal.
- } else c--;
- }
- xputc(out);
- }
- }
+ // handle \escapes
+ if (out == '\\' && *c) {
+ int n = 0, slash = *(c++);
+ char *found = strchr(from, slash);
+ if (found) out = to[found-from];
+ else if (slash == 'c') goto done;
+ else if (slash == '0') {
+ out = 0;
+ while (*c>='0' && *c<='7' && n++<3) out = (out*8)+*(c++)-'0';
+ } else if (slash == 'x') {
+ out = 0;
+ while (n++<2) {
+ if (*c>='0' && *c<='9') out = (out*16)+*(c++)-'0';
+ else {
+ int temp = tolower(*c);
+ if (temp>='a' && temp<='f') {
+ out = (out*16)+temp-'a'+10;
+ c++;
+ } else break;
+ }
+ }
+ // Slash in front of unknown character, print literal.
+ } else c--;
+ }
+ xputc(out);
+ }
+ }
- // Output "\n" if no -n
- if (!(toys.optflags&FLAG_n)) xputc('\n');
+ // Output "\n" if no -n
+ if (!(toys.optflags&FLAG_n)) xputc('\n');
done:
- xflush();
+ xflush();
}