Changeset 925a21e in mainline for uspace/lib/c/generic/io/io.c

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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/lib/c/generic/io/io.c (modified) (7 diffs)

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

@@ -45 +45 @@
 #include <vfs/vfs.h>
 #include <vfs/vfs_sess.h>
-#include <ipc/devmap.h>
+#include <ipc/loc.h>
 #include <adt/list.h>
 #include "../private/io.h"
@@ -101 +101 @@
 static LIST_INITIALIZE(files);
 
-void __stdio_init(int filc, fdi_node_t *filv[])
+void __stdio_init(int filc)
 {
         if (filc > 0) {
-                stdin = fopen_node(filv[0], "r");
+                stdin = fdopen(0, "r");
         } else {
                 stdin = &stdin_null;
@@ -111 +111 @@
         
         if (filc > 1) {
-                stdout = fopen_node(filv[1], "w");
+                stdout = fdopen(1, "w");
         } else {
                 stdout = &stdout_klog;
@@ -118 +118 @@
         
         if (filc > 2) {
-                stderr = fopen_node(filv[2], "w");
+                stderr = fdopen(2, "w");
         } else {
                 stderr = &stderr_klog;
@@ -285 +285 @@
 }
 
-FILE *fopen_node(fdi_node_t *node, const char *mode)
-{
-        int flags;
-        if (!parse_mode(mode, &flags))
-                return NULL;
-        
-        /* Open file. */
-        FILE *stream = malloc(sizeof(FILE));
-        if (stream == NULL) {
-                errno = ENOMEM;
-                return NULL;
-        }
-        
-        stream->fd = open_node(node, flags);
-        if (stream->fd < 0) {
-                /* errno was set by open_node() */
-                free(stream);
-                return NULL;
-        }
-        
-        stream->error = false;
-        stream->eof = false;
-        stream->klog = false;
-        stream->sess = NULL;
-        stream->need_sync = false;
-        _setvbuf(stream);
-        
-        list_append(&stream->link, &files);
-        
-        return stream;
-}
-
 int fclose(FILE *stream)
 {
@@ -450 +418 @@
 
         bytes_used = stream->buf_head - stream->buf_tail;
-        if (bytes_used == 0)
-                return;
 
         /* If buffer has prefetched read data, we need to seek back. */
-        if (stream->buf_state == _bs_read)
+        if (bytes_used > 0 && stream->buf_state == _bs_read)
                 lseek(stream->fd, - (ssize_t) bytes_used, SEEK_CUR);
 
         /* If buffer has unwritten data, we need to write them out. */
-        if (stream->buf_state == _bs_write)
+        if (bytes_used > 0 && stream->buf_state == _bs_write)
                 (void) _fwrite(stream->buf_tail, 1, bytes_used, stream);
 
@@ -780 +746 @@
 }
 
-int fnode(FILE *stream, fdi_node_t *node)
-{
-        if (stream->fd >= 0)
-                return fd_node(stream->fd, node);
+int fhandle(FILE *stream, int *handle)
+{
+        if (stream->fd >= 0) {
+                *handle = stream->fd;
+                return EOK;
+        }
         
         return ENOENT;