Changeset fd4b636 in mainline

Timestamp:

2011-07-27T21:28:19Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

58115ae

Parents:

f215bb5

Message:

Complete implementation of freopen().

File:

• uspace/lib/posix/stdio.c (modified) (2 diffs)

uspace/lib/posix/stdio.c

@@ -50 +50 @@
 #include "libc/str.h"
 #include "libc/malloc.h"
+#include "libc/adt/list.h"
+#include "libc/sys/stat.h"
 
 
@@ -252 +254 @@
         assert(mode != NULL);
         assert(stream != NULL);
-
+        
+        /* Retieve the node. */
+        struct stat st;
+        int rc;
+        
         if (filename == NULL) {
-                // TODO
-                
-                /* print error to stderr as well, to avoid hard to find problems
-                 * with buggy apps that expect this to work
-                 */
-                fprintf(stderr,
-                    "ERROR: Application wants to use freopen() to change mode of opened stream.\n"
-                    "       libposix does not support that yet, the application may function improperly.\n");
-                errno = ENOTSUP;
+                rc = fstat(stream->fd, &st);
+        } else {
+                rc = stat(filename, &st);
+        }
+        
+        if (rc != EOK) {
+                fclose(stream);
+                errno = -rc;
                 return NULL;
         }
-
-        FILE* copy = malloc(sizeof(FILE));
-        if (copy == NULL) {
-                errno = ENOMEM;
+        
+        fdi_node_t node = {
+                .fs_handle = st.fs_handle,
+                .devmap_handle = st.devmap_handle,
+                .index = st.index
+        };
+        
+        /* Open a new stream. */
+        FILE* new = fopen_node(&node, mode);
+        if (new == NULL) {
+                fclose(stream);
+                /* fopen_node() sets errno. */
                 return NULL;
         }
-        memcpy(copy, stream, sizeof(FILE));
-        fclose(copy); /* copy is now freed */
-        
-        copy = fopen(filename, mode); /* open new stream */
-        if (copy == NULL) {
-                /* fopen() sets errno */
-                return NULL;
-        }
-        
-        /* move the new stream to the original location */
-        memcpy(stream, copy, sizeof (FILE));
-        free(copy);
-        
-        /* update references in the file list */
+        
+        /* Close the original stream without freeing it (ignoring errors). */
+        if (stream->buf != NULL) {
+                fflush(stream);
+        }
+        if (stream->sess != NULL) {
+                async_hangup(stream->sess);
+        }
+        if (stream->fd >= 0) {
+                close(stream->fd);
+        }
+        list_remove(&stream->link);
+        
+        /* Move the new stream to the original location. */
+        memcpy(stream, new, sizeof (FILE));
+        free(new);
+        
+        /* Update references in the file list. */
         stream->link.next->prev = &stream->link;
         stream->link.prev->next = &stream->link;