Changeset 7171760 in mainline for uspace/lib/c/generic/io/io.c

Timestamp:

2011-08-18T12:05:00Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b33ec43

Parents:

866e627

Message:

Rework the way how open files are passed from parent task to child.

• Instead of passing fdi_node_t's, pass handles directly using the IPC_M_STATE_CHANGE_AUTHORIZE mechanism.
• Remove open_node(), fd_node(), fdi_node_t.
• Replace fopen_node() with fopen_handle().
• Replace fnode() with fhandle().
• The child task does not synchronize with VFS yet.

File:

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

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

@@ -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 = fopen_handle(0);
         } else {
                 stdin = &stdin_null;
@@ -111 +111 @@
         
         if (filc > 1) {
-                stdout = fopen_node(filv[1], "w");
+                stdout = fopen_handle(1);
         } else {
                 stdout = &stdout_klog;
@@ -118 +118 @@
         
         if (filc > 2) {
-                stderr = fopen_node(filv[2], "w");
+                stderr = fopen_handle(2);
         } 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;
-        
+FILE *fopen_handle(int fd)
+{
         /* Open file. */
         FILE *stream = malloc(sizeof(FILE));
@@ -298 +294 @@
         }
         
-        stream->fd = open_node(node, flags);
-        if (stream->fd < 0) {
-                /* errno was set by open_node() */
-                free(stream);
-                return NULL;
-        }
-        
+        stream->fd = fd;
         stream->error = false;
         stream->eof = false;
@@ -780 +770 @@
 }
 
-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;