Map internall err code to errno

Author: mleleszi

libc/src/__support/File/file.cpp

@@ -20,7 +20,7 @@ namespace LIBC_NAMESPACE_DECL {
 
 FileIOResult File::write_unlocked(const void *data, size_t len) {
   if (!write_allowed()) {
-    error_code = EBADF;
+    err_code = EBADF;
     return {0, EBADF};
   }
 
@@ -46,15 +46,15 @@ FileIOResult File::write_unlocked_nbf(const uint8_t *data, size_t len) {
     pos = 0; // Buffer is now empty so reset pos to the beginning.
     // If less bytes were written than expected, then an error occurred.
     if (write_result.has_error() || write_result < write_size) {
-      error_code = write_result.has_error() ? write_result.error : EIO;
+      err_code = write_result.has_error() ? write_result.error : EIO;
       // No bytes from data were written, so return 0.
-      return {0, error_code};
+      return {0, err_code};
     }
   }
 
   FileIOResult write_result = platform_write(this, data, len);
   if (write_result.has_error() || write_result < len)
-    error_code = write_result.has_error() ? write_result.error : EIO;
+    err_code = write_result.has_error() ? write_result.error : EIO;
   return write_result;
 }
 
@@ -106,9 +106,8 @@ FileIOResult File::write_unlocked_fbf(const uint8_t *data, size_t len) {
   // If less bytes were written than expected, then an error occurred. Return
   // the number of bytes that have been written from |data|.
   if (buf_result.has_error() || bytes_written < write_size) {
-    error_code = buf_result.has_error() ? buf_result.error : EIO;
-    return {bytes_written <= init_pos ? 0 : bytes_written - init_pos,
-            error_code};
+    err_code = buf_result.has_error() ? buf_result.error : EIO;
+    return {bytes_written <= init_pos ? 0 : bytes_written - init_pos, err_code};
   }
 
   // The second piece is handled basically the same as the first, although we
@@ -128,8 +127,8 @@ FileIOResult File::write_unlocked_fbf(const uint8_t *data, size_t len) {
     // If less bytes were written than expected, then an error occurred. Return
     // the number of bytes that have been written from |data|.
     if (result.has_error() || bytes_written < remainder.size()) {
-      error_code = result.has_error() ? result.error : EIO;
-      return {primary.size() + bytes_written, error_code};
+      err_code = result.has_error() ? result.error : EIO;
+      return {primary.size() + bytes_written, err_code};
     }
   }
 
@@ -169,25 +168,26 @@ FileIOResult File::write_unlocked_lbf(const uint8_t *data, size_t len) {
   auto write_result = write_unlocked_nbf(primary.data(), primary.size());
   written += write_result;
   if (write_result.has_error() || written < primary.size()) {
-    error_code = write_result.has_error() ? write_result.error : EIO;
-    return {written, error_code};
+    err_code = write_result.has_error() ? write_result.error : EIO;
+    return {written, err_code};
   }
 
   flush_unlocked();
 
   write_result = write_unlocked_fbf(remainder.data(), remainder.size());
-  written += write_result;;
+  written += write_result;
+  ;
   if (write_result.has_error() || written < len) {
-    error_code = write_result.has_error() ? write_result.error : EIO;
-    return {written, error_code};
+    err_code = write_result.has_error() ? write_result.error : EIO;
+    return {written, err_code};
   }
 
   return len;
 }
 
 FileIOResult File::read_unlocked(void *data, size_t len) {
   if (!read_allowed()) {
-    error_code = EBADF;
+    err_code = EBADF;
     return {0, EBADF};
   }
 
@@ -246,7 +246,7 @@ FileIOResult File::read_unlocked_fbf(uint8_t *data, size_t len) {
       if (!result.has_error())
         eof = true;
       else
-        error_code = result.error;
+        err_code = result.error;
       return {available_data + fetched_size, result.error};
     }
     return len;
@@ -264,7 +264,7 @@ FileIOResult File::read_unlocked_fbf(uint8_t *data, size_t len) {
     if (!result.has_error())
       eof = true;
     else
-      error_code = result.error;
+      err_code = result.error;
   }
   return {transfer_size + available_data, result.error};
 }
@@ -284,7 +284,7 @@ FileIOResult File::read_unlocked_nbf(uint8_t *data, size_t len) {
     if (!result.has_error())
       eof = true;
     else
-      error_code = result.error;
+      err_code = result.error;
   }
   return {result + available_data, result.error};
 }
@@ -323,7 +323,7 @@ int File::ungetc_unlocked(int c) {
   }
 
   eof = false; // There is atleast one character that can be read now.
-  error_code = 0; // This operation was a success.
+  err_code = 0; // This operation was a success.
   return c;
 }
 
@@ -333,8 +333,8 @@ ErrorOr<int> File::seek(off_t offset, int whence) {
 
     FileIOResult buf_result = platform_write(this, buf, pos);
     if (buf_result.has_error() || buf_result.value < pos) {
-      error_code = buf_result.has_error() ? buf_result.error : EIO;
-      return Error(error_code);
+      err_code = buf_result.has_error() ? buf_result.error : EIO;
+      return Error(err_code);
     }
   } else if (prev_op == FileOp::READ && whence == SEEK_CUR) {
     // More data could have been read out from the platform file than was
@@ -371,8 +371,8 @@ int File::flush_unlocked() {
   if (prev_op == FileOp::WRITE && pos > 0) {
     FileIOResult buf_result = platform_write(this, buf, pos);
     if (buf_result.has_error() || buf_result.value < pos) {
-      error_code = buf_result.has_error() ? buf_result.error : EIO;
-      return error_code;
+      err_code = buf_result.has_error() ? buf_result.error : EIO;
+      return err_code;
     }
     pos = 0;
   }

libc/src/__support/File/file.h

@@ -118,7 +118,7 @@ class File {
   size_t read_limit;
 
   bool eof;
-  int error_code;
+  int err_code;
 
   // This is a convenience RAII class to lock and unlock file objects.
   class FileLock {
@@ -161,7 +161,7 @@ class File {
                                   /*robust=*/false, /*pshared=*/false),
         ungetc_buf(0), buf(buffer), bufsize(buffer_size), bufmode(buffer_mode),
         own_buf(owned), mode(modeflags), pos(0), prev_op(FileOp::NONE),
-        read_limit(0), eof(false), error_code(0) {
+        read_limit(0), eof(false), err_code(0) {
     adjust_buf();
   }
 
@@ -214,8 +214,8 @@ class File {
       if (prev_op == FileOp::WRITE && pos > 0) {
         auto buf_result = platform_write(this, buf, pos);
         if (buf_result.has_error() || buf_result.value < pos) {
-          error_code = buf_result.has_error() ? buf_result.error : EIO;
-          return error_code;
+          err_code = buf_result.has_error() ? buf_result.error : EIO;
+          return err_code;
         }
       }
     }
@@ -250,14 +250,21 @@ class File {
   void lock() { mutex.lock(); }
   void unlock() { mutex.unlock(); }
 
-  bool error_unlocked() const { return error_code != 0; }
+  bool error_unlocked() const { return err_code != 0; }
 
   bool error() {
     FileLock l(this);
     return error_unlocked();
   }
 
-  void clearerr_unlocked() { error_code = 0; }
+  int error_code_unlocked() const { return err_code; }
+
+  int error_code() {
+    FileLock l(this);
+    return error_code_unlocked();
+  }
+
+  void clearerr_unlocked() { err_code = 0; }
 
   void clearerr() {
     FileLock l(this);

libc/src/stdio/CMakeLists.txt

@@ -125,6 +125,7 @@ add_entrypoint_object(
   DEPENDS
     libc.src.stdio.printf_core.printf_main
     libc.src.stdio.printf_core.writer
+    libc.src.stdio.printf_core.core_structs
 )
 
 add_entrypoint_object(
@@ -136,6 +137,7 @@ add_entrypoint_object(
   DEPENDS
     libc.src.stdio.printf_core.printf_main
     libc.src.stdio.printf_core.writer
+    libc.src.stdio.printf_core.core_structs
 )
 
 add_entrypoint_object(
@@ -146,6 +148,7 @@ add_entrypoint_object(
     asprintf.h
   DEPENDS
     libc.src.stdio.printf_core.vasprintf_internal
+    libc.src.stdio.printf_core.core_structs
 )
 
 add_entrypoint_object(
@@ -157,6 +160,7 @@ add_entrypoint_object(
   DEPENDS
     libc.src.stdio.printf_core.printf_main
     libc.src.stdio.printf_core.writer
+    libc.src.stdio.printf_core.core_structs
 )
 
 add_entrypoint_object(
@@ -168,6 +172,7 @@ add_entrypoint_object(
   DEPENDS
     libc.src.stdio.printf_core.printf_main
     libc.src.stdio.printf_core.writer
+    libc.src.stdio.printf_core.core_structs
 )
 
 add_entrypoint_object(
@@ -178,6 +183,7 @@ add_entrypoint_object(
     vasprintf.h
   DEPENDS
     libc.src.stdio.printf_core.vasprintf_internal
+    libc.src.stdio.printf_core.core_structs
 )
 
 add_subdirectory(printf_core)

libc/src/stdio/asprintf.cpp

@@ -24,7 +24,7 @@ LLVM_LIBC_FUNCTION(int, asprintf,
   va_end(vlist);
   auto ret_val = printf_core::vasprintf_internal(buffer, format, args);
   if (ret_val.has_error()) {
-    libc_errno = ret_val.error;
+    libc_errno = printf_core::internal_error_to_errno(ret_val.error);
     return -1;
   }
   if (ret_val.value > cpp::numeric_limits<int>::max()) {

libc/src/stdio/baremetal/printf.cpp

@@ -44,13 +44,13 @@ LLVM_LIBC_FUNCTION(int, printf, (const char *__restrict format, ...)) {
 
   auto retval = printf_core::printf_main(&writer, format, args);
   if (retval.has_error()) {
-    libc_errno = retval.error;
+    libc_errno = retval.error; // TODO map
     return -1;
   }
 
   int flushval = wb.overflow_write("");
   if (flushval != printf_core::WRITE_OK) {
-    libc_errno = -flushval;
+    libc_errno = -flushval; // TODO map
     return -1;
   }
 

libc/src/stdio/baremetal/vprintf.cpp

@@ -42,13 +42,13 @@ LLVM_LIBC_FUNCTION(int, vprintf,
 
   auto retval = printf_core::printf_main(&writer, format, args);
   if (retval.has_error()) {
-    libc_errno = retval.error;
+    libc_errno = retval.error; // TODO map
     return -1;
   }
 
   int flushval = wb.overflow_write("");
   if (flushval != printf_core::WRITE_OK) {
-    libc_errno = -flushval;
+    libc_errno = -flushval; // TODO map
     return -1;
   }
 

libc/src/stdio/generic/CMakeLists.txt

@@ -394,6 +394,7 @@ list(APPEND fprintf_deps
       libc.hdr.types.FILE
       libc.src.__support.arg_list
       libc.src.stdio.printf_core.vfprintf_internal
+      libc.src.stdio.printf_core.core_structs
 )
 
 if(LLVM_LIBC_FULL_BUILD)

libc/src/stdio/generic/fprintf.cpp

@@ -29,7 +29,7 @@ LLVM_LIBC_FUNCTION(int, fprintf,
   va_end(vlist);
   auto ret_val = printf_core::vfprintf_internal(stream, format, args);
   if (ret_val.has_error()) {
-    libc_errno = ret_val.error;
+    libc_errno = printf_core::internal_error_to_errno(ret_val.error, stream);
     return -1;
   }
   if (ret_val.value > cpp::numeric_limits<int>::max()) {

libc/src/stdio/generic/printf.cpp

@@ -11,6 +11,7 @@
 #include "src/__support/File/file.h"
 #include "src/__support/arg_list.h"
 #include "src/__support/macros/config.h"
+#include "src/stdio/printf_core/core_structs.h"
 #include "src/stdio/printf_core/vfprintf_internal.h"
 
 #include "hdr/types/FILE.h"
@@ -34,7 +35,10 @@ LLVM_LIBC_FUNCTION(int, printf, (const char *__restrict format, ...)) {
   auto ret_val = printf_core::vfprintf_internal(
       reinterpret_cast<::FILE *>(PRINTF_STDOUT), format, args);
   if (ret_val.has_error()) {
-    libc_errno = ret_val.error;
+    libc_errno = printf_core::internal_error_to_errno(
+        ret_val.error, reinterpret_cast<::FILE *>(PRINTF_STDOUT));
+    return -1;
+    ;
     return -1;
   }
   if (ret_val.value > cpp::numeric_limits<int>::max()) {

libc/src/stdio/generic/vfprintf.cpp

@@ -11,6 +11,7 @@
 #include "src/__support/File/file.h"
 #include "src/__support/arg_list.h"
 #include "src/__support/macros/config.h"
+#include "src/stdio/printf_core/core_structs.h"
 #include "src/stdio/printf_core/vfprintf_internal.h"
 
 #include "hdr/types/FILE.h"
@@ -26,7 +27,7 @@ LLVM_LIBC_FUNCTION(int, vfprintf,
                                  // destruction automatically.
   auto ret_val = printf_core::vfprintf_internal(stream, format, args);
   if (ret_val.has_error()) {
-    libc_errno = ret_val.error;
+    libc_errno = printf_core::internal_error_to_errno(ret_val.error, stream);
     return -1;
   }
   if (ret_val.value > cpp::numeric_limits<int>::max()) {