simplify

1 files changed, 15 insertions, 28 deletions

diff --git a/src/stdio/fopen.c b/src/stdio/fopen.c
index 95130917..4f85f864 100644
--- a/src/stdio/fopen.c
+++ b/src/stdio/fopen.c
@@ -1,40 +1,27 @@
+#include <errno.h>
 #include <stdio.h>
-#include "stdlib.h"
+#include <stdlib.h>
 #include "_stdio.h"
 
 /** open a file stream **/
+
 FILE * fopen(const char * restrict filename, const char * restrict mode)
 {
-	struct __FILE *base = __stdio.FILES;
-	struct __FILE *f = base;
+	FILE *f = NULL;
+	size_t i;
 
-	/* find the next available stream */
-	while (f->next != NULL) {
-		f = f->next;
+	for (i = 0; i < FOPEN_MAX; i++) {
+		if (__stdio.FILES[i].bmode == 0) {
+			f = &(__stdio.FILES[i]);
+			break;
+		}
 	}
 
-	/* use a stream from the guaranteed space if possible */
-	/* otherwise, allocate a new stream */
-	if (f < base + FOPEN_MAX) {
-		f->next = f + 1;
-	} else {
-		f->next = malloc(sizeof(*f->next));
-	}
+	if (f == NULL) {
+		#ifdef EMFILE
+		errno = EMFILE;
+		#endif
 
-	/* if we had to allocate, but that failed, we're out of memory */
-	if (f->next == NULL) {
-		return NULL;
-	}
-
-	/* open the new stream */
-	f->next->prev = f;
-	f = f->next;
-	f->fd = -1;
-	if (freopen(filename, mode, f) == NULL) {
-		if (f < base + FOPEN_MAX) {
-		} else {
-			free(f);
-		}
 		return NULL;
 	}
 
@@ -43,7 +30,7 @@ FILE * fopen(const char * restrict filename, const char * restrict mode)
 	RETURN_FAILURE(CONSTANT(NULL));
 	*/
 
-	return f;
+	return freopen(filename, mode, f);
 }
 
 /***