AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't open /etc/os-release outside Linux and Debian GNU/kFreeBSD

Browse Source 
It's not likely to exist outside them, so let's save on the code size.

Change-Id: I72f139ccd1367f218b33cb926dae58696a83a82e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Thiago Macieira 2014-05-05 11:42:34 -07:00 committed by The Qt Project
parent f1e97f421a
commit 7680108054
1 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/corelib/global/qglobal.cpp
View File

@ -2033,6 +2033,9 @@ const QSysInfo::WinVersion QSysInfo::WindowsVersion = QSysInfo::windowsVersion()
#endif #endif
#if defined(Q_OS_UNIX) #if defined(Q_OS_UNIX)
# if (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)) || defined(Q_OS_FREEBSD)
# define USE_ETC_OS_RELEASE
# endif
struct QUnixOSVersion struct QUnixOSVersion
{ {
// from uname(2) // from uname(2)
@ -2041,13 +2044,13 @@ struct QUnixOSVersion
QString sysRelease; QString sysRelease;
# if !defined(Q_OS_ANDROID) && !defined(Q_OS_BLACKBERRY) && !defined(Q_OS_MAC) # if !defined(Q_OS_ANDROID) && !defined(Q_OS_BLACKBERRY) && !defined(Q_OS_MAC)
// from /etc/os-release: // from /etc/os-release or guessed
QString versionIdentifier; // ${ID}_$VERSION_ID QString versionIdentifier; // ${ID}_$VERSION_ID
QString versionText; // $PRETTY_NAME QString versionText; // $PRETTY_NAME
# endif # endif
}; };
# if !defined(Q_OS_ANDROID) && !defined(Q_OS_BLACKBERRY) && !defined(Q_OS_MAC) # ifdef USE_ETC_OS_RELEASE
static QString unquote(const char *begin, const char *end) static QString unquote(const char *begin, const char *end)
{ {
if (*begin == '"') { if (*begin == '"') {
@ -2056,36 +2059,18 @@ static QString unquote(const char *begin, const char *end)
} }
return QString::fromLatin1(begin, end - begin); return QString::fromLatin1(begin, end - begin);
} }
# endif
static QUnixOSVersion detectUnixVersion() static bool readEtcOsRelease(QUnixOSVersion &v)
{ {
QUnixOSVersion v;
struct utsname u;
if (uname(&u) != -1) {
v.sysName = QString::fromLatin1(u.sysname);
v.sysNameLower = v.sysName.toLower();
v.sysRelease = QString::fromLatin1(u.release);
} else {
v.sysName = QLatin1String("Detection failed");
// leave sysNameLower & sysRelease unset
}
# if !defined(Q_OS_ANDROID) && !defined(Q_OS_BLACKBERRY) && !defined(Q_OS_MAC)
// we're avoiding QFile here // we're avoiding QFile here
int fd = qt_safe_open("/etc/os-release", O_RDONLY); int fd = qt_safe_open("/etc/os-release", O_RDONLY);
if (fd == -1) { if (fd == -1)
if (!v.sysNameLower.isEmpty()) { return false;
// will produce "qnx_6.5" or "sunos_5.9"
v.versionIdentifier = v.sysNameLower + QLatin1Char('_') + v.sysRelease;
}
return v;
}
QT_STATBUF sbuf; QT_STATBUF sbuf;
if (QT_FSTAT(fd, &sbuf) == -1) { if (QT_FSTAT(fd, &sbuf) == -1) {
qt_safe_close(fd); qt_safe_close(fd);
return v; return false;
} }
QString partialIdentifier; QString partialIdentifier;
@ -2141,10 +2126,39 @@ static QUnixOSVersion detectUnixVersion()
continue; continue;
} }
} }
return true;
}
# endif // USE_ETC_OS_RELEASE
static QUnixOSVersion detectUnixVersion()
{
QUnixOSVersion v;
struct utsname u;
if (uname(&u) != -1) {
v.sysName = QString::fromLatin1(u.sysname);
v.sysNameLower = v.sysName.toLower();
v.sysRelease = QString::fromLatin1(u.release);
} else {
v.sysName = QLatin1String("Detection failed");
// leave sysNameLower & sysRelease unset
}
# if !defined(Q_OS_ANDROID) && !defined(Q_OS_BLACKBERRY) && !defined(Q_OS_MAC)
# ifdef USE_ETC_OS_RELEASE
if (readEtcOsRelease(v))
return v;
# endif # endif
if (!v.sysNameLower.isEmpty()) {
// will produce "qnx_6.5" or "sunos_5.9"
v.versionIdentifier = v.sysNameLower + QLatin1Char('_') + v.sysRelease;
}
# endif
return v; return v;
} }
#endif #endif // Q_OS_UNIX
/*! /*!