remove unnecessary indirection

Author: bassiounix

libc/src/__support/CMakeLists.txt

@@ -1,7 +1,6 @@
 add_subdirectory(annex_k)
 add_subdirectory(CPP)
 add_subdirectory(macros)
-add_subdirectory(stdio)
 
 add_header_library(
   libc_errno

libc/src/__support/annex_k/CMakeLists.txt

@@ -2,6 +2,9 @@ add_header_library(
   helper_macros
   HDRS
     helper_macros.h
+  DEPENDS
+    .libc_constraint_handler
+    libc.src.__support.libc_errno
 )
 
 add_header_library(
@@ -10,5 +13,7 @@ add_header_library(
     libc_constraint_handler.h
   DEPENDS
     .abort_handler_s
-    libc.hdr.types.errno_t
+    libc.hdr.types.constraint_handler_t
+    libc.src.__support.common
+    libc.src.stdlib.abort_handler_s
 )

libc/src/__support/annex_k/helper_macros.h

@@ -10,6 +10,7 @@
 #define LLVM_LIBC_SRC___SUPPORT_ANNEX_K_HELPER_MACROS_H
 
 #include "libc_constraint_handler.h"
+#include "src/__support/libc_errno.h"
 
 #define _CONSTRAINT_VIOLATION(msg, error_code, ret_code)                       \
   {                                                                            \

libc/src/__support/stdio/CMakeLists.txt

@@ -162,7 +162,9 @@ add_generic_entrypoint_object(
   HDRS
     ../fopen.h
   DEPENDS
-    libc.src.__support.stdio.fopen
+    libc.hdr.types.FILE
+    libc.src.__support.File.file
+    libc.src.__support.File.platform_file
 )
 
 add_generic_entrypoint_object(
@@ -172,7 +174,7 @@ add_generic_entrypoint_object(
   HDRS
     ../fopen_s.h
   DEPENDS
-    libc.src.__support.stdio.fopen
+    libc.src.stdio.fopen
     libc.src.__support.macros.config
     libc.src.__support.annex_k.helper_macros
 )

libc/src/__support/stdio/fopen.h

@@ -7,14 +7,22 @@
 //===----------------------------------------------------------------------===//
 
 #include "src/stdio/fopen.h"
+#include "src/__support/File/file.h"
+
+#include "hdr/types/FILE.h"
+#include "src/__support/libc_errno.h"
 #include "src/__support/macros/config.h"
-#include "src/__support/stdio/fopen.h"
 
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(::FILE *, fopen,
                    (const char *__restrict name, const char *__restrict mode)) {
-  return stdio_internal::fopen(name, mode);
+  auto result = LIBC_NAMESPACE::openfile(name, mode);
+  if (!result.has_value()) {
+    libc_errno = result.error();
+    return nullptr;
+  }
+  return reinterpret_cast<::FILE *>(result.value());
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/src/stdio/generic/CMakeLists.txt

@@ -9,7 +9,7 @@
 #include "src/stdio/fopen_s.h"
 #include "src/__support/annex_k/helper_macros.h"
 #include "src/__support/macros/config.h"
-#include "src/__support/stdio/fopen.h"
+#include "src/stdio/fopen.h"
 
 namespace LIBC_NAMESPACE_DECL {
 
@@ -24,13 +24,13 @@ LLVM_LIBC_FUNCTION(errno_t, fopen_s,
   FILE *ret = nullptr;
 
   if (mode[0] == 'u') {
-    ret = stdio_internal::fopen(filename, mode + 1);
+    ret = fopen(filename, mode + 1);
     if (!ret) {
       *streamptr = nullptr;
       return -1;
     }
   } else {
-    ret = stdio_internal::fopen(filename, mode);
+    ret = fopen(filename, mode);
     if (!ret) {
       *streamptr = nullptr;
       return -1;