fixup! fixup! fixup! [libc] Add putc, fputc, and fprintf to stdio/baremetal

Author: saturn691

libc/src/stdio/baremetal/CMakeLists.txt

@@ -4,10 +4,10 @@ add_entrypoint_object(
     fprintf.cpp
   HDRS
     ../fprintf.h
-    write_utils.h
-  DEPENDS
+    DEPENDS
     libc.src.__support.CPP.string_view
     libc.src.stdio.printf_core.printf_main
+    .baremetal_write_utils
 )
 
 add_entrypoint_object(
@@ -16,9 +16,9 @@ add_entrypoint_object(
     fputc.cpp
   HDRS
     ../fputc.h
-    write_utils.h
   DEPENDS
     libc.src.__support.CPP.string_view
+    .baremetal_write_utils
 )
 
 add_entrypoint_object(
@@ -49,9 +49,9 @@ add_entrypoint_object(
     putc.cpp
   HDRS
     ../putc.h
-    write_utils.h
-  DEPENDS
+    DEPENDS
     libc.src.__support.CPP.string_view
+    .baremetal_write_utils
 )
 
 add_entrypoint_object(
@@ -60,10 +60,10 @@ add_entrypoint_object(
     printf.cpp
   HDRS
     ../printf.h
-    write_utils.h
-  DEPENDS
+    DEPENDS
     libc.src.stdio.printf_core.printf_main
     libc.src.__support.arg_list
+    .baremetal_write_hooks
 )
 
 add_entrypoint_object(
@@ -119,6 +119,7 @@ add_entrypoint_object(
   DEPENDS
     libc.src.stdio.printf_core.printf_main
     libc.src.__support.arg_list
+    .baremetal_write_hooks
 )
 
 add_entrypoint_object(
@@ -134,6 +135,16 @@ add_entrypoint_object(
     libc.src.__support.OSUtil.osutil
 )
 
+add_header_library(
+  baremetal_write_hooks
+  HDRS
+    write_hooks.h
+  DEPENDS
+    libc.src.__support.OSUtil.osutil
+    libc.src.__support.CPP.string_view
+    libc.src.stdio.printf_core.core_structs
+)
+
 add_header_library(
   baremetal_write_utils
   HDRS
@@ -143,6 +154,7 @@ add_header_library(
     libc.hdr.stdio_macros
     libc.src.__support.OSUtil.osutil
     libc.src.__support.CPP.string_view
+    .baremetal_write_hooks
     .stdout
     .stderr
 )

libc/src/stdio/baremetal/printf.cpp

@@ -10,7 +10,7 @@
 
 #include "src/__support/arg_list.h"
 #include "src/__support/macros/config.h"
-#include "src/stdio/baremetal/write_utils.h"
+#include "src/stdio/baremetal/write_hooks.h"
 #include "src/stdio/printf_core/printf_main.h"
 
 #include <stdarg.h>

libc/src/stdio/baremetal/vprintf.cpp

@@ -10,7 +10,7 @@
 
 #include "src/__support/arg_list.h"
 #include "src/__support/macros/config.h"
-#include "src/stdio/baremetal/write_utils.h"
+#include "src/stdio/baremetal/write_hooks.h"
 #include "src/stdio/printf_core/printf_main.h"
 
 #include <stdarg.h>

libc/src/stdio/baremetal/write_hooks.h

@@ -0,0 +1,28 @@
+//===-- Baremetal helper functions for writing to stdout/stderr -*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/__support/CPP/string_view.h"
+#include "src/__support/OSUtil/io.h"
+#include "src/__support/macros/config.h"
+#include "src/stdio/printf_core/core_structs.h" // For printf_core::WRITE_OK
+
+namespace LIBC_NAMESPACE_DECL {
+namespace write_utils {
+
+LIBC_INLINE int stdout_write_hook(cpp::string_view new_str, void *) {
+  write_to_stdout(new_str);
+  return printf_core::WRITE_OK;
+}
+
+LIBC_INLINE int stderr_write_hook(cpp::string_view new_str, void *) {
+  write_to_stderr(new_str);
+  return printf_core::WRITE_OK;
+}
+
+} // namespace write_utils
+} // namespace LIBC_NAMESPACE_DECL

libc/src/stdio/baremetal/write_utils.h

@@ -10,36 +10,33 @@
 #include "hdr/types/FILE.h"
 #include "src/__support/CPP/string_view.h"
 #include "src/__support/OSUtil/io.h"
+#include "src/__support/libc_errno.h"
 #include "src/__support/macros/config.h"
-#include "src/stdio/printf_core/core_structs.h" // For printf_core::WRITE_OK
+#include "src/stdio/baremetal/write_hooks.h"
 
 namespace LIBC_NAMESPACE_DECL {
 namespace write_utils {
 
-LIBC_INLINE int stdout_write_hook(cpp::string_view new_str, void *) {
-  write_to_stdout(new_str);
-  return printf_core::WRITE_OK;
-}
-
-LIBC_INLINE int stderr_write_hook(cpp::string_view new_str, void *) {
-  write_to_stderr(new_str);
-  return printf_core::WRITE_OK;
-}
-
 LIBC_INLINE void write(::FILE *f, cpp::string_view new_str) {
   if (f == stdout) {
     write_to_stdout(new_str);
-  } else {
+  } else if (f == stderr) {
     write_to_stderr(new_str);
+  } else {
+    libc_errno = 1;
   }
 }
 
 using StreamWriter = int (*)(cpp::string_view, void *);
 LIBC_INLINE StreamWriter get_write_hook(::FILE *f) {
-  if (f == stdout)
+  if (f == stdout) {
     return &stdout_write_hook;
+  } else if (f == stderr) {
+    return &stderr_write_hook;
+  }
 
-  return &stderr_write_hook;
+  libc_errno = 1;
+  return NULL;
 }
 
 } // namespace write_utils