Changeset 80bee81 in mainline for uspace/lib/c/generic/io/io.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/c/generic/io/io.c (modified) (3 diffs)

uspace/lib/c/generic/io/io.c

@@ -299 +299 @@
 }
 
-int fclose(FILE *stream)
+
+static int _fclose_nofree(FILE *stream)
 {
         int rc = 0;
@@ -312 +313 @@
         
         list_remove(&stream->link);
+        
+        if (rc != 0) {
+                /* errno was set by close() */
+                return EOF;
+        }
+        
+        return 0;
+}
+
+int fclose(FILE *stream)
+{
+        int rc = _fclose_nofree(stream);
         
         if ((stream != &stdin_null)
@@ -318 +331 @@
                 free(stream);
         
-        stream = NULL;
-        
-        if (rc != 0) {
-                /* errno was set by close() */
-                return EOF;
-        }
-        
-        return 0;
+        return rc;
+}
+
+FILE *freopen(const char *path, const char *mode, FILE *stream)
+{
+        FILE *nstr;
+        
+        if (path == NULL) {
+                /* Changing mode is not supported */
+                return NULL;
+        }
+        
+        (void) _fclose_nofree(stream);
+        nstr = fopen(path, mode);
+        if (nstr == NULL) {
+                free(stream);
+                return NULL;
+        }
+        
+        list_remove(&nstr->link);
+        *stream = *nstr;
+        list_append(&stream->link, &files);
+        
+        free(nstr);
+        
+        return stream;
 }