refactor: use openfile

Author: Зишан Мирза

libc/src/time/CMakeLists.txt

@@ -60,6 +60,7 @@ add_entrypoint_object(
     .timezone
     libc.hdr.types.time_t
     libc.include.time
+    libc.src.stdio.fopen
 )
 
 add_entrypoint_object(
@@ -74,6 +75,7 @@ add_entrypoint_object(
     .timezone
     libc.hdr.types.time_t
     libc.include.time
+    libc.src.stdio.fopen
 )
 
 add_entrypoint_object(
@@ -88,6 +90,7 @@ add_entrypoint_object(
     .timezone
     libc.hdr.types.time_t
     libc.include.time
+    libc.src.stdio.fopen
 )
 
 add_entrypoint_object(
@@ -102,6 +105,7 @@ add_entrypoint_object(
     .timezone
     libc.hdr.types.time_t
     libc.include.time
+    libc.src.stdio.fopen
 )
 
 add_entrypoint_object(
@@ -116,6 +120,7 @@ add_entrypoint_object(
     .timezone
     libc.hdr.types.time_t
     libc.include.time
+    libc.src.stdio.fopen
 )
 
 add_entrypoint_object(

libc/src/time/ctime.cpp

@@ -19,6 +19,7 @@ LLVM_LIBC_FUNCTION(char *, ctime, (const time_t *t_ptr)) {
   if (t_ptr == nullptr || *t_ptr > cpp::numeric_limits<int32_t>::max()) {
     return nullptr;
   }
+
   static char buffer[TimeConstants::ASCTIME_BUFFER_SIZE];
   return time_utils::asctime(time_utils::localtime_internal(t_ptr, &tm_out),
                              buffer, TimeConstants::ASCTIME_MAX_BYTES);

libc/src/time/time_utils.cpp

@@ -7,6 +7,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "src/time/time_utils.h"
+#include "src/__support/File/file.h"
+#include "src/stdio/fseek.h"
 #include <fcntl.h>
 #include <unistd.h>
 
@@ -26,24 +28,21 @@ static int64_t computeRemainingYears(int64_t daysPerYears,
 }
 
 volatile int file_usage = 0;
-volatile int fd = -1;
 
-void release_file(int fd) {
+void release_file(ErrorOr<File *> error_or_file) {
   file_usage = 0;
-  close(fd);
+  error_or_file.value()->close();
 }
 
-void acquire_file(char *filename) {
+ErrorOr<File *> acquire_file(char *filename) {
   while (1) {
     if (file_usage == 0) {
       file_usage = 1;
       break;
     }
   }
 
-  if ((fd = open(filename, O_RDONLY)) < 0) {
-    release_file(fd);
-  }
+  return LIBC_NAMESPACE::openfile(filename, "rb");
 }
 
 char *get_env_var(const char *input) {
@@ -214,18 +213,12 @@ timezone::tzset *get_localtime(struct tm *tm) {
     }
   }
 
-  acquire_file(tz_filename);
-
-  size_t filesize;
-  filesize = static_cast<size_t>(lseek(fd, 0, SEEK_END));
-  if (filesize < 0) {
-    close(fd);
-    return nullptr;
-  }
-  lseek(fd, 0, 0);
+  ErrorOr<File *> error_or_file = acquire_file(tz_filename);
+  File *file = error_or_file.value();
 
-  timezone::tzset *ptr_tzset = timezone::get_tzset(fd, filesize);
+  timezone::tzset *ptr_tzset = timezone::get_tzset(file);
   if (ptr_tzset == nullptr) {
+    release_file(file);
     return nullptr;
   }
 
@@ -239,7 +232,7 @@ timezone::tzset *get_localtime(struct tm *tm) {
   }
 
   if (file_usage == 1) {
-    release_file(fd);
+    release_file(file);
   }
 
   return ptr_tzset;

libc/src/time/time_utils.h

@@ -174,7 +174,7 @@ LIBC_INLINE struct tm *localtime_internal(const time_t *timer, struct tm *buf) {
 #ifdef LIBC_TARGET_ARCH_IS_X86_64
   timezone::tzset *ptr = get_localtime(buf);
   buf->tm_hour += ptr->global_offset;
-  buf->tm_isdst += ptr->global_isdst;
+  buf->tm_isdst = ptr->global_isdst;
 #endif
 
   return buf;

libc/src/time/timezone.cpp

@@ -17,33 +17,8 @@
 namespace LIBC_NAMESPACE_DECL {
 namespace timezone {
 
-tzset *get_tzset(int fd, size_t filesize) {
-  unsigned char hdr[filesize];
-  size_t t;
-
-  t = 0;
-  while (t < sizeof(hdr)) {
-    size_t r;
-
-    r = read(fd, hdr + t, sizeof(hdr) - t);
-
-    if (r < 0) {
-      close(fd);
-      return nullptr;
-    }
-
-    if (r == 0) {
-      break;
-    }
-
-    t += r;
-  }
-
-  if (t != sizeof(hdr)) {
-    close(fd);
-    return nullptr;
-  }
-
+tzset *get_tzset(File *file) {
+  unsigned char hdr[TIMEZONE_HDR_SIZE + 4096];
   int64_t magic;
   unsigned char version;
   __int128_t reserved;
@@ -56,6 +31,8 @@ tzset *get_tzset(int fd, size_t filesize) {
   __uint128_t tmp;
   size_t i;
 
+  file->read(hdr, TIMEZONE_HDR_SIZE + 4096);
+
   // these locations are defined in documentation
   // for `tzfile` and should be 44 bytes
   magic = (hdr[0] << 24) | (hdr[1] << 16) | (hdr[2] << 8) | hdr[3];
@@ -211,8 +188,6 @@ tzset *get_tzset(int fd, size_t filesize) {
 
   result.ttinfo = ttinfo;
 
-  close(fd);
-
   return &result;
 }
 

libc/src/time/timezone.h

@@ -9,6 +9,7 @@
 #ifndef LLVM_LIBC_SRC_TIME_TIMEZONE_H
 #define LLVM_LIBC_SRC_TIME_TIMEZONE_H
 
+#include "src/__support/File/file.h"
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
 #include "stddef.h"
@@ -48,7 +49,7 @@ typedef struct {
   int8_t global_isdst;
 } tzset;
 
-tzset *get_tzset(int fd, size_t filesize);
+tzset *get_tzset(File *file);
 
 } // namespace timezone
 } // namespace LIBC_NAMESPACE_DECL

libc/test/src/time/ctime_r_test.cpp

@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/__support/File/file.h"
 #include "src/errno/libc_errno.h"
 #include "src/time/ctime_r.h"
 #include "test/UnitTest/Test.h"