mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

OS Detection: Use QFile when reading /etc/os-release

Browse source 
Improves and simplifies reading of /etc/os-release on
linux system to read the PRETTY_NAME value. The previously
used method is unnecessarily lengthy and too complicated.

Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Joseph W. Joshua 2014-06-15 00:22:21 +03:00 • committed by Dirk Hohndel
parent 8bd535d092
commit f59b30ca5a
1 changed files with 10 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
subsurfacesysinfo.cpp
View file

@ -1,6 +1,8 @@
#include "subsurfacesysinfo.h" #include "subsurfacesysinfo.h"
#include <QString> #include <QString>
#include "qplatformdefs.h" #include "qplatformdefs.h"
#include <QFile>
#include <QSettings>
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
#include <sys/utsname.h> #include <sys/utsname.h>
@ -318,73 +320,15 @@ static QString unquote(const char *begin, const char *end)
static bool readEtcOsRelease(QUnixOSVersion &v) static bool readEtcOsRelease(QUnixOSVersion &v)
{ {
// we're avoiding QFile here QFile osRelease("/etc/os-release");
if (osRelease.exists()) {
int fd = QT_OPEN("/etc/os-release", O_RDONLY); QSettings parse("/etc/os-release", QSettings::IniFormat);
if (fd == -1) if (parse.contains("PRETTY_NAME")) {
return false; v.versionText = parse.value("PRETTY_NAME").toString();
}
QT_STATBUF sbuf; return true;
if (QT_FSTAT(fd, &sbuf) == -1) {
QT_CLOSE(fd);
return false;
} }
return false;
QString partialIdentifier;
QByteArray buffer(sbuf.st_size, Qt::Uninitialized);
buffer.resize(QT_READ(fd, buffer.data(), sbuf.st_size));
QT_CLOSE(fd);
const char *ptr = buffer.constData();
const char *end = buffer.constEnd();
const char *eol;
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;
int cmp = strncmp(ptr, idString, strlen(idString));
if (cmp < 0)
continue;
if (cmp == 0) {
ptr += strlen(idString);
QString id = unquote(ptr, eol);
if (partialIdentifier.isNull())
partialIdentifier = id;
else
v.versionIdentifier = id + QLatin1Char('_') + partialIdentifier;
continue;
}
cmp = strncmp(ptr, prettyNameString, strlen(prettyNameString));
if (cmp < 0)
continue;
if (cmp == 0) {
ptr += strlen(prettyNameString);
v.versionText = unquote(ptr, eol);
continue;
}
cmp = strncmp(ptr, versionIdString, strlen(versionIdString));
if (cmp < 0)
continue;
if (cmp == 0) {
ptr += strlen(versionIdString);
QString id = unquote(ptr, eol);
if (partialIdentifier.isNull())
partialIdentifier = id;
else
v.versionIdentifier = partialIdentifier + QLatin1Char('_') + id;
continue;
}
}
return true;
} }
#endif // USE_ETC_OS_RELEASE #endif // USE_ETC_OS_RELEASE