diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2009-04-22 13:41:59 +1000 |
---|---|---|
committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2009-04-23 04:44:26 +1000 |
commit | 37ec9a93b0d1ba7d3252f36842155194c7f0c4c0 (patch) | |
tree | fc9373551e8e39d8528910dc0192a2333926c86b /coreutils/echo.c | |
parent | 95a9140eceb43d5dba205e171d7a5e09f67331ff (diff) | |
download | busybox-w32-37ec9a93b0d1ba7d3252f36842155194c7f0c4c0.tar.gz busybox-w32-37ec9a93b0d1ba7d3252f36842155194c7f0c4c0.tar.bz2 busybox-w32-37ec9a93b0d1ba7d3252f36842155194c7f0c4c0.zip |
fixes up to 1.6.1
Diffstat (limited to 'coreutils/echo.c')
-rw-r--r-- | coreutils/echo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coreutils/echo.c b/coreutils/echo.c index 9aad2c2ba..085e8516c 100644 --- a/coreutils/echo.c +++ b/coreutils/echo.c | |||
@@ -33,7 +33,9 @@ int bb_echo(char **argv) | |||
33 | eflag = '\\', | 33 | eflag = '\\', |
34 | nflag = 1, /* 1 -- print '\n' */ | 34 | nflag = 1, /* 1 -- print '\n' */ |
35 | }; | 35 | }; |
36 | ++argv; | 36 | arg = *++argv; |
37 | if (!arg) | ||
38 | goto newline_ret; | ||
37 | #else | 39 | #else |
38 | const char *p; | 40 | const char *p; |
39 | char nflag = 1; | 41 | char nflag = 1; |
@@ -107,9 +109,7 @@ int bb_echo(char **argv) | |||
107 | putchar(' '); | 109 | putchar(' '); |
108 | } | 110 | } |
109 | 111 | ||
110 | #if ENABLE_FEATURE_FANCY_ECHO | ||
111 | newline_ret: | 112 | newline_ret: |
112 | #endif | ||
113 | if (nflag) { | 113 | if (nflag) { |
114 | putchar('\n'); | 114 | putchar('\n'); |
115 | } | 115 | } |