Merge branch 'main' into john-upgrade-mbedtls

Expensify · Jul 16, 2024 · 1875241 · 1875241
2 parents 0a1808e + fa080ac
commit 1875241
Show file tree

Hide file tree

Showing 6 changed files with 5,450 additions and 3,414 deletions.
diff --git a/.github/workflows/bedrock.yml b/.github/workflows/bedrock.yml
@@ -19,6 +19,9 @@ jobs:
     timeout-minutes: 30
     steps:
 
+    - name: Install the Mold Linker
+      uses: rui314/setup-mold@v1
+
     - name: Checkout Bedrock
       uses: actions/checkout@v4.1.0
 

diff --git a/libstuff/STime.cpp b/libstuff/STime.cpp
@@ -1,5 +1,6 @@
 #include "libstuff.h"
 
+#include <cstring>
 #include <sys/time.h>
 
 uint64_t STimeNow() {
@@ -19,6 +20,13 @@ string SComposeTime(const string& format, uint64_t when) {
     return string(buf, length);
 }
 
+uint64_t STimestampToEpoch(const string& format, const string& timestamp) {
+    struct tm time;
+    memset(&time, 0, sizeof(struct tm));
+    strptime(timestamp.c_str(), format.c_str(), &time);
+    return mktime(&time);
+}
+
 int SDaysInMonth(int year, int month) {
     // 30 days hath September...
     if (month == 4 || month == 6 || month == 9 || month == 11) {

diff --git a/libstuff/libstuff.cpp b/libstuff/libstuff.cpp
@@ -1769,7 +1769,7 @@ int S_socket(const string& host, bool isTCP, bool isPort, bool isBlocking) {
             // There was a problem.
             if (result || !resolved) {
                 freeaddrinfo(resolved);
-                STHROW("can't resolve host error no#" + result);
+                STHROW("can't resolve host error no#" + SToStr(result));
             }
             // Grab the resolved address.
             sockaddr_in* addr = (sockaddr_in*)resolved->ai_addr;

diff --git a/libstuff/libstuff.h b/libstuff/libstuff.h
@@ -161,6 +161,7 @@ uint64_t STimeNow();
 uint64_t STimeThisMorning(); // Timestamp for this morning at midnight GMT
 int SDaysInMonth(int year, int month);
 string SComposeTime(const string& format, uint64_t when);
+uint64_t STimestampToEpoch(const string& format, const string& timestamp);
 timeval SToTimeval(uint64_t when);
 string SFirstOfMonth(const string& timeStamp, const int64_t& offset = 0);