Move the implementation of 'fdopen' to 'linux/file.cpp'

Author: simonzgx

libc/src/__support/File/file.h

@@ -304,6 +304,8 @@ class File {
 // library.
 ErrorOr<File *> openfile(const char *path, const char *mode);
 
+ErrorOr<File *> create_file_from_fd(int fd, const char *mode);
+
 // The platform_file library should implement it if it relevant for that
 // platform.
 int get_fileno(File *f);

libc/src/__support/File/linux/file.cpp

@@ -8,10 +8,10 @@
 
 #include "file.h"
 
-#include "src/__support/File/file.h"
-
 #include "src/__support/CPP/new.h"
+#include "src/__support/File/file.h"
 #include "src/__support/File/linux/lseekImpl.h"
+#include "src/__support/OSUtil/fcntl.h"
 #include "src/__support/OSUtil/syscall.h" // For internal syscall function.
 #include "src/errno/libc_errno.h"         // For error macros
 
@@ -119,6 +119,60 @@ ErrorOr<File *> openfile(const char *path, const char *mode) {
   return file;
 }
 
+ErrorOr<File *> create_file_from_fd(int fd, const char *mode) {
+  using ModeFlags = File::ModeFlags;
+  ModeFlags modeflags = File::mode_flags(mode);
+  if (modeflags == 0) {
+    return Error(EINVAL);
+  }
+
+  int fd_flags = internal::fcntl(fd, F_GETFL);
+  if (fd_flags == -1) {
+    return Error(EBADF);
+  }
+
+  using OpenMode = File::OpenMode;
+  if (((fd_flags & O_ACCMODE) == O_RDONLY &&
+       !(modeflags & static_cast<ModeFlags>(OpenMode::READ))) ||
+      ((fd_flags & O_ACCMODE) == O_WRONLY &&
+       !(modeflags & static_cast<ModeFlags>(OpenMode::WRITE)))) {
+    return Error(EINVAL);
+  }
+
+  bool do_seek = false;
+  if ((modeflags & static_cast<ModeFlags>(OpenMode::APPEND)) &&
+      !(fd_flags & O_APPEND)) {
+    do_seek = true;
+    if (internal::fcntl(fd, F_SETFL,
+                        reinterpret_cast<void *>(fd_flags | O_APPEND)) == -1) {
+      return Error(EBADF);
+    }
+  }
+
+  uint8_t *buffer;
+  {
+    AllocChecker ac;
+    buffer = new (ac) uint8_t[File::DEFAULT_BUFFER_SIZE];
+    if (!ac) {
+      return Error(ENOMEM);
+    }
+  }
+  AllocChecker ac;
+  auto *file = new (ac)
+      LinuxFile(fd, buffer, File::DEFAULT_BUFFER_SIZE, _IOFBF, true, modeflags);
+  if (!ac) {
+    return Error(ENOMEM);
+  }
+  if (do_seek) {
+    auto result = file->seek(0, SEEK_END);
+    if (!result.has_value()) {
+      free(file);
+      return Error(result.error());
+    }
+  }
+  return file;
+}
+
 int get_fileno(File *f) {
   auto *lf = reinterpret_cast<LinuxFile *>(f);
   return lf->get_fd();

libc/src/__support/OSUtil/fcntl.h

@@ -1,6 +1,4 @@
-//===-- Implementation header of internal fcntl function ---------------*- C++
-//-*-===//
-//
+//===-- Implementation header of internal fcntl function ------------------===//
 // 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

libc/src/stdio/linux/CMakeLists.txt

@@ -33,8 +33,6 @@ add_entrypoint_object(
     ../fdopen.h
   DEPENDS
     libc.include.stdio
-    libc.src.errno.errno
-    libc.src.stdio.fseek
+    libc.src.__support.File.file
     libc.src.__support.File.platform_file
-    libc.src.__support.OSUtil.osutil
 )

libc/src/stdio/linux/fdopen.cpp

@@ -8,72 +8,18 @@
 
 #include "src/stdio/fdopen.h"
 
-#include "hdr/errno_macros.h"
-#include "include/llvm-libc-macros/fcntl-macros.h"
-#include "src/__support/File/linux/file.h"
-#include "src/__support/OSUtil/fcntl.h"
+#include "src/__support/File/file.h"
 #include "src/errno/libc_errno.h"
 
 namespace LIBC_NAMESPACE {
 
 LLVM_LIBC_FUNCTION(::FILE *, fdopen, (int fd, const char *mode)) {
-  using ModeFlags = File::ModeFlags;
-  ModeFlags modeflags = File::mode_flags(mode);
-  if (modeflags == 0) {
-    libc_errno = EINVAL;
+  auto result = LIBC_NAMESPACE::create_file_from_fd(fd, mode);
+  if (!result.has_value()) {
+    libc_errno = result.error();
     return nullptr;
   }
-
-  int fd_flags = internal::fcntl(fd, F_GETFL);
-  if (fd_flags == -1) {
-    return nullptr;
-  }
-
-  using OpenMode = File::OpenMode;
-  if (((fd_flags & O_ACCMODE) == O_RDONLY &&
-       !(modeflags & static_cast<ModeFlags>(OpenMode::READ))) ||
-      ((fd_flags & O_ACCMODE) == O_WRONLY &&
-       !(modeflags & static_cast<ModeFlags>(OpenMode::WRITE)))) {
-    libc_errno = EINVAL;
-    return nullptr;
-  }
-
-  bool do_seek = false;
-  if ((modeflags & static_cast<ModeFlags>(OpenMode::APPEND)) &&
-      !(fd_flags & O_APPEND)) {
-    do_seek = true;
-    if (internal::fcntl(fd, F_SETFL,
-                        reinterpret_cast<void *>(fd_flags | O_APPEND)) == -1) {
-      return nullptr;
-    }
-  }
-
-  uint8_t *buffer;
-  {
-    AllocChecker ac;
-    buffer = new (ac) uint8_t[File::DEFAULT_BUFFER_SIZE];
-    if (!ac) {
-      libc_errno = ENOMEM;
-      return nullptr;
-    }
-  }
-  AllocChecker ac;
-  auto *file = new (ac)
-      LinuxFile(fd, buffer, File::DEFAULT_BUFFER_SIZE, _IOFBF, true, modeflags);
-  if (!ac) {
-    libc_errno = ENOMEM;
-    return nullptr;
-  }
-  if (do_seek) {
-    auto result = file->seek(0, SEEK_END);
-    if (!result.has_value()) {
-      libc_errno = result.error();
-      free(file);
-      return nullptr;
-    }
-  }
-
-  return reinterpret_cast<::FILE *>(file);
+  return reinterpret_cast<::FILE *>(result.value());
 }
 
 } // namespace LIBC_NAMESPACE

libc/test/src/stdio/fdopen_test.cpp

@@ -8,7 +8,7 @@
 
 #include "src/stdio/fdopen.h"
 
-#include "include/llvm-libc-macros/fcntl-macros.h"
+#include "hdr/fcntl_macros.h"
 #include "src/errno/libc_errno.h"
 #include "src/fcntl/open.h"
 #include "src/stdio/fclose.h"
@@ -47,8 +47,7 @@ TEST(LlvmLibcStdioFdopenTest, WriteAppendRead) {
   auto *fp3 = LIBC_NAMESPACE::fdopen(fd3, "r");
   char buffer[10];
   LIBC_NAMESPACE::fgets(buffer, sizeof(buffer), fp3);
-  EXPECT_EQ('H', buffer[0]);
-  EXPECT_EQ('M', buffer[8]);
+  ASSERT_STREQ("HelloLLVM", buffer);
   LIBC_NAMESPACE::fclose(fp3);
   ASSERT_ERRNO_SUCCESS();
 }