1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QStorageInfo/Linux: merge doStat() and initRootPath()

Browse Source 
The doStat() function was too simple. Plus, we can now avoid having to
come up with an non-zero-but-unused device ID for some corner cases.

Change-Id: I76ffba14ece04f24b43efffd17ab3a79e54e636d
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 96e5d0d5c19c09a2b0db5bd067deac06232a48ed)
This commit is contained in:
Thiago Macieira 2024-01-17 11:52:59 -08:00
parent b9bcaae226
commit 26f24693cd
2 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/corelib/io/qstorageinfo_linux.cpp
View File

@ -134,16 +134,6 @@ static inline QString retrieveLabel(const QByteArray &device, quint64 deviceId)
return QString(); return QString();
} }
void QStorageInfoPrivate::doStat()
{
retrieveVolumeInfo();
quint64 deviceId = initRootPath();
if (!deviceId)
return;
name = retrieveLabel(device, deviceId);
}
void QStorageInfoPrivate::retrieveVolumeInfo() void QStorageInfoPrivate::retrieveVolumeInfo()
{ {
struct statfs64 statfs_buf; struct statfs64 statfs_buf;
@ -173,25 +163,20 @@ static std::vector<MountInfo> parseMountInfo(FilterMountInfo filter = FilterMoun
return doParseMountInfo(mountinfo, filter); return doParseMountInfo(mountinfo, filter);
} }
quint64 QStorageInfoPrivate::initRootPath() void QStorageInfoPrivate::doStat()
{ {
retrieveVolumeInfo();
if (!ready)
return;
rootPath = QFileInfo(rootPath).canonicalFilePath(); rootPath = QFileInfo(rootPath).canonicalFilePath();
if (rootPath.isEmpty()) if (rootPath.isEmpty())
return 0; return;
std::vector<MountInfo> infos = parseMountInfo(); std::vector<MountInfo> infos = parseMountInfo();
if (infos.empty()) { if (infos.empty()) {
rootPath = u'/'; rootPath = u'/';
return;
// Need to return something non-zero here for this unlikely condition.
// Linux currently uses 20 bits for the minor portion[1] in a 32-bit
// integer; glibc, MUSL, and 64-bit Bionic use a 64-bit userspace
// dev_t, so this value will not match a real device from the kernel.
// 32-bit Bionic still has a 32-bit dev_t, but its makedev() macro[2]
// returns 64-bit content too.
// [1] https://codebrowser.dev/linux/linux/include/linux/kdev_t.h.html#_M/MINORBITS
// [2] https://android.googlesource.com/platform/bionic/+/ndk-r19/libc/include/sys/sysmacros.h#39
return makedev(0, -1);
} }
// We iterate over the /proc/self/mountinfo list backwards because then any // We iterate over the /proc/self/mountinfo list backwards because then any
@ -226,9 +211,8 @@ quint64 QStorageInfoPrivate::initRootPath()
if (best) { if (best) {
auto stDev = best->stDev; auto stDev = best->stDev;
setFromMountInfo(std::move(*best)); setFromMountInfo(std::move(*best));
return stDev; name = retrieveLabel(device, stDev);
} }
return 0;
} }
QList<QStorageInfo> QStorageInfoPrivate::mountedVolumes() QList<QStorageInfo> QStorageInfoPrivate::mountedVolumes()

1
src/corelib/io/qstorageinfo_p.h
View File

@ -60,7 +60,6 @@ protected:
void retrieveUrlProperties(bool initRootPath = false); void retrieveUrlProperties(bool initRootPath = false);
void retrieveLabel(); void retrieveLabel();
#elif defined(Q_OS_LINUX) #elif defined(Q_OS_LINUX)
quint64 initRootPath();
void retrieveVolumeInfo(); void retrieveVolumeInfo();
public: public: