QStorageInfo: split Linux specific code to a separate source file

Much less crowded.

Inline QStorageInfoPrivate::root() to ease the split; the Windows
specific code is one extra line.

Change-Id: Icec6822cf436e2b4aa1b3a04184fbfa40e508078
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 1 insertions, 124 deletions

diff --git a/src/corelib/io/qstorageinfo_unix.cpp b/src/corelib/io/qstorageinfo_unix.cpp
index 34ff8bff84..3c80c31453 100644
--- a/src/corelib/io/qstorageinfo_unix.cpp
+++ b/src/corelib/io/qstorageinfo_unix.cpp
@@ -15,18 +15,9 @@
 #include <errno.h>
 #include <sys/stat.h>
 
-#if defined(Q_OS_LINUX)
-#  include "qstorageinfo_linux_p.h"
-#endif
-
 #if defined(Q_OS_BSD4)
 #  include <sys/mount.h>
 #  include <sys/statvfs.h>
-#elif defined(Q_OS_ANDROID)
-#  include <sys/mount.h>
-#  include <sys/vfs.h>
-#elif defined(Q_OS_LINUX)
-#  include <sys/statvfs.h>
 #elif defined(Q_OS_HURD)
 #  include <mntent.h>
 #  include <sys/statvfs.h>
@@ -60,12 +51,6 @@
 #  if !defined(_STATFS_F_FLAGS) && !defined(Q_OS_NETBSD)
 #    define _STATFS_F_FLAGS 1
 #  endif
-#elif defined(Q_OS_ANDROID)
-#  define QT_STATFS    ::statfs
-#  define QT_STATFSBUF struct statfs
-#  if !defined(ST_RDONLY)
-#    define ST_RDONLY 1 // hack for missing define on Android
-#  endif
 #elif defined(Q_OS_HAIKU)
 #  define QT_STATFSBUF struct statvfs
 #  define QT_STATFS    ::statvfs
@@ -382,50 +367,9 @@ inline QByteArray QStorageIterator::subvolume() const
 }
 #endif
 
-#ifdef Q_OS_LINUX
-// udev encodes the labels with ID_LABEL_FS_ENC which is done with
-// blkid_encode_string(). Within this function some 1-byte utf-8
-// characters not considered safe (e.g. '\' or ' ') are encoded as hex
-static QString decodeFsEncString(const QString &str)
-{
-    QString decoded;
-    decoded.reserve(str.size());
-
-    int i = 0;
-    while (i < str.size()) {
-        if (i <= str.size() - 4) {    // we need at least four characters \xAB
-            if (QStringView{str}.sliced(i).startsWith("\\x"_L1)) {
-                bool bOk;
-                const int code = QStringView{str}.mid(i+2, 2).toInt(&bOk, 16);
-                if (bOk && code >= 0x20 && code < 0x80) {
-                    decoded += QChar(code);
-                    i += 4;
-                    continue;
-                }
-            }
-        }
-        decoded += str.at(i);
-        ++i;
-    }
-    return decoded;
-}
-#endif
-
 static inline QString retrieveLabel(const QByteArray &device)
 {
-#ifdef Q_OS_LINUX
-    static const char pathDiskByLabel[] = "/dev/disk/by-label";
-
-    QFileInfo devinfo(QFile::decodeName(device));
-    QString devicePath = devinfo.canonicalFilePath();
-
-    QDirIterator it(QLatin1StringView(pathDiskByLabel), QDir::NoDotAndDotDot);
-    while (it.hasNext()) {
-        QFileInfo fileInfo = it.nextFileInfo();
-        if (fileInfo.isSymLink() && fileInfo.symLinkTarget() == devicePath)
-            return decodeFsEncString(fileInfo.fileName());
-    }
-#elif defined Q_OS_HAIKU
+#if defined Q_OS_HAIKU
     fs_info fsInfo;
     memset(&fsInfo, 0, sizeof(fsInfo));
 
@@ -484,67 +428,6 @@ void QStorageInfoPrivate::retrieveVolumeInfo()
     }
 }
 
-#if defined(Q_OS_LINUX)
-static std::vector<MountInfo> parseMountInfo(FilterMountInfo filter = FilterMountInfo::All)
-{
-    QFile file(u"/proc/self/mountinfo"_s);
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
-        return {};
-
-    QByteArray mountinfo = file.readAll();
-    file.close();
-
-    return doParseMountInfo(mountinfo, filter);
-}
-
-void QStorageInfoPrivate::initRootPath()
-{
-    rootPath = QFileInfo(rootPath).canonicalFilePath();
-    if (rootPath.isEmpty())
-        return;
-
-    std::vector<MountInfo> infos = parseMountInfo();
-    if (infos.empty()) {
-        rootPath = u'/';
-        return;
-    }
-
-    qsizetype maxLength = 0;
-    const QString oldRootPath = rootPath;
-    rootPath.clear();
-
-    for (auto &info : infos) {
-        // we try to find most suitable entry
-        qsizetype mpSize = info.mountPoint.size();
-        if (isParentOf(info.mountPoint, oldRootPath) && maxLength < mpSize) {
-            maxLength = mpSize;
-            rootPath = info.mountPoint;
-            device = info.device;
-            fileSystemType = info.fsType;
-            subvolume = info.fsRoot;
-        }
-    }
-}
-
-QList<QStorageInfo> QStorageInfoPrivate::mountedVolumes()
-{
-    std::vector<MountInfo> infos = parseMountInfo(FilterMountInfo::Filtered);
-    if (infos.empty())
-        return QList{root()};
-
-    QList<QStorageInfo> volumes;
-    for (MountInfo &info : infos) {
-        QStorageInfo storage(info.mountPoint);
-        storage.d->device = info.device;
-        storage.d->fileSystemType = info.fsType;
-        storage.d->subvolume = info.fsRoot;
-        if (storage.bytesTotal() == 0 && storage != root())
-            continue;
-        volumes.push_back(storage);
-    }
-    return volumes;
-}
-#else // defined(Q_OS_LINUX)
 void QStorageInfoPrivate::initRootPath()
 {
     rootPath = QFileInfo(rootPath).canonicalFilePath();
@@ -600,11 +483,5 @@ QList<QStorageInfo> QStorageInfoPrivate::mountedVolumes()
 
     return volumes;
 }
-#endif // defined(Q_OS_LINUX)
-
-QStorageInfo QStorageInfoPrivate::root()
-{
-    return QStorageInfo(QStringLiteral("/"));
-}
 
 QT_END_NAMESPACE