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

Timestamp:

2009-06-08T12:34:38Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

d9c8c81

Parents:

f8ef660

Message:

keep a list of open files to support proper cleanup

File:

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

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

@@ -43 +43 @@
 #include <vfs/vfs.h>
 #include <ipc/devmap.h>
-
-FILE stdin_null = {
+#include <libadt/list.h>
+
+static FILE stdin_null = {
         .fd = -1,
         .error = true,
@@ -52 +53 @@
 };
 
-FILE stdout_klog = {
+static FILE stdout_klog = {
         .fd = -1,
         .error = false,
@@ -60 +61 @@
 };
 
-FILE *stdin = &stdin_null;
-FILE *stdout = &stdout_klog;
-FILE *stderr = &stdout_klog;
+static FILE stderr_klog = {
+        .fd = -1,
+        .error = false,
+        .eof = false,
+        .klog = true,
+        .phone = -1
+};
+
+FILE *stdin = NULL;
+FILE *stdout = NULL;
+FILE *stderr = NULL;
+
+static LIST_INITIALIZE(files);
+
+void stdio_init(int filc, fdi_node_t *filv[])
+{
+        if (filc > 0) {
+                stdin = fopen_node(filv[0], "r");
+        } else {
+                stdin = &stdin_null;
+                list_append(&stdin->link, &files);
+        }
+        
+        if (filc > 1) {
+                stdout = fopen_node(filv[1], "w");
+        } else {
+                stdout = &stdout_klog;
+                list_append(&stdout->link, &files);
+        }
+        
+        if (filc > 2) {
+                stderr = fopen_node(filv[2], "w");
+        } else {
+                stderr = &stderr_klog;
+                list_append(&stderr->link, &files);
+        }
+}
+
+void stdio_done(void)
+{
+        link_t *link = files.next;
+        
+        while (link != &files) {
+                FILE *file = list_get_instance(link, FILE, link);
+                fclose(file);
+                link = files.next;
+        }
+}
 
 static bool parse_mode(const char *mode, int *flags)
@@ -142 +188 @@
         stream->phone = -1;
         
+        list_append(&stream->link, &files);
+        
         return stream;
 }
@@ -170 +218 @@
         stream->phone = -1;
         
+        list_append(&stream->link, &files);
+        
         return stream;
 }
@@ -185 +235 @@
                 rc = close(stream->fd);
         
-        if ((stream != &stdin_null) && (stream != &stdout_klog))
+        list_remove(&stream->link);
+        
+        if ((stream != &stdin_null)
+            && (stream != &stdout_klog)
+            && (stream != &stderr_klog))
                 free(stream);
         
@@ -354 +408 @@
 }
 
-void fnode(FILE *stream, fdi_node_t *node)
-{
-        if (stream->fd >= 0) {
-                fd_node(stream->fd, node);
-        } else {
-                node->fs_handle = 0;
-                node->dev_handle = 0;
-                node->index = 0;
-        }
+int fnode(FILE *stream, fdi_node_t *node)
+{
+        if (stream->fd >= 0)
+                return fd_node(stream->fd, node);
+        
+        return ENOENT;
 }