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

File:

• uspace/lib/c/generic/io/io.c (modified) (14 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/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,
@@ -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);
@@ -308 +309 @@
         stream->eof = false;
         stream->klog = false;
-        stream->sess = NULL;
+        stream->phone = -1;
         stream->need_sync = false;
         _setvbuf(stream);
@@ -323 +324 @@
         fflush(stream);
         
-        if (stream->sess != NULL)
-                async_hangup(stream->sess);
+        if (stream->phone >= 0)
+                async_hangup(stream->phone);
         
         if (stream->fd >= 0)
@@ -594 +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) {
@@ -607 +607 @@
                 }
         }
+        
+        if (total_written > 0)
+                stream->buf_state = _bs_write;
 
         if (need_flush)
@@ -712 +715 @@
 off64_t ftell(FILE *stream)
 {
-        _fflushbuf(stream);
         return lseek(stream->fd, 0, SEEK_CUR);
 }
@@ -730 +732 @@
         }
         
-        if ((stream->fd >= 0) && (stream->need_sync)) {
+        if (stream->fd >= 0 && stream->need_sync) {
                 /**
                  * Better than syncing always, but probably still not the
@@ -768 +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;
+                if (stream->phone < 0)
+                        stream->phone = fd_phone(stream->fd);
+                
+                return stream->phone;
+        }
+        
+        return -1;
 }