Changes in uspace/lib/c/generic/io/io.c [2f72c67a:82582e4] in mainline

File:

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

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

@@ -44 +44 @@
 #include <io/klog.h>
 #include <vfs/vfs.h>
-#include <vfs/vfs_sess.h>
-#include <ipc/loc.h>
+#include <ipc/devmap.h>
 #include <adt/list.h>
 #include "../private/io.h"
-#include "../private/stdio.h"
 
 static void _ffillbuf(FILE *stream);
@@ -58 +56 @@
         .eof = true,
         .klog = false,
-        .sess = NULL,
+        .phone = -1,
         .btype = _IONBF,
         .buf = NULL,
@@ -72 +70 @@
         .eof = false,
         .klog = true,
-        .sess = NULL,
+        .phone = -1,
         .btype = _IOLBF,
         .buf = NULL,
@@ -86 +84 @@
         .eof = false,
         .klog = true,
-        .sess = NULL,
+        .phone = -1,
         .btype = _IONBF,
         .buf = NULL,
@@ -101 +99 @@
 static LIST_INITIALIZE(files);
 
-void __stdio_init(int filc)
+void __stdio_init(int filc, fdi_node_t *filv[])
 {
         if (filc > 0) {
-                stdin = fdopen(0, "r");
+                stdin = fopen_node(filv[0], "r");
         } else {
                 stdin = &stdin_null;
@@ -111 +109 @@
         
         if (filc > 1) {
-                stdout = fdopen(1, "w");
+                stdout = fopen_node(filv[1], "w");
         } else {
                 stdout = &stdout_klog;
@@ -118 +116 @@
         
         if (filc > 2) {
-                stderr = fdopen(2, "w");
+                stderr = fopen_node(filv[2], "w");
         } else {
                 stderr = &stderr_klog;
@@ -127 +125 @@
 void __stdio_done(void)
 {
-        while (!list_empty(&files)) {
-                FILE *file = list_get_instance(list_first(&files), FILE, link);
+        link_t *link = files.next;
+        
+        while (link != &files) {
+                FILE *file = list_get_instance(link, FILE, link);
                 fclose(file);
+                link = files.next;
         }
 }
@@ -254 +255 @@
         stream->eof = false;
         stream->klog = false;
-        stream->sess = NULL;
+        stream->phone = -1;
         stream->need_sync = false;
         _setvbuf(stream);
@@ -276 +277 @@
         stream->eof = false;
         stream->klog = false;
-        stream->sess = NULL;
+        stream->phone = -1;
         stream->need_sync = false;
         _setvbuf(stream);
@@ -285 +286 @@
 }
 
+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->phone = -1;
+        stream->need_sync = false;
+        _setvbuf(stream);
+        
+        list_append(&stream->link, &files);
+        
+        return stream;
+}
+
 int fclose(FILE *stream)
 {
@@ -291 +324 @@
         fflush(stream);
         
-        if (stream->sess != NULL)
-                async_hangup(stream->sess);
+        if (stream->phone >= 0)
+                async_hangup(stream->phone);
         
         if (stream->fd >= 0)
@@ -418 +451 @@
 
         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 (bytes_used > 0 && stream->buf_state == _bs_read)
+        if (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 (bytes_used > 0 && stream->buf_state == _bs_write)
+        if (stream->buf_state == _bs_write)
                 (void) _fwrite(stream->buf_tail, 1, bytes_used, stream);
 
@@ -560 +595 @@
                 }
                 
-                data += now;
+                buf += now;
                 stream->buf_head += now;
                 buf_free -= now;
                 bytes_left -= now;
                 total_written += now;
-                stream->buf_state = _bs_write;
                 
                 if (buf_free == 0) {
@@ -573 +607 @@
                 }
         }
+        
+        if (total_written > 0)
+                stream->buf_state = _bs_write;
 
         if (need_flush)
@@ -678 +715 @@
 off64_t ftell(FILE *stream)
 {
-        _fflushbuf(stream);
         return lseek(stream->fd, 0, SEEK_CUR);
 }
@@ -696 +732 @@
         }
         
-        if ((stream->fd >= 0) && (stream->need_sync)) {
+        if (stream->fd >= 0 && stream->need_sync) {
                 /**
                  * Better than syncing always, but probably still not the
@@ -734 +770 @@
 }
 
-async_sess_t *fsession(exch_mgmt_t mgmt, FILE *stream)
+int fphone(FILE *stream)
 {
         if (stream->fd >= 0) {
-                if (stream->sess == NULL)
-                        stream->sess = fd_session(mgmt, stream->fd);
-                
-                return stream->sess;
-        }
-        
-        return NULL;
-}
-
-int fhandle(FILE *stream, int *handle)
-{
-        if (stream->fd >= 0) {
-                *handle = stream->fd;
-                return EOK;
-        }
+                if (stream->phone < 0)
+                        stream->phone = fd_phone(stream->fd);
+                
+                return stream->phone;
+        }
+        
+        return -1;
+}
+
+int fnode(FILE *stream, fdi_node_t *node)
+{
+        if (stream->fd >= 0)
+                return fd_node(stream->fd, node);
         
         return ENOENT;