Changes in uspace/lib/c/generic/io/io.c [3e6a98c5:6fa9a99d] in mainline

File:

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

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

@@ -42 +42 @@
 #include <malloc.h>
 #include <async.h>
-#include <io/klog.h>
+#include <io/kio.h>
 #include <vfs/vfs.h>
 #include <vfs/vfs_sess.h>
@@ -57 +57 @@
         .error = true,
         .eof = true,
-        .klog = false,
+        .kio = false,
         .sess = NULL,
         .btype = _IONBF,
@@ -67 +67 @@
 };
 
-static FILE stdout_klog = {
+static FILE stdout_kio = {
         .fd = -1,
         .error = false,
         .eof = false,
-        .klog = true,
+        .kio = true,
         .sess = NULL,
         .btype = _IOLBF,
@@ -81 +81 @@
 };
 
-static FILE stderr_klog = {
+static FILE stderr_kio = {
         .fd = -1,
         .error = false,
         .eof = false,
-        .klog = true,
+        .kio = true,
         .sess = NULL,
         .btype = _IONBF,
@@ -113 +113 @@
                 stdout = fdopen(1, "w");
         } else {
-                stdout = &stdout_klog;
+                stdout = &stdout_kio;
                 list_append(&stdout->link, &files);
         }
@@ -120 +120 @@
                 stderr = fdopen(2, "w");
         } else {
-                stderr = &stderr_klog;
+                stderr = &stderr_kio;
                 list_append(&stderr->link, &files);
         }
@@ -192 +192 @@
 }
 
+/** Set stream buffer.
+ *
+ * When @p buf is NULL, the stream is set as unbuffered, otherwise
+ * full buffering is enabled.
+ */
+void setbuf(FILE *stream, void *buf)
+{
+        if (buf == NULL) {
+                setvbuf(stream, NULL, _IONBF, BUFSIZ);
+        } else {
+                setvbuf(stream, buf, _IOFBF, BUFSIZ);
+        }
+}
+
 static void _setvbuf(FILE *stream)
 {
@@ -253 +267 @@
         stream->error = false;
         stream->eof = false;
-        stream->klog = false;
+        stream->kio = false;
         stream->sess = NULL;
         stream->need_sync = false;
@@ -275 +289 @@
         stream->error = false;
         stream->eof = false;
-        stream->klog = false;
+        stream->kio = false;
         stream->sess = NULL;
         stream->need_sync = false;
@@ -300 +314 @@
         
         if ((stream != &stdin_null)
-            && (stream != &stdout_klog)
-            && (stream != &stderr_klog))
+            && (stream != &stdout_kio)
+            && (stream != &stderr_kio))
                 free(stream);
         
@@ -368 +382 @@
                 ssize_t wr;
                 
-                if (stream->klog)
-                        wr = klog_write(buf + done, left);
+                if (stream->kio)
+                        wr = kio_write(buf + done, left);
                 else
                         wr = write(stream->fd, buf + done, left);
@@ -691 +705 @@
         _fflushbuf(stream);
         
-        if (stream->klog) {
-                klog_update();
+        if (stream->kio) {
+                kio_update();
                 return EOK;
         }
@@ -726 +740 @@
 int fileno(FILE *stream)
 {
-        if (stream->klog) {
+        if (stream->kio) {
                 errno = EBADF;
                 return -1;