add upstream 11.1

1 files changed, 0 insertions, 131 deletions

diff --git a/zen/system.cpp b/zen/system.cpp
deleted file mode 100644
index 23e2c343..00000000
--- a/zen/system.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-// *****************************************************************************
-// * This file is part of the FreeFileSync project. It is distributed under    *
-// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0          *
-// * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved *
-// *****************************************************************************
-
-#include "system.h"
-#include "file_access.h"
-#include "crc.h"
-
-    #include "symlink_target.h"
-    #include "file_io.h"
-    #include <ifaddrs.h>
-    #include <net/if.h> //IFF_LOOPBACK
-    #include <netpacket/packet.h> //sockaddr_ll
-
-    #include <unistd.h> //getuid()
-    #include <pwd.h>    //getpwuid_r()
-    #include "shell_execute.h"
-
-using namespace zen;
-
-
-std::wstring zen::getUserName() //throw FileError
-{
-    const uid_t userIdNo = ::getuid(); //never fails
-
-    std::vector<char> buffer(std::max<long>(10000, ::sysconf(_SC_GETPW_R_SIZE_MAX))); //::sysconf may return long(-1)
-    struct passwd buffer2 = {};
-    struct passwd* pwsEntry = nullptr;
-    if (::getpwuid_r(userIdNo, &buffer2, &buffer[0], buffer.size(), &pwsEntry) != 0) //getlogin() is deprecated and not working on Ubuntu at all!!!
-        THROW_LAST_FILE_ERROR(_("Cannot get process information."), "getpwuid_r");
-    if (!pwsEntry)
-        throw FileError(_("Cannot get process information."), L"no login found"); //should not happen?
-
-    return utfTo<std::wstring>(pwsEntry->pw_name);
-}
-
-
-namespace
-{
-}
-
-
-ComputerModel zen::getComputerModel() //throw FileError
-{
-    ComputerModel cm;
-    try
-    {
-        auto tryGetInfo = [](const Zstring& filePath)
-        {
-            if (!fileAvailable(filePath))
-                return std::wstring();
-            try
-            {
-                const std::string stream = loadBinContainer<std::string>(filePath, nullptr /*notifyUnbufferedIO*/); //throw FileError
-                return utfTo<std::wstring>(trimCpy(stream));
-            }
-            catch (const FileError& e) { throw SysError(replaceCpy(e.toString(), L"\n\n", L'\n')); } //errors should be further enriched by context info => SysError
-        };
-        cm.model  = tryGetInfo("/sys/devices/virtual/dmi/id/product_name"); //throw SysError
-        cm.vendor = tryGetInfo("/sys/devices/virtual/dmi/id/sys_vendor");   //
-
-        //clean up:
-        for (const char* dummyModel :
-             {
-                 "To Be Filled By O.E.M.", "Default string", "empty", "O.E.M", "OEM", "NA",
-                 "System Product Name", "Please change product name", "INVALID",
-             })
-            if (equalAsciiNoCase(cm.model, dummyModel))
-            {
-                cm.model.clear();
-                break;
-            }
-
-        for (const char* dummyVendor :
-             {
-                 "To Be Filled By O.E.M.", "Default string", "empty", "O.E.M", "OEM", "NA",
-                 "System manufacturer", "OEM Manufacturer",
-             })
-            if (equalAsciiNoCase(cm.vendor, dummyVendor))
-            {
-                cm.vendor.clear();
-                break;
-            }
-
-        return cm;
-    }
-    catch (const SysError& e) { throw FileError(_("Cannot get process information."), e.toString()); }
-}
-
-
-
-
-std::wstring zen::getOsDescription() //throw FileError
-{
-    try
-    {
-        //"lsb_release" not available on some systems: https://freefilesync.org/forum/viewtopic.php?t=7191
-        //  => use /etc/os-release: https://www.freedesktop.org/software/systemd/man/os-release.html
-        std::string releaseInfo;
-        try
-        {
-            releaseInfo = loadBinContainer<std::string>("/etc/os-release", nullptr /*notifyUnbufferedIO*/); //throw FileError
-        }
-        catch (const FileError& e) { throw SysError(replaceCpy(e.toString(), L"\n\n", L'\n')); } //errors should be further enriched by context info => SysError
-
-        std::string osName;
-        std::string osVersion;
-        for (const std::string& line : split(releaseInfo, '\n', SplitType::SKIP_EMPTY)) //throw FileError
-            if (startsWith(line, "NAME="))
-                osName = afterFirst(line, '=', IF_MISSING_RETURN_NONE);
-            else if (startsWith(line, "VERSION_ID="))
-                osVersion = afterFirst(line, '=', IF_MISSING_RETURN_NONE);
-
-        trim(osName,    true, true, [](char c) { return c == '"' || c == '\''; });
-        trim(osVersion, true, true, [](char c) { return c == '"' || c == '\''; });
-
-        if (osName.empty()) throw SysError(formatSystemError("/etc/os-release", L"", L"NAME missing."));
-        //VERSION_ID usually available, except for Arch Linux: https://freefilesync.org/forum/viewtopic.php?t=7276
-        //PRETTY_NAME? too wordy! e.g. "Fedora 17 (Beefy Miracle)"
-
-        return utfTo<std::wstring>(trimCpy(osName + ' ' + osVersion)); //e.g. "CentOS Linux 7"
-
-    }
-    catch (const SysError& e) { throw FileError(_("Cannot get process information."), e.toString()); }
-}
-
-
-
-