Changeset 0773396 in mainline for uspace/app/getterm/getterm.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/app/getterm/getterm.c (modified) (2 diffs)

uspace/app/getterm/getterm.c

@@ -112 +112 @@
         reopen(&stderr, 2, term, O_WRONLY, "w");
         
-        /*
-         * FIXME: fdopen() should actually detect that we are opening a console
-         * and it should set line-buffering mode automatically.
-         */
-        setvbuf(stdout, NULL, _IOLBF, BUFSIZ);
-        
         if (stdin == NULL)
                 return -2;
@@ -126 +120 @@
         if (stderr == NULL)
                 return -4;
+        
+        /*
+         * FIXME: fdopen() should actually detect that we are opening a console
+         * and it should set line-buffering mode automatically.
+         */
+        setvbuf(stdout, NULL, _IOLBF, BUFSIZ);
         
         version_print(term);