QSysInfo: expand Linux distribution detection to /etc/lsb-release

Some older (or weird) Linux distributions don't have /etc/os-release, so
let's try to read /etc/lsb-release instead. If we find a file called
/etc/<distronamelowercase>-release and it's bigger than the pretty name
we read from /etc/lsb-release, use that.

Because the order of the keys changes between the two *-release files,
we can't do a sorted search anymore.

Change-Id: I1a800c709d3543699131ffff13c48532d5074f3c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Dirk Hohndel <dirk@hohndel.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

src/corelib/global/qglobal.cpp

@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 The Qt Company Ltd.
-** Copyright (C) 2014 Intel Corporation
+** Copyright (C) 2015 Intel Corporation
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -2120,10 +2120,10 @@ const QSysInfo::WinVersion QSysInfo::WindowsVersion = QSysInfo::windowsVersion()
 #    define USE_ETC_OS_RELEASE
 struct QUnixOSVersion
 {
-    // from /etc/os-release
+                                    // from /etc/os-release         older /etc/lsb-release
-    QString productType;            // $ID
+    QString productType;            // $ID                          $DISTRIB_ID
-    QString productVersion;         // $VERSION_ID
+    QString productVersion;         // $VERSION_ID                  $DISTRIB_RELEASE
-    QString prettyName;             // $PRETTY_NAME
+    QString prettyName;             // $PRETTY_NAME                 $DISTRIB_DESCRIPTION
 };
 
 static QString unquote(const char *begin, const char *end)
@@ -2135,10 +2135,11 @@ static QString unquote(const char *begin, const char *end)
     return QString::fromLatin1(begin, end - begin);
 }
 
-static bool readEtcOsRelease(QUnixOSVersion &v)
+static bool readEtcFile(QUnixOSVersion &v, const char *filename,
+                        const QByteArray &idKey, const QByteArray &versionKey, const QByteArray &prettyNameKey)
 {
     // we're avoiding QFile here
-    int fd = qt_safe_open("/etc/os-release", O_RDONLY);
+    int fd = qt_safe_open(filename, O_RDONLY);
     if (fd == -1)
         return false;
 
@@ -2155,41 +2156,28 @@ static bool readEtcOsRelease(QUnixOSVersion &v)
     const char *ptr = buffer.constData();
     const char *end = buffer.constEnd();
     const char *eol;
+    QByteArray line;
     for ( ; ptr != end; ptr = eol + 1) {
-        static const char idString[] = "ID=";
-        static const char prettyNameString[] = "PRETTY_NAME=";
-        static const char versionIdString[] = "VERSION_ID=";
-
         // find the end of the line after ptr
         eol = static_cast<const char *>(memchr(ptr, '\n', end - ptr));
         if (!eol)
             eol = end - 1;
+        line.setRawData(ptr, eol - ptr);
 
-        // note: we're doing a binary search here, so comparison
+        if (line.startsWith(idKey)) {
-        // must always be sorted
+            ptr += idKey.length();
-        int cmp = strncmp(ptr, idString, strlen(idString));
-        if (cmp < 0)
-            continue;
-        if (cmp == 0) {
-            ptr += strlen(idString);
             v.productType = unquote(ptr, eol);
             continue;
         }
 
-        cmp = strncmp(ptr, prettyNameString, strlen(prettyNameString));
+        if (line.startsWith(prettyNameKey)) {
-        if (cmp < 0)
+            ptr += prettyNameKey.length();
-            continue;
-        if (cmp == 0) {
-            ptr += strlen(prettyNameString);
             v.prettyName = unquote(ptr, eol);
             continue;
         }
 
-        cmp = strncmp(ptr, versionIdString, strlen(versionIdString));
+        if (line.startsWith(versionKey)) {
-        if (cmp < 0)
+            ptr += versionKey.length();
-            continue;
-        if (cmp == 0) {
-            ptr += strlen(versionIdString);
             v.productVersion = unquote(ptr, eol);
             continue;
         }
@@ -2197,6 +2185,45 @@ static bool readEtcOsRelease(QUnixOSVersion &v)
 
     return true;
 }
+
+static bool readEtcOsRelease(QUnixOSVersion &v)
+{
+    return readEtcFile(v, "/etc/os-release", QByteArrayLiteral("ID="),
+                       QByteArrayLiteral("VERSION_ID="), QByteArrayLiteral("PRETTY_NAME="));
+}
+
+static bool readEtcLsbRelease(QUnixOSVersion &v)
+{
+    bool ok = readEtcFile(v, "/etc/lsb-release", QByteArrayLiteral("DISTRIB_ID="),
+                          QByteArrayLiteral("DISTRIB_RELEASE="), QByteArrayLiteral("DISTRIB_DESCRIPTION="));
+    if (ok && (v.prettyName.isEmpty() || v.prettyName == v.productType)) {
+        // some distributions have redundant information for the pretty name,
+        // so try /etc/<lowercasename>-release
+
+        // we're still avoiding QFile here
+        QByteArray distrorelease = "/etc/" + v.productType.toLatin1().toLower() + "-release";
+        int fd = qt_safe_open(distrorelease, O_RDONLY);
+        if (fd != -1) {
+            QT_STATBUF sbuf;
+            if (QT_FSTAT(fd, &sbuf) != -1 && sbuf.st_size > v.prettyName.length()) {
+                // file apparently contains interesting information
+                QByteArray buffer(sbuf.st_size, Qt::Uninitialized);
+                buffer.resize(qt_safe_read(fd, buffer.data(), sbuf.st_size));
+                v.prettyName = QString::fromLatin1(buffer.trimmed());
+            }
+            qt_safe_close(fd);
+        }
+    }
+
+    return ok;
+}
+
+static bool findUnixOsVersion(QUnixOSVersion &v)
+{
+    if (readEtcOsRelease(v))
+        return true;
+    return readEtcLsbRelease(v);
+}
 #  endif // USE_ETC_OS_RELEASE
 #endif // Q_OS_UNIX
 
@@ -2531,7 +2558,7 @@ QString QSysInfo::productType()
 
 #elif defined(USE_ETC_OS_RELEASE) // Q_OS_UNIX
     QUnixOSVersion unixOsVersion;
-    readEtcOsRelease(unixOsVersion);
+    findUnixOsVersion(unixOsVersion);
     if (!unixOsVersion.productType.isEmpty())
         return unixOsVersion.productType;
 #endif
@@ -2587,7 +2614,7 @@ QString QSysInfo::productVersion()
     }
 #elif defined(USE_ETC_OS_RELEASE) // Q_OS_UNIX
     QUnixOSVersion unixOsVersion;
-    readEtcOsRelease(unixOsVersion);
+    findUnixOsVersion(unixOsVersion);
     if (!unixOsVersion.productVersion.isEmpty())
         return unixOsVersion.productVersion;
 #endif
@@ -2664,7 +2691,7 @@ QString QSysInfo::prettyProductName()
 #elif defined(Q_OS_UNIX)
 #  ifdef USE_ETC_OS_RELEASE
     QUnixOSVersion unixOsVersion;
-    readEtcOsRelease(unixOsVersion);
+    findUnixOsVersion(unixOsVersion);
     if (!unixOsVersion.prettyName.isEmpty())
         return unixOsVersion.prettyName;
 #  endif

tests/manual/manual.pro

@@ -26,6 +26,7 @@ qnetworkreply \
 qscreen \
 qssloptions \
 qsslsocket \
+qsysinfo \
 qtabletevent \
 qtexteditlist \
 qtbug-8933 \

tests/manual/qsysinfo/main.cpp

@@ -0,0 +1,139 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Intel Corporation
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QCoreApplication>
+#include <QSysInfo>
+
+#include <stdio.h>
+
+// I'm lazy
+#define CASE_VERSION(v)     case QSysInfo::v:   return QT_STRINGIFY(v)
+
+QByteArray windowsVersionToString(QSysInfo::WinVersion v)
+{
+    switch (v) {
+    CASE_VERSION(WV_None);
+
+    CASE_VERSION(WV_32s);
+    CASE_VERSION(WV_95);
+    CASE_VERSION(WV_98);
+    CASE_VERSION(WV_Me);
+    case QSysInfo::WV_DOS_based: // shouldn't happen
+        break;
+
+    CASE_VERSION(WV_NT);
+    CASE_VERSION(WV_2000);
+    CASE_VERSION(WV_XP);
+    CASE_VERSION(WV_2003);
+    CASE_VERSION(WV_VISTA);
+    CASE_VERSION(WV_WINDOWS7);
+    CASE_VERSION(WV_WINDOWS8);
+    CASE_VERSION(WV_WINDOWS8_1);
+    CASE_VERSION(WV_WINDOWS10);
+    case QSysInfo::WV_NT_based: // shouldn't happen
+        break;
+
+    CASE_VERSION(WV_CE);
+    CASE_VERSION(WV_CENET);
+    CASE_VERSION(WV_CE_5);
+    CASE_VERSION(WV_CE_6);
+    case QSysInfo::WV_CE_based: // shouldn't happen
+        break;
+    }
+
+    return "WinVersion(0x" + QByteArray::number(v, 16) + ')';
+}
+
+QByteArray macVersionToString(QSysInfo::MacVersion v)
+{
+    switch (v) {
+    CASE_VERSION(MV_None);
+    CASE_VERSION(MV_Unknown);
+
+    CASE_VERSION(MV_9);
+    CASE_VERSION(MV_10_0);
+    CASE_VERSION(MV_10_1);
+    CASE_VERSION(MV_10_2);
+    CASE_VERSION(MV_10_3);
+    CASE_VERSION(MV_10_4);
+    CASE_VERSION(MV_10_5);
+    CASE_VERSION(MV_10_6);
+    CASE_VERSION(MV_10_7);
+    CASE_VERSION(MV_10_8);
+    CASE_VERSION(MV_10_9);
+    CASE_VERSION(MV_10_10);
+
+    CASE_VERSION(MV_IOS_4_3);
+    CASE_VERSION(MV_IOS_5_0);
+    CASE_VERSION(MV_IOS_5_1);
+    CASE_VERSION(MV_IOS_6_0);
+    CASE_VERSION(MV_IOS_6_1);
+    CASE_VERSION(MV_IOS_7_0);
+    CASE_VERSION(MV_IOS_7_1);
+    CASE_VERSION(MV_IOS_8_0);
+    case QSysInfo::MV_IOS:      // shouldn't happen:
+        break;
+    }
+
+    if (v & QSysInfo::MV_IOS) {
+        int major = (v >> 4) & 0xf;
+        int minor = v & 0xf;
+        return "MacVersion(Q_MV_IOS("
+                + QByteArray::number(major) + ", "
+                + QByteArray::number(minor) + "))";
+    }
+    return "MacVersion(Q_MV_OSX(10, " + QByteArray::number(v - 2) + "))";
+}
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication a(argc, argv);
+
+    printf("QSysInfo::WordSize = %d\n", QSysInfo::WordSize);
+    printf("QSysInfo::ByteOrder = QSysInfo::%sEndian\n",
+           QSysInfo::ByteOrder == QSysInfo::LittleEndian ? "Little" : "Big");
+    printf("QSysInfo::WindowsVersion = QSysInfo::%s\n",
+           windowsVersionToString(QSysInfo::WindowsVersion).constData());
+    printf("QSysInfo::MacintoshVersion = QSysInfo::%s\n",
+           macVersionToString(QSysInfo::MacintoshVersion).constData());
+    printf("QSysInfo::buildCpuArchitecture() = %s\n", qPrintable(QSysInfo::buildCpuArchitecture()));
+    printf("QSysInfo::currentCpuArchitecture() = %s\n", qPrintable(QSysInfo::currentCpuArchitecture()));
+    printf("QSysInfo::buildAbi() = %s\n", qPrintable(QSysInfo::buildAbi()));
+    printf("QSysInfo::kernelType() = %s\n", qPrintable(QSysInfo::kernelType()));
+    printf("QSysInfo::kernelVersion() = %s\n", qPrintable(QSysInfo::kernelVersion()));
+    printf("QSysInfo::productType() = %s\n", qPrintable(QSysInfo::productType()));
+    printf("QSysInfo::productVersion() = %s\n", qPrintable(QSysInfo::productVersion()));
+    printf("QSysInfo::prettyProductName() = %s\n", qPrintable(QSysInfo::prettyProductName()));
+
+    return 0;
+}

tests/manual/qsysinfo/qsysinfo.pro

@@ -0,0 +1,7 @@
+QT       = core
+TARGET   = qsysinfo
+TEMPLATE = app
+CONFIG   += console
+CONFIG   -= app_bundle
+
+SOURCES += main.cpp