Changeset 80bee81 in mainline for uspace/lib/posix/source/stdio.c

Timestamp:

2015-09-21T22:40:52Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a955fcc

Parents:

7db5cfd

Message:

freopen() goes home too.

File:

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

uspace/lib/posix/source/stdio.c

@@ -55 +55 @@
 #include "libc/sys/stat.h"
 
-
-/* not the best of solutions, but freopen and ungetc will eventually
- * need to be implemented in libc anyway
- */
-#include "../../c/generic/private/stdio.h"
-
 /** Clears the stream's error and end-of-file indicators.
  *
@@ -67 +61 @@
 void posix_clearerr(FILE *stream)
 {
-        stream->error = 0;
-        stream->eof = 0;
+        clearerr(stream);
 }
 
@@ -221 +214 @@
     const char *restrict mode, FILE *restrict stream)
 {
-        assert(mode != NULL);
-        assert(stream != NULL);
-        
-        if (filename == NULL) {
-                /* 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(filename, mode);
-        if (new == NULL) {
-                fclose(stream);
-                /* errno was set by fopen() */
-                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. */
-        stream->link.next->prev = &stream->link;
-        stream->link.prev->next = &stream->link;
-        
-        return stream;
+        return freopen(filename, mode, stream);
 }