aboutsummaryrefslogtreecommitdiff
path: root/coreutils/echo.c
diff options
context:
space:
mode:
Diffstat (limited to 'coreutils/echo.c')
-rw-r--r--coreutils/echo.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/coreutils/echo.c b/coreutils/echo.c
index 36cb6b3af..decca095f 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -46,8 +46,11 @@ int echo_main(int argc UNUSED_PARAM, char **argv)
46 * even if libc receives EBADF on write attempts, it feels determined 46 * even if libc receives EBADF on write attempts, it feels determined
47 * to output data no matter what. So it will try later, 47 * to output data no matter what. So it will try later,
48 * and possibly will clobber future output. Not good. */ 48 * and possibly will clobber future output. Not good. */
49 if (dup2(1, 1) != 1) 49// TODO: check fcntl() & O_ACCMODE == O_WRONLY or O_RDWR?
50 return -1; 50 if (fcntl(1, F_GETFL) == -1)
51 return 1; /* match coreutils 6.10 (sans error msg to stderr) */
52 //if (dup2(1, 1) != 1) - old way
53 // return 1;
51 54
52 arg = *++argv; 55 arg = *++argv;
53 if (!arg) 56 if (!arg)
@@ -58,8 +61,8 @@ int echo_main(int argc UNUSED_PARAM, char **argv)
58 char eflag = 0; 61 char eflag = 0;
59 62
60 /* We must check that stdout is not closed. */ 63 /* We must check that stdout is not closed. */
61 if (dup2(1, 1) != 1) 64 if (fcntl(1, F_GETFL) == -1)
62 return -1; 65 return 1;
63 66
64 while (1) { 67 while (1) {
65 arg = *++argv; 68 arg = *++argv;