Modify musl errno messages to match llvm-libc

Author: google-yfyang

system/lib/libc/musl/src/errno/__strerror.h

@@ -3,7 +3,7 @@
  * with these messages, and then to define a lookup table translating
  * error codes to offsets of corresponding fields in the structure. */
 
-E(0,            "No error information")
+E(0,            "Success")
 
 E(EILSEQ,       "Illegal byte sequence")
 E(EDOM,         "Domain error")
@@ -16,7 +16,7 @@ E(ENOENT,       "No such file or directory")
 E(ESRCH,        "No such process")
 E(EEXIST,       "File exists")
 
-E(EOVERFLOW,    "Value too large for data type")
+E(EOVERFLOW,    "Value too large for defined data type")
 E(ENOSPC,       "No space left on device")
 E(ENOMEM,       "Out of memory")
 

system/lib/llvm-libc/src/__support/StringUtil/platform_errors.h

@@ -9,8 +9,10 @@
 #ifndef LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_PLATFORM_ERRORS_H
 #define LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_PLATFORM_ERRORS_H
 
-#if defined(__linux__) || defined(__Fuchsia__) || defined(__EMSCRIPTEN__)
+#if defined(__linux__) || defined(__Fuchsia__)
 #include "tables/linux_platform_errors.h"
+#elif defined(__EMSCRIPTEN__)
+#include "tables/emscripten_platform_errors.h"
 #else
 #include "tables/minimal_platform_errors.h"
 #endif

system/lib/llvm-libc/src/__support/StringUtil/tables/emscripten_platform_errors.h

@@ -0,0 +1,26 @@
+//===-- Map of error numbers to strings for the Emscripten platform --*- 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_EMSCRPITEN_PLATFORM_ERRORS_H
+#define LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_EMSCRPITEN_PLATFORM_ERRORS_H
+
+#include "posix_errors.h"
+#include "src/__support/macros/config.h"
+#include "stdc_errors.h"
+
+namespace LIBC_NAMESPACE_DECL {
+
+LIBC_INLINE_VAR constexpr auto PLATFORM_ERRORS =
+    STDC_ERRORS + POSIX_ERRORS;
+
+LIBC_INLINE_VAR constexpr auto PLATFORM_ERRNO_NAMES =
+    STDC_ERRNO_NAMES + POSIX_ERRNO_NAMES;
+
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_EMSCRPITEN_PLATFORM_ERRORS_H

system/lib/llvm-libc/src/__support/StringUtil/tables/posix_errors.h

@@ -63,12 +63,7 @@ LIBC_INLINE_VAR constexpr MsgTable<76> POSIX_ERRORS = {
     MsgMapping(EPROTO, "Protocol error"),
     MsgMapping(EMULTIHOP, "Multihop attempted"),
     MsgMapping(EBADMSG, "Bad message"),
-#ifdef __EMSCRIPTEN__
-    // For now, match the musl string
-    MsgMapping(EOVERFLOW, "Value too large for data type"),
-#else
     MsgMapping(EOVERFLOW, "Value too large for defined data type"),
-#endif
     MsgMapping(ENOTSOCK, "Socket operation on non-socket"),
     MsgMapping(EDESTADDRREQ, "Destination address required"),
     MsgMapping(EMSGSIZE, "Message too long"),

system/lib/llvm-libc/src/__support/StringUtil/tables/stdc_errors.h

@@ -16,12 +16,7 @@
 namespace LIBC_NAMESPACE_DECL {
 
 LIBC_INLINE_VAR constexpr const MsgTable<4> STDC_ERRORS = {
-#ifdef __EMSCRIPTEN__
-    // For now, match the musl name for errno 0.
-    MsgMapping(0, "No error information"),
-#else
     MsgMapping(0, "Success"),
-#endif
     MsgMapping(EDOM, "Numerical argument out of domain"),
     MsgMapping(ERANGE, "Numerical result out of range"),
     MsgMapping(EILSEQ, "Invalid or incomplete multibyte or wide character"),

test/fcntl/test_fcntl_misc.out

@@ -8,5 +8,5 @@ st_size: 10
 
 posix_fallocate 3: Invalid argument
 posix_fallocate 4: Invalid argument
-posix_fallocate 5: Value too large for data type
-posix_fallocate 6: Value too large for data type
+posix_fallocate 5: Value too large for defined data type
+posix_fallocate 6: Value too large for defined data type

test/unistd/curdir.out

@@ -1,5 +1,5 @@
 getcwd: /
-errno: No error information
+errno: Success
 
 chdir(file): -1
 errno: Not a directory
@@ -11,16 +11,16 @@ chdir(device): -1
 errno: Not a directory
 
 chdir(folder): 0
-errno: No error information
+errno: Success
 getcwd: /folder
 
 chdir(nonexistent): -1
 errno: No such file or directory
 
 chdir(link): 0
-errno: No error information
+errno: Success
 getcwd: /folder
 
 fchdir(/): 0
-errno: No error information
+errno: Success
 getcwd: /

test/unistd/dup.out

@@ -1,13 +1,13 @@
 DUP
-errno: No error information
+errno: Success
 f: 1
 f2,f3: 1
 close(f1): 0
 close(f2): 0
 close(f3): 0
 
 DUP2
-errno: No error information
+errno: Success
 f: 1
 f2,f3: 1
 close(f1): 0

test/unistd/links.out

@@ -1,5 +1,5 @@
 readlink: 'link'
-errno: No error information
+errno: Success
 
 readlink: 'file'
 errno: Invalid argument

test/unistd/test_unistd_write_broken_link.out

@@ -1,6 +1,6 @@
 link result: 0
-source_fd: 3, errno: 0 No error information
-target_fd: 3, errno: 0 No error information
+source_fd: 3, errno: 0 Success
+target_fd: 3, errno: 0 Success
 buf: 'abc'
-target_fd: 3, errno: 0 No error information
+target_fd: 3, errno: 0 Success
 buf: 'abc'