Changeset ff9244a in mainline for uspace/lib/libc/generic/io/io.c

Timestamp:

2007-12-26T22:16:21Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2f02aa17

Parents:

75ae31d

Message:

Move the open(), read() and write() provided by streams.c away so that
these functions won't clash with the real open(), read() and write(), which are
soon to be provided by a libvfs library. Applications can now use open_stdin(),
open_stdout(), read_stdin() and write_stdout(). Later, there might be an option
of providing a custom console file system, which will work similarly to how
streams' open(), read() and write() worked.

File:

• uspace/lib/libc/generic/io/io.c (modified) (5 diffs)

uspace/lib/libc/generic/io/io.c

@@ -48 +48 @@
         
         for (count = 0; str[count] != 0; count++);
-        if (write(1, (void *) str, count) == count) {
-                if (write(1, &nl, 1) == 1)
+        if (write_stdout((void *) str, count) == count) {
+                if (write_stdout(&nl, 1) == 1)
                         return 0;
         }
@@ -63 +63 @@
 int putnchars(const char *buf, size_t count)
 {
-        if (write(1, (void *) buf, count) == count)
-                        return 0;
+        if (write_stdout((void *) buf, count) == count)
+                return 0;
         
         return EOF;
@@ -80 +80 @@
 
         for (count = 0; str[count] != 0; count++);
-        if (write(1, (void *) str, count) == count)
-                        return 0;
+        if (write_stdout((void *) str, count) == count)
+                return 0;
         
         return EOF;
@@ -89 +89 @@
 {
         unsigned char ch = c;
-        if (write(1, (void *) &ch, 1) == 1)
-                        return c;
+        if (write_stdout((void *) &ch, 1) == 1)
+                return c;
         
         return EOF;
@@ -98 +98 @@
 {
         unsigned char c;
-        if (read(0, (void *) &c, 1) == 1)
-                        return c;
+        if (read_stdin((void *) &c, 1) == 1)
+                return c;
         
         return EOF;