refactor: move to libtrbase: env

cli/cli.cc

@@ -13,11 +13,11 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/env.h"
 #include "lib/base/error.h"
 #include "lib/base/file.h"
 
 #include "libtransmission/transmission.h"
-#include "libtransmission/env.h"
 #include "libtransmission/tr-getopt.h"
 #include "libtransmission/utils.h" // _()
 #include "libtransmission/values.h"

gtk/Session.cc

@@ -15,7 +15,6 @@
 #include "Utils.h"
 
 #include <libtransmission/transmission.h>
-#include <libtransmission/env.h>
 #include <libtransmission/log.h>
 #include <libtransmission/rpcimpl.h>
 #include <libtransmission/torrent-metainfo.h>
@@ -23,6 +22,8 @@
 #include <libtransmission/variant.h>
 #include <libtransmission/web-utils.h> // tr_urlIsValid()
 
+#include "lib/base/env.h"
+
 #include <giomm/asyncresult.h>
 #include <giomm/dbusconnection.h>
 #include <giomm/fileinfo.h>

lib/base/CMakeLists.txt

@@ -2,6 +2,8 @@ add_library(trbase STATIC)
 
 target_sources(trbase
     PRIVATE
+        env.cc
+        env.h
         error.cc
         error.h
         file-posix.cc

lib/base/env.cc

@@ -3,19 +3,16 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include "libtransmission/env.h"
-
 #include <cstdlib>
-#include <iterator>
 #include <string>
 
 #ifdef _WIN32
 #include <windows.h>
 #endif
 
+#include "lib/base/env.h"
 #include "lib/base/string-utils.h"
 #include "lib/base/tr-assert.h"
-#include "libtransmission/tr-strbuf.h"
 
 bool tr_env_key_exists(char const* key) noexcept
 {
@@ -49,9 +46,9 @@ std::string tr_env_get_string(std::string_view key, std::string_view default_val
 
 #else
 
-    auto const szkey = tr_strbuf<char, 256>{ key };
+    auto const szkey = std::string{ key };
 
-    if (auto const* const value = getenv(szkey); value != nullptr)
+    if (auto const* const value = getenv(szkey.c_str()); value != nullptr)
     {
         return value;
     }

libtransmission/CMakeLists.txt

@@ -54,8 +54,6 @@ target_sources(${TR_NAME}
         crypto-utils.cc
         crypto-utils.h
         error-types.h
-        env.cc
-        env.h
         file-piece-map.cc
         file-piece-map.h
         handshake.cc

libtransmission/announcer-http.cc

@@ -23,19 +23,19 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/env.h"
 #include "lib/base/error.h"
+#include "lib/base/string-utils.h"
+#include "lib/base/tr-assert.h"
 
 #define LIBTRANSMISSION_ANNOUNCER_MODULE
 #include "libtransmission/announcer-common.h"
 #include "libtransmission/benc.h"
 #include "libtransmission/crypto-utils.h"
-#include "libtransmission/env.h"
 #include "libtransmission/log.h"
 #include "libtransmission/net.h"
 #include "libtransmission/peer-mgr.h" /* pex */
 #include "libtransmission/session.h"
-#include "lib/base/string-utils.h"
-#include "lib/base/tr-assert.h"
 #include "libtransmission/tr-strbuf.h" // tr_strbuf, tr_urlbuf
 #include "libtransmission/types.h"
 #include "libtransmission/utils.h"

libtransmission/api-compat.cc

@@ -12,12 +12,13 @@
 #include <string_view>
 #include <vector>
 
+#include "lib/base/env.h"
+#include "lib/base/string-utils.h"
+
 #include "libtransmission/api-compat.h"
-#include "libtransmission/env.h"
 #include "libtransmission/quark.h"
 #include "libtransmission/rpcimpl.h"
 #include "libtransmission/serializer.h"
-#include "lib/base/string-utils.h"
 #include "libtransmission/types.h"
 #include "libtransmission/variant.h"
 

libtransmission/platform.cc

@@ -38,12 +38,12 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/env.h"
 #include "lib/base/file-utils.h"
 #include "lib/base/file.h"
 #include "lib/base/string-utils.h"
 
 #include "libtransmission/transmission.h"
-#include "libtransmission/env.h"
 #include "libtransmission/log.h"
 #include "libtransmission/platform.h"
 #include "libtransmission/session.h"

libtransmission/utils.cc

@@ -40,11 +40,12 @@
 
 #include <fast_float/fast_float.h>
 
-#include "libtransmission/env.h"
+#include "lib/base/env.h"
-#include "libtransmission/mime-types.h"
-#include "libtransmission/serializer.h"
 #include "lib/base/string-utils.h"
 #include "lib/base/tr-assert.h"
+
+#include "libtransmission/mime-types.h"
+#include "libtransmission/serializer.h"
 #include "libtransmission/tr-strbuf.h"
 #include "libtransmission/types.h"
 #include "libtransmission/utils.h"

libtransmission/web.cc

@@ -36,12 +36,13 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/env.h"
+#include "lib/base/tr-assert.h"
+
 #ifdef _WIN32
 #include "libtransmission/crypto-utils.h"
 #endif
-#include "libtransmission/env.h"
 #include "libtransmission/log.h"
-#include "lib/base/tr-assert.h"
 #include "libtransmission/utils.h"
 #include "libtransmission/web.h"
 #include "libtransmission/web-utils.h"

tests/libtransmission/env-test.cc

@@ -11,7 +11,7 @@
 #define unsetenv(key) SetEnvironmentVariableA(key, nullptr)
 #endif
 
-#include <libtransmission/env.h>
+#include "lib/base/env.h"
 
 #include "test-fixtures.h"
 

tests/libtransmission/subprocess-test-program.cc

@@ -3,10 +3,9 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include "lib/base/env.h"
 #include "lib/base/file.h" // tr_sys_dir_get_current()
 
-#include <libtransmission/env.h>
-
 #include <fmt/format.h>
 #include <fmt/ostream.h>
 

tests/libtransmission/utils-test.cc

@@ -16,10 +16,10 @@
 
 #include <gtest/gtest.h>
 
-#include <libtransmission/transmission.h>
+#include "lib/base/env.h"
 
-#include <libtransmission/env.h>
+#include "libtransmission/transmission.h"
-#include <libtransmission/utils.h>
+#include "libtransmission/utils.h"
 
 #include "test-fixtures.h"
 

tests/qt/session-test.cc

@@ -11,9 +11,10 @@
 #include <QRegularExpression>
 #include <QTest>
 
-#include <libtransmission/transmission.h>
+#include "lib/base/env.h"
-#include <libtransmission/api-compat.h>
+
-#include <libtransmission/env.h>
+#include "libtransmission/transmission.h"
+#include "libtransmission/api-compat.h"
 
 #include "Prefs.h"
 #include "Session.h"

utils/remote.cc

@@ -26,6 +26,7 @@
 #include <fmt/chrono.h>
 #include <fmt/format.h>
 
+#include "lib/base/env.h"
 #include "lib/base/file-utils.h"
 #include "lib/base/file.h"
 #include "lib/base/string-utils.h"
@@ -34,7 +35,6 @@
 #include "libtransmission/transmission.h"
 #include "libtransmission/api-compat.h"
 #include "libtransmission/crypto-utils.h"
-#include "libtransmission/env.h"
 #include "libtransmission/quark.h"
 #include "libtransmission/rpcimpl.h"
 #include "libtransmission/tr-getopt.h"