Changes in uspace/lib/posix/stdio.c [75406dc:cfbb5d18] in mainline

File:

• uspace/lib/posix/stdio.c (modified) (3 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"
 
 
@@ -254 +252 @@
         assert(mode != NULL);
         assert(stream != NULL);
+
+        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;
+                return NULL;
+        }
+
+        FILE* copy = malloc(sizeof(FILE));
+        if (copy == NULL) {
+                errno = ENOMEM;
+                return NULL;
+        }
+        memcpy(copy, stream, sizeof(FILE));
+        fclose(copy); /* copy is now freed */
         
-        /* Retieve the node. */
-        struct stat st;
-        int rc;
+        copy = fopen(filename, mode); /* open new stream */
+        if (copy == NULL) {
+                /* fopen() sets errno */
+                return NULL;
+        }
         
-        if (filename == NULL) {
-                rc = fstat(stream->fd, &st);
-        } else {
-                rc = stat(filename, &st);
-        }
+        /* move the new stream to the original location */
+        memcpy(stream, copy, sizeof (FILE));
+        free(copy);
         
-        if (rc != EOK) {
-                fclose(stream);
-                errno = -rc;
-                return NULL;
-        }
-        
-        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;
-        }
-        
-        /* 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. */
+        /* update references in the file list */
         stream->link.next->prev = &stream->link;
         stream->link.prev->next = &stream->link;
@@ -693 +676 @@
 
 /**
- * Remove a file or directory.
+ * Remove a file.
  *
  * @param path Pathname of the file that shall be removed.
- * @return Zero on success, -1 (with errno set) otherwise.
+ * @return Zero on success, -1 otherwise.
  */
 int posix_remove(const char *path)
 {
-        struct stat st;
-        int rc = stat(path, &st);
-        
-        if (rc != EOK) {
-                errno = -rc;
-                return -1;
-        }
-        
-        if (st.is_directory) {
-                rc = rmdir(path);
-        } else {
-                rc = unlink(path);
-        }
-        
-        if (rc != EOK) {
-                errno = -rc;
-                return -1;
-        }
-        return 0;
-}
-
-/**
- * Rename a file or directory.
- *
- * @param old
- * @param new
- * @return Zero on success, -1 (with errno set) otherwise.
- */
-int posix_rename(const char *old, const char *new)
-{
-        return errnify(rename, old, new);
+        // FIXME: unlink() and rmdir() seem to be equivalent at the moment,
+        //        but that does not have to be true forever
+        return unlink(path);
 }