mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USe safer functions, gmtime_r and localtime_r

Browse Source
This commit is contained in:
louiz’
2019-09-23 22:07:57 +02:00
parent 89bb886a1b
commit 6ab064d04d
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/time.cpp
+3 -2
View File
@@ -1,5 +1,5 @@
#include <utils/time.hpp> #include <utils/time.hpp>
#include <ctime> #include <time.h>
#include <sstream> #include <sstream>
#include <iomanip> #include <iomanip>
@@ -14,7 +14,8 @@ std::string to_string(const std::chrono::system_clock::time_point::rep& time)
constexpr std::size_t stamp_size = 21; constexpr std::size_t stamp_size = 21;
const std::time_t timestamp = static_cast<std::time_t>(time); const std::time_t timestamp = static_cast<std::time_t>(time);
char date_buf[stamp_size]; char date_buf[stamp_size];
if (std::strftime(date_buf, stamp_size, "%FT%TZ", std::gmtime(&timestamp)) != stamp_size - 1) struct tm tm;
if (std::strftime(date_buf, stamp_size, "%FT%TZ", gmtime_r(&timestamp, &tm)) != stamp_size - 1)
return ""; return "";
return {std::begin(date_buf), std::end(date_buf) - 1}; return {std::begin(date_buf), std::end(date_buf) - 1};
} }
src/xmpp/biboumi_adhoc_commands.cpp
+4 -3
View File
@@ -25,7 +25,7 @@ static void set_desc(XmlSubNode& field, const char* text)
#endif #endif
#ifndef HAS_PUT_TIME #ifndef HAS_PUT_TIME
#include <ctime> # include <time.h>
#endif #endif
using namespace std::string_literals; using namespace std::string_literals;
@@ -884,12 +884,13 @@ void GetIrcConnectionInfoStep1(XmppComponent& component, AdhocSession& session,
if (irc->is_using_tls()) if (irc->is_using_tls())
ss << " (using TLS)"; ss << " (using TLS)";
const std::time_t now_c = std::chrono::system_clock::to_time_t(irc->connection_date); const std::time_t now_c = std::chrono::system_clock::to_time_t(irc->connection_date);
struct tm tm;
#ifdef HAS_PUT_TIME #ifdef HAS_PUT_TIME
ss << " since " << std::put_time(std::localtime(&now_c), "%F %T"); ss << " since " << std::put_time(localtime_r(&now_c, &tm), "%F %T");
#else #else
constexpr std::size_t timestamp_size{10 + 1 + 8 + 1}; constexpr std::size_t timestamp_size{10 + 1 + 8 + 1};
char buf[timestamp_size] = {}; char buf[timestamp_size] = {};
const auto res = std::strftime(buf, timestamp_size, "%F %T", std::localtime(&now_c)); const auto res = std::strftime(buf, timestamp_size, "%F %T", localtime(&now_c, &tm));
if (res > 0) if (res > 0)
ss << " since " << buf; ss << " since " << buf;
#endif #endif