Changeset be79a663 in mainline for uspace/lib/posix/stdio.c

Timestamp:

2011-08-19T17:37:54Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

ac7c7e36

Parents:

d7427a7e (diff), f00af83 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge libposix changes.

File:

• uspace/lib/posix/stdio.c (modified) (1 diff)

uspace/lib/posix/stdio.c

@@ -257 +257 @@
         assert(stream != NULL);
         
-        /* Retrieve the node. */
-        struct stat st;
-        int rc;
-        
         if (filename == NULL) {
-                rc = fstat(stream->fd, &st);
-        } else {
-                rc = stat(filename, &st);
-                if (-rc == ENOENT) {
-                        /* file does not exist, create new file */
-                        FILE* tmp = fopen(filename, mode);
-                        if (tmp != NULL) {
-                                fclose(tmp);
-                                /* try again */
-                                rc = stat(filename, &st);
-                        }
-                }
-        }
-        
-        if (rc != EOK) {
-                fclose(stream);
-                errno = -rc;
-                return NULL;
-        }
-        
-        fdi_node_t node = {
-                .fs_handle = st.fs_handle,
-                .service_id = st.service_id,
-                .index = st.index
-        };
+                /* POSIX allows this to be imlementation-defined. HelenOS currently
+                 * does not support changing the mode. */
+                // FIXME: handle mode change once it is supported
+                return stream;
+        }
         
         /* Open a new stream. */
-        FILE* new = fopen_node(&node, mode);
+        FILE* new = fopen(filename, mode);
         if (new == NULL) {
                 fclose(stream);
-                /* fopen_node() sets errno. */
+                /* errno was set by fopen() */
                 return NULL;
         }