Changeset 00c2de63 in mainline for uspace/lib/posix/stdio.c

Timestamp:

2011-07-29T14:50:22Z (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:

b6759f4

Parents:

6c69d19 (diff), 7ae249d (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.

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"
 
 
@@ -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;
@@ -676 +693 @@
 
 /**
- * Remove a file.
+ * Remove a file or directory.
  *
  * @param path Pathname of the file that shall be removed.
- * @return Zero on success, -1 otherwise.
+ * @return Zero on success, -1 (with errno set) otherwise.
  */
 int posix_remove(const char *path)
 {
-        // FIXME: unlink() and rmdir() seem to be equivalent at the moment,
-        //        but that does not have to be true forever
-        return unlink(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);
 }