Extract header qenvironmentvariables.h from qglobal.h

qcontainerfwd.h was relying on the forward declaration of QByteArray in
qglobal.h, so add the missing forward declaration there.

Additionally, had to move the implementations of qTzSet() and qMkTime()
to qenvironmentvariables.cpp along with environmentMutex.

Task-number: QTBUG-99313
Change-Id: I233aff305c2fedaf0a48362cc99ff2d6f6c0ee54
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

1 files changed, 0 insertions, 328 deletions

diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 796749c146..9811a6003a 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -18,9 +18,6 @@
 #include "qnativeinterface.h"
 #include "qnativeinterface_p.h"
 
-#include <qmutex.h>
-#include <QtCore/private/qlocking_p.h>
-
 #include <stdlib.h>
 #include <limits.h>
 #include <stdarg.h>
@@ -3255,34 +3252,6 @@ Q_CORE_EXPORT Q_DECL_CONST_FUNCTION unsigned int qt_int_sqrt(unsigned int n)
     return p;
 }
 
-// In the C runtime on all platforms access to the environment is not thread-safe. We
-// add thread-safety for the Qt wrappers.
-Q_CONSTINIT static QBasicMutex environmentMutex;
-
-/*
-  Wraps tzset(), which accesses the environment, so should only be called while
-  we hold the lock on the environment mutex.
-*/
-void qTzSet()
-{
-    const auto locker = qt_scoped_lock(environmentMutex);
-#if defined(Q_OS_WIN)
-    _tzset();
-#else
-    tzset();
-#endif // Q_OS_WIN
-}
-
-/*
-  Wrap mktime(), which is specified to behave as if it called tzset(), hence
-  shares its implicit environment-dependence.
-*/
-time_t qMkTime(struct tm *when)
-{
-    const auto locker = qt_scoped_lock(environmentMutex);
-    return mktime(when);
-}
-
 void qAbort()
 {
 #ifdef Q_OS_WIN
@@ -3317,303 +3286,6 @@ void qAbort()
 // strftime() -- not used (except in tests)
 
 /*!
-    \relates <QtGlobal>
-    \threadsafe
-
-    Returns the value of the environment variable with name \a varName as a
-    QByteArray. If no variable by that name is found in the environment, this
-    function returns a default-constructed QByteArray.
-
-    The Qt environment manipulation functions are thread-safe, but this
-    requires that the C library equivalent functions like getenv and putenv are
-    not directly called.
-
-    To convert the data to a QString use QString::fromLocal8Bit().
-
-    \note on desktop Windows, qgetenv() may produce data loss if the
-    original string contains Unicode characters not representable in the
-    ANSI encoding. Use qEnvironmentVariable() instead.
-    On Unix systems, this function is lossless.
-
-    \sa qputenv(), qEnvironmentVariable(), qEnvironmentVariableIsSet(),
-    qEnvironmentVariableIsEmpty()
-*/
-QByteArray qgetenv(const char *varName)
-{
-    const auto locker = qt_scoped_lock(environmentMutex);
-#ifdef Q_CC_MSVC
-    size_t requiredSize = 0;
-    QByteArray buffer;
-    getenv_s(&requiredSize, 0, 0, varName);
-    if (requiredSize == 0)
-        return buffer;
-    buffer.resize(int(requiredSize));
-    getenv_s(&requiredSize, buffer.data(), requiredSize, varName);
-    // requiredSize includes the terminating null, which we don't want.
-    Q_ASSERT(buffer.endsWith('\0'));
-    buffer.chop(1);
-    return buffer;
-#else
-    return QByteArray(::getenv(varName));
-#endif
-}
-
-/*!
-    \fn QString qEnvironmentVariable(const char *varName, const QString &defaultValue)
-    \fn QString qEnvironmentVariable(const char *varName)
-
-    \relates <QtGlobal>
-    \since 5.10
-
-    These functions return the value of the environment variable, \a varName, as a
-    QString. If no variable \a varName is found in the environment and \a defaultValue
-    is provided, \a defaultValue is returned. Otherwise QString() is returned.
-
-    The Qt environment manipulation functions are thread-safe, but this
-    requires that the C library equivalent functions like getenv and putenv are
-    not directly called.
-
-    The following table describes how to choose between qgetenv() and
-    qEnvironmentVariable():
-    \table
-      \header \li Condition         \li Recommendation
-      \row
-        \li Variable contains file paths or user text
-        \li qEnvironmentVariable()
-      \row
-        \li Windows-specific code
-        \li qEnvironmentVariable()
-      \row
-        \li Unix-specific code, destination variable is not QString and/or is
-            used to interface with non-Qt APIs
-        \li qgetenv()
-      \row
-        \li Destination variable is a QString
-        \li qEnvironmentVariable()
-      \row
-        \li Destination variable is a QByteArray or std::string
-        \li qgetenv()
-    \endtable
-
-    \note on Unix systems, this function may produce data loss if the original
-    string contains arbitrary binary data that cannot be decoded by the locale
-    codec. Use qgetenv() instead for that case. On Windows, this function is
-    lossless.
-
-    \note the variable name \a varName must contain only US-ASCII characters.
-
-    \sa qputenv(), qgetenv(), qEnvironmentVariableIsSet(), qEnvironmentVariableIsEmpty()
-*/
-QString qEnvironmentVariable(const char *varName, const QString &defaultValue)
-{
-#if defined(Q_OS_WIN)
-    const auto locker = qt_scoped_lock(environmentMutex);
-    QVarLengthArray<wchar_t, 32> wname(int(strlen(varName)) + 1);
-    for (int i = 0; i < wname.size(); ++i) // wname.size() is correct: will copy terminating null
-        wname[i] = uchar(varName[i]);
-    size_t requiredSize = 0;
-    QString buffer;
-    _wgetenv_s(&requiredSize, 0, 0, wname.data());
-    if (requiredSize == 0)
-        return defaultValue;
-    buffer.resize(int(requiredSize));
-    _wgetenv_s(&requiredSize, reinterpret_cast<wchar_t *>(buffer.data()), requiredSize,
-               wname.data());
-    // requiredSize includes the terminating null, which we don't want.
-    Q_ASSERT(buffer.endsWith(QChar(u'\0')));
-    buffer.chop(1);
-    return buffer;
-#else
-    QByteArray value = qgetenv(varName);
-    if (value.isNull())
-        return defaultValue;
-// duplicated in qfile.h (QFile::decodeName)
-#if defined(Q_OS_DARWIN)
-    return QString::fromUtf8(value).normalized(QString::NormalizationForm_C);
-#else // other Unix
-    return QString::fromLocal8Bit(value);
-#endif
-#endif
-}
-
-QString qEnvironmentVariable(const char *varName)
-{
-    return qEnvironmentVariable(varName, QString());
-}
-
-/*!
-    \relates <QtGlobal>
-    \since 5.1
-
-    Returns whether the environment variable \a varName is empty.
-
-    Equivalent to
-    \snippet code/src_corelib_global_qglobal.cpp is-empty
-    except that it's potentially much faster, and can't throw exceptions.
-
-    \sa qgetenv(), qEnvironmentVariable(), qEnvironmentVariableIsSet()
-*/
-bool qEnvironmentVariableIsEmpty(const char *varName) noexcept
-{
-    const auto locker = qt_scoped_lock(environmentMutex);
-#ifdef Q_CC_MSVC
-    // we provide a buffer that can only hold the empty string, so
-    // when the env.var isn't empty, we'll get an ERANGE error (buffer
-    // too small):
-    size_t dummy;
-    char buffer = '\0';
-    return getenv_s(&dummy, &buffer, 1, varName) != ERANGE;
-#else
-    const char * const value = ::getenv(varName);
-    return !value || !*value;
-#endif
-}
-
-/*!
-    \relates <QtGlobal>
-    \since 5.5
-
-    Returns the numerical value of the environment variable \a varName.
-    If \a ok is not null, sets \c{*ok} to \c true or \c false depending
-    on the success of the conversion.
-
-    Equivalent to
-    \snippet code/src_corelib_global_qglobal.cpp to-int
-    except that it's much faster, and can't throw exceptions.
-
-    \note there's a limit on the length of the value, which is sufficient for
-    all valid values of int, not counting leading zeroes or spaces. Values that
-    are too long will either be truncated or this function will set \a ok to \c
-    false.
-
-    \sa qgetenv(), qEnvironmentVariable(), qEnvironmentVariableIsSet()
-*/
-int qEnvironmentVariableIntValue(const char *varName, bool *ok) noexcept
-{
-    static const int NumBinaryDigitsPerOctalDigit = 3;
-    static const int MaxDigitsForOctalInt =
-        (std::numeric_limits<uint>::digits + NumBinaryDigitsPerOctalDigit - 1) / NumBinaryDigitsPerOctalDigit;
-
-    const auto locker = qt_scoped_lock(environmentMutex);
-    size_t size;
-#ifdef Q_CC_MSVC
-    // we provide a buffer that can hold any int value:
-    char buffer[MaxDigitsForOctalInt + 2]; // +1 for NUL +1 for optional '-'
-    size_t dummy;
-    if (getenv_s(&dummy, buffer, sizeof buffer, varName) != 0) {
-        if (ok)
-            *ok = false;
-        return 0;
-    }
-    size = strlen(buffer);
-#else
-    const char * const buffer = ::getenv(varName);
-    if (!buffer || (size = strlen(buffer)) > MaxDigitsForOctalInt + 2) {
-        if (ok)
-            *ok = false;
-        return 0;
-    }
-#endif
-    return QByteArrayView(buffer, size).toInt(ok, 0);
-}
-
-/*!
-    \relates <QtGlobal>
-    \since 5.1
-
-    Returns whether the environment variable \a varName is set.
-
-    Equivalent to
-    \snippet code/src_corelib_global_qglobal.cpp is-null
-    except that it's potentially much faster, and can't throw exceptions.
-
-    \sa qgetenv(), qEnvironmentVariable(), qEnvironmentVariableIsEmpty()
-*/
-bool qEnvironmentVariableIsSet(const char *varName) noexcept
-{
-    const auto locker = qt_scoped_lock(environmentMutex);
-#ifdef Q_CC_MSVC
-    size_t requiredSize = 0;
-    (void)getenv_s(&requiredSize, 0, 0, varName);
-    return requiredSize != 0;
-#else
-    return ::getenv(varName) != nullptr;
-#endif
-}
-
-/*!
-    \relates <QtGlobal>
-
-    This function sets the \a value of the environment variable named
-    \a varName. It will create the variable if it does not exist. It
-    returns 0 if the variable could not be set.
-
-    Calling qputenv with an empty value removes the environment variable on
-    Windows, and makes it set (but empty) on Unix. Prefer using qunsetenv()
-    for fully portable behavior.
-
-    \note qputenv() was introduced because putenv() from the standard
-    C library was deprecated in VC2005 (and later versions). qputenv()
-    uses the replacement function in VC, and calls the standard C
-    library's implementation on all other platforms.
-
-    \sa qgetenv(), qEnvironmentVariable()
-*/
-bool qputenv(const char *varName, const QByteArray &value)
-{
-    const auto locker = qt_scoped_lock(environmentMutex);
-#if defined(Q_CC_MSVC)
-    return _putenv_s(varName, value.constData()) == 0;
-#elif (defined(_POSIX_VERSION) && (_POSIX_VERSION-0) >= 200112L) || defined(Q_OS_HAIKU)
-    // POSIX.1-2001 has setenv
-    return setenv(varName, value.constData(), true) == 0;
-#else
-    QByteArray buffer(varName);
-    buffer += '=';
-    buffer += value;
-    char *envVar = qstrdup(buffer.constData());
-    int result = putenv(envVar);
-    if (result != 0) // error. we have to delete the string.
-        delete[] envVar;
-    return result == 0;
-#endif
-}
-
-/*!
-    \relates <QtGlobal>
-
-    This function deletes the variable \a varName from the environment.
-
-    Returns \c true on success.
-
-    \since 5.1
-
-    \sa qputenv(), qgetenv(), qEnvironmentVariable()
-*/
-bool qunsetenv(const char *varName)
-{
-    const auto locker = qt_scoped_lock(environmentMutex);
-#if defined(Q_CC_MSVC)
-    return _putenv_s(varName, "") == 0;
-#elif (defined(_POSIX_VERSION) && (_POSIX_VERSION-0) >= 200112L) || defined(Q_OS_BSD4) || defined(Q_OS_HAIKU)
-    // POSIX.1-2001, BSD and Haiku have unsetenv
-    return unsetenv(varName) == 0;
-#elif defined(Q_CC_MINGW)
-    // On mingw, putenv("var=") removes "var" from the environment
-    QByteArray buffer(varName);
-    buffer += '=';
-    return putenv(buffer.constData()) == 0;
-#else
-    // Fallback to putenv("var=") which will insert an empty var into the
-    // environment and leak it
-    QByteArray buffer(varName);
-    buffer += '=';
-    char *envVar = qstrdup(buffer.constData());
-    return putenv(envVar) == 0;
-#endif
-}
-
-/*!
     \macro forever
     \relates <QForeach>