From cdbdd397db2dbab2a01115ab847ae658237feb3b Mon Sep 17 00:00:00 2001
From: Jesse Buhagiar <jesse.buhagiar@student.rmit.edu.au>
Date: Sun, 12 Jan 2020 18:07:26 +1100
Subject: [PATCH] LibC: Move `FILE` definition to bits/FILE.h

There are some headers in libc that require us to have definitions,
such as `FILE` available to us (such as in `pwd.h`). It is bad
practice to include the entirety of `stdio.h`, so it makes more
sense to put `FILE` into it's own header.
---
 Libraries/LibC/bits/FILE.h | 53 ++++++++++++++++++++++++++++++++++++++
 Libraries/LibC/stdio.h     | 18 +------------
 2 files changed, 54 insertions(+), 17 deletions(-)
 create mode 100644 Libraries/LibC/bits/FILE.h

diff --git a/Libraries/LibC/bits/FILE.h b/Libraries/LibC/bits/FILE.h
new file mode 100644
index 00000000000..e2308cedade
--- /dev/null
+++ b/Libraries/LibC/bits/FILE.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2018-2020, Jesse Buhagiar <jooster669@gmail.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+#pragma once
+
+#include <sys/cdefs.h>
+#include <sys/types.h>
+
+#define BUFSIZ 1024
+
+__BEGIN_DECLS
+
+struct __STDIO_FILE {
+    int fd;
+    int eof;
+    int error;
+    int mode;
+    pid_t popen_child;
+    char* buffer;
+    size_t buffer_size;
+    size_t buffer_index;
+    int have_ungotten;
+    char ungotten;
+    char default_buffer[BUFSIZ];
+};
+
+typedef struct __STDIO_FILE FILE;
+
+__END_DECLS
diff --git a/Libraries/LibC/stdio.h b/Libraries/LibC/stdio.h
index fabbbf5f44c..9c3031f0975 100644
--- a/Libraries/LibC/stdio.h
+++ b/Libraries/LibC/stdio.h
@@ -30,11 +30,11 @@
 
 #include <limits.h>
 #include <stdarg.h>
+#include <bits/FILE.h>
 #include <sys/cdefs.h>
 #include <sys/types.h>
 
 #define FILENAME_MAX 1024
-#define BUFSIZ 1024
 
 __BEGIN_DECLS
 #ifndef EOF
@@ -51,22 +51,6 @@ __BEGIN_DECLS
 
 #define L_tmpnam 256
 
-struct __STDIO_FILE {
-    int fd;
-    int eof;
-    int error;
-    int mode;
-    pid_t popen_child;
-    char* buffer;
-    size_t buffer_size;
-    size_t buffer_index;
-    int have_ungotten;
-    char ungotten;
-    char default_buffer[BUFSIZ];
-};
-
-typedef struct __STDIO_FILE FILE;
-
 extern FILE* stdin;
 extern FILE* stdout;
 extern FILE* stderr;