Import Dev86src-0.14.8.tar.gzv0.14.8

2 files changed, 14 insertions, 6 deletions

diff --git a/libc/stdio2/stdio.c b/libc/stdio2/stdio.c
index c317859..6b0dba0 100644
--- a/libc/stdio2/stdio.c
+++ b/libc/stdio2/stdio.c
@@ -675,6 +675,11 @@ char *mode;
    {
       if (nfp)
 	 free(nfp);
+      if (fp)
+      {
+	 fp->mode |= fopen_mode;
+	 fclose(fp);			/* Deallocate if required */
+      }
       return 0;
    }
 
@@ -730,12 +735,15 @@ FILE *fp;
       errno = EINVAL;
       return EOF;
    }
-   if (fflush(fp))
-      return EOF;
+   if (fp->fd != -1)
+   {
+      if (fflush(fp))
+	 return EOF;
 
-   if (close(fp->fd))
-      rv = EOF;
-   fp->fd = -1;
+      if (close(fp->fd))
+	 rv = EOF;
+      fp->fd = -1;
+   }
 
    if (fp->mode & __MODE_FREEBUF)
    {
diff --git a/libc/stdio2/stdio.h b/libc/stdio2/stdio.h
index 98ca38a..fd10923 100644
--- a/libc/stdio2/stdio.h
+++ b/libc/stdio2/stdio.h
@@ -56,7 +56,7 @@ struct __stdio_file {
 
 #define EOF	(-1)
 #ifndef NULL
-#define NULL	(0)
+#define NULL	((void*)0)
 #endif
 
 typedef struct __stdio_file FILE;