Changeset View
Changeset View
Standalone View
Standalone View
src/ioslaves/file/file.cpp
| Show First 20 Lines • Show All 59 Lines • ▼ Show 20 Line(s) | |||||
| 60 | #include <kconfiggroup.h> | 60 | #include <kconfiggroup.h> | ||
| 61 | #include <kshell.h> | 61 | #include <kshell.h> | ||
| 62 | #include <kmountpoint.h> | 62 | #include <kmountpoint.h> | ||
| 63 | #include <klocalizedstring.h> | 63 | #include <klocalizedstring.h> | ||
| 64 | #include <QMimeDatabase> | 64 | #include <QMimeDatabase> | ||
| 65 | #include <QStandardPaths> | 65 | #include <QStandardPaths> | ||
| 66 | #include <QDataStream> | 66 | #include <QDataStream> | ||
| 67 | 67 | | |||
| 68 | #ifdef Q_OS_LINUX | ||||
pino: no need for the Q_OS_LINUX check here | |||||
| 69 | #include <sys/stat.h> | ||||
| 70 | | ||||
| 71 | // We use statx function only under glibc | ||||
fvogt: This won't work as expected, `USE_STATX` is unconditionally defined. | |||||
meven: Thanks | |||||
| 72 | #if defined(STATX_BASIC_STATS) && defined(__GLIBC__) | ||||
| 73 | #define USE_STATX | ||||
| 74 | #endif | ||||
TBH, instead of this static define, I'd do a proper cmake check (see ConfigureChecks.cmake, and config-kioslave-file.h.cmake in src/ioslaves/file). pino: TBH, instead of this static define, I'd do a proper cmake check (see ConfigureChecks.cmake, and… | |||||
meven: It was not too easy to do. | |||||
| 75 | | ||||
| 76 | #endif | ||||
| 77 | | ||||
| 68 | #if HAVE_VOLMGT | 78 | #if HAVE_VOLMGT | ||
| 69 | #include <volmgt.h> | 79 | #include <volmgt.h> | ||
| 70 | #include <sys/mnttab.h> | 80 | #include <sys/mnttab.h> | ||
| 71 | #endif | 81 | #endif | ||
| 72 | 82 | | |||
| 73 | #include <kdirnotify.h> | 83 | #include <kdirnotify.h> | ||
| 74 | #include <ioslave_defaults.h> | 84 | #include <ioslave_defaults.h> | ||
| 75 | 85 | | |||
| ▲ Show 20 Lines • Show All 757 Lines • ▼ Show 20 Line(s) | 840 | if (it == mGroupcache.end()) { | |||
| 833 | if (name.isEmpty()) { | 843 | if (name.isEmpty()) { | ||
| 834 | name = gid.toString(); | 844 | name = gid.toString(); | ||
| 835 | } | 845 | } | ||
| 836 | it = mGroupcache.insert(gid, name); | 846 | it = mGroupcache.insert(gid, name); | ||
| 837 | } | 847 | } | ||
| 838 | return *it; | 848 | return *it; | ||
| 839 | } | 849 | } | ||
| 840 | 850 | | |||
| 851 | #ifdef USE_STATX | ||||
| 852 | // statx syscall is available | ||||
| 853 | inline int STAT(const char* path, struct statx * buff) { | ||||
| 854 | return statx(AT_FDCWD, path, 0, STATX_BASIC_STATS | STATX_BTIME, buff); | ||||
| 855 | } | ||||
| 856 | inline static int stat_mode(struct statx buf) { return buf.stx_mode; } | ||||
| 857 | inline static int stat_dev(struct statx buf) { return buf.stx_dev_major; } | ||||
| 858 | inline static int stat_ino(struct statx buf) { return buf.stx_ino; } | ||||
| 859 | inline static int stat_size(struct statx buf) { return buf.stx_size; } | ||||
| 860 | inline static int stat_uid(struct statx buf) { return buf.stx_uid; } | ||||
| 861 | inline static int stat_gid(struct statx buf) { return buf.stx_gid; } | ||||
| 862 | inline static int stat_atime(struct statx buf) { return buf.stx_atime.tv_sec; } | ||||
| 863 | inline static int stat_mtime(struct statx buf) { return buf.stx_mtime.tv_sec; } | ||||
| 864 | #else | ||||
| 865 | // regular stat struct | ||||
| 866 | inline int STAT(const char* path, QT_STATBUF * buff) { | ||||
| 867 | return QT_LSTAT(path, buff); | ||||
| 868 | } | ||||
| 869 | inline static int stat_mode(QT_STATBUF buf) { return buf.st_mode; } | ||||
| 870 | inline static int stat_dev(QT_STATBUF buf) { return buf.st_dev; } | ||||
| 871 | inline static int stat_ino(QT_STATBUF buf) { return buf.st_ino; } | ||||
| 872 | inline static int stat_size(QT_STATBUF buf) { return buf.st_size; } | ||||
| 873 | inline static int stat_uid(QT_STATBUF buf) { return buf.st_uid; } | ||||
| 874 | inline static int stat_gid(QT_STATBUF buf) { return buf.st_gid; } | ||||
| 875 | inline static int stat_atime(QT_STATBUF buf) { return buf.st_atime; } | ||||
| 876 | inline static int stat_mtime(QT_STATBUF buf) { return buf.st_mtime; } | ||||
We can get all stat_xxx functions buf as reference, struct is not needed when you use C++. anthonyfieroni: We can get all stat_xxx functions buf as reference, struct is not needed when you use C++. | |||||
Do you mean the struct keyword in the argument in "inline static uint16_t stat_mode(struct statx buf) { return buf.stx_mode; } " for instance ? meven: Do you mean the struct keyword in the argument in "inline static uint16_t stat_mode(struct… | |||||
Unfortunately this is not possible here : statx is also a function, the compiler gets messed up when removing the struct keyword interpreting it as a function call.
meven: Unfortunately this is not possible here : statx is also a function, the compiler gets messed up… | |||||
No, he means using a const& for the argument, e.g: inline static uint16_t stat_mode(struct statx &buf) { return buf.stx_mode; } pino: No, he means using a const& for the argument, e.g:
```lang=c++
inline static uint16_t stat_mode… | |||||
meven: Thanks | |||||
I think he meant both. meven: > @pino
> No, he means using a const& for the argument, e.g:
I think he meant both. | |||||
| 877 | #endif | ||||
| 878 | | ||||
| 841 | bool FileProtocol::createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, | 879 | bool FileProtocol::createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, | ||
| 842 | short int details) | 880 | short int details) | ||
| 843 | { | 881 | { | ||
| 844 | assert(entry.count() == 0); // by contract :-) | 882 | assert(entry.count() == 0); // by contract :-) | ||
| 845 | entry.reserve(8); | 883 | switch (details) { | ||
This can be up to 12 now, if I counted correctly. Conditionalize this on details. bruns: This can be up to 12 now, if I counted correctly. Conditionalize this on details. | |||||
This code was just copied, but I will be happy to take care of this along the way. meven: This code was just copied, but I will be happy to take care of this along the way. | |||||
| 846 | 884 | case 0: | |||
| 885 | // filename, access, type, size, linkdest | ||||
| 886 | entry.reserve(5); | ||||
| 887 | break; | ||||
| 888 | case 1: | ||||
| 889 | // uid, gid, atime, mtime, btime | ||||
| 890 | entry.reserve(10); | ||||
| 891 | break; | ||||
| 892 | case 2: | ||||
| 893 | // acl data | ||||
| 894 | entry.reserve(13); | ||||
| 895 | case 3: | ||||
| 896 | // dev, inode | ||||
This is wrong in case someone uses details > 3, should be case 0: reserve(5), case 3: default: reserve(15) . bruns: This is wrong in case someone uses details > 3, should be `case 0: reserve(5)`, `case 3… | |||||
meven: Thanks | |||||
| 897 | entry.reserve(15); | ||||
| 898 | break; | ||||
| 899 | } | ||||
bruns: `switch (details) { ...}` | |||||
You are off by 1 for dev/inode, these are only added with details >= 3. details >= 2 is ACL data. As the ACL are commonly empty, add +0. Handle 0 explicitly, and make 3 (>=3) the default, to match the remaining code. bruns: You are off by 1 for dev/inode, these are only added with details >= 3.
details >= 2 is ACL… | |||||
| 847 | entry.fastInsert(KIO::UDSEntry::UDS_NAME, filename); | 900 | entry.fastInsert(KIO::UDSEntry::UDS_NAME, filename); | ||
| 848 | 901 | | |||
| 849 | mode_t type; | 902 | mode_t type; | ||
| 850 | mode_t access; | 903 | mode_t access; | ||
| 851 | bool isBrokenSymLink = false; | 904 | bool isBrokenSymLink = false; | ||
| 852 | long long size = 0LL; | 905 | long long size = 0LL; | ||
You should start with a more sensible size for lowerLimit, e.g. 256, maybe more - the scope is local, i.e. any excess size is hardly relevant, and allocating 1 and 256 byte cost the same. lowerLimit is not used below, I think you don't have to name it. You should use (buff.stx_size + 1), as the size is without trailing null byte. bruns: You should start with a more sensible size for lowerLimit, e.g. 256, maybe more - the scope is… | |||||
I have 256 as I'd rather allocate the minimal size without adding cost here. meven: I have 256 as I'd rather allocate the minimal size without adding cost here. | |||||
| 853 | #if HAVE_POSIX_ACL | 906 | #if HAVE_POSIX_ACL | ||
| 854 | QByteArray targetPath = path; | 907 | QByteArray targetPath = path; | ||
| 855 | #endif | 908 | #endif | ||
| 909 | | ||||
| 910 | #ifdef USE_STATX | ||||
| 911 | // statx syscall is available | ||||
| 912 | struct statx buff; | ||||
| 913 | #else | ||||
| 856 | QT_STATBUF buff; | 914 | QT_STATBUF buff; | ||
| 915 | #endif | ||||
| 857 | 916 | | |||
| 858 | if (QT_LSTAT(path.data(), &buff) == 0) { | 917 | if (STAT(path.data(), &buff) == 0) { | ||
| 859 | 918 | | |||
| 860 | if (details > 2) { | 919 | if (details > 2) { | ||
| 861 | entry.fastInsert(KIO::UDSEntry::UDS_DEVICE_ID, buff.st_dev); | 920 | entry.fastInsert(KIO::UDSEntry::UDS_DEVICE_ID, stat_mode(buff)); | ||
| 862 | entry.fastInsert(KIO::UDSEntry::UDS_INODE, buff.st_ino); | 921 | entry.fastInsert(KIO::UDSEntry::UDS_INODE, stat_ino(buff)); | ||
| 863 | } | 922 | } | ||
| 864 | 923 | | |||
| 865 | if ((buff.st_mode & QT_STAT_MASK) == QT_STAT_LNK) { | 924 | if ((stat_mode(buff) & QT_STAT_MASK) == QT_STAT_LNK) { | ||
| 866 | 925 | | |||
| 867 | #ifdef Q_OS_WIN | 926 | #ifdef Q_OS_WIN | ||
| 868 | const QString linkTarget = QFile::symLinkTarget(QFile::decodeName(path)); | 927 | const QString linkTarget = QFile::symLinkTarget(QFile::decodeName(path)); | ||
| 869 | #else | 928 | #else | ||
| 870 | // Use readlink on Unix because symLinkTarget turns relative targets into absolute (#352927) | 929 | // Use readlink on Unix because symLinkTarget turns relative targets into absolute (#352927) | ||
| 871 | const off_t lowerLimit = 1; | 930 | size_t bufferSize = qBound(256, stat_size(buff) +1, 1024); | ||
stat_size + 1. Otherwise, you will always take the n == bufferSize path below at least once. bruns: stat_size + 1. Otherwise, you will always take the `n == bufferSize` path below at least once. | |||||
| 872 | const off_t upperLimit = 1024; | | |||
| 873 | size_t bufferSize = qBound(lowerLimit, buff.st_size, upperLimit); | | |||
| 874 | QByteArray linkTargetBuffer; | 931 | QByteArray linkTargetBuffer; | ||
| 875 | linkTargetBuffer.resize(bufferSize); | 932 | linkTargetBuffer.resize(bufferSize); | ||
statx.stx_size is __u64, and readlink uses (unsigned) size_t for the buffer size. bruns: statx.stx_size is __u64, and readlink uses (unsigned) size_t for the buffer size. | |||||
meven: Let me know if I have handled this correctly. | |||||
| 876 | while (true) { | 933 | while (true) { | ||
| 877 | ssize_t n = readlink(path.constData(), linkTargetBuffer.data(), bufferSize); | 934 | ssize_t n = readlink(path.constData(), linkTargetBuffer.data(), bufferSize); | ||
| 878 | if (n < 0 && errno != ERANGE) { | 935 | if (n < 0 && errno != ERANGE) { | ||
| 879 | qCWarning(KIO_FILE) << "readlink failed!" << path; | 936 | qCWarning(KIO_FILE) << "readlink failed!" << path; | ||
| 880 | return false; | 937 | return false; | ||
| 881 | } else if (n > 0 && static_cast<size_t>(n) != bufferSize) { | 938 | } else if (n > 0 && static_cast<size_t>(n) != bufferSize) { | ||
| 939 | // the buffer was not filled in the last iteration | ||||
| 940 | // we are finished reading, break the loop | ||||
| 882 | linkTargetBuffer.truncate(n); | 941 | linkTargetBuffer.truncate(n); | ||
| 883 | break; | 942 | break; | ||
| 884 | } | 943 | } | ||
bruns: This comment is no longer relevant. | |||||
| 885 | bufferSize *= 2; | 944 | bufferSize *= 2; | ||
bruns: missing space, `size + 1` | |||||
| 886 | linkTargetBuffer.resize(bufferSize); | 945 | linkTargetBuffer.resize(bufferSize); | ||
| 887 | } | 946 | } | ||
| 888 | const QString linkTarget = QFile::decodeName(linkTargetBuffer); | 947 | const QString linkTarget = QFile::decodeName(linkTargetBuffer); | ||
| 889 | #endif | 948 | #endif | ||
| 890 | entry.fastInsert(KIO::UDSEntry::UDS_LINK_DEST, linkTarget); | 949 | entry.fastInsert(KIO::UDSEntry::UDS_LINK_DEST, linkTarget); | ||
| 891 | 950 | | |||
| 892 | // A symlink -> follow it only if details>1 | 951 | // A symlink -> follow it only if details>1 | ||
| 893 | if (details > 1) { | 952 | if (details > 1) { | ||
| 894 | if (QT_STAT(path.constData(), &buff) == -1) { | 953 | if (STAT(path.constData(), &buff) == -1) { | ||
| 895 | isBrokenSymLink = true; | 954 | isBrokenSymLink = true; | ||
| 896 | } else { | 955 | } else { | ||
| 897 | #if HAVE_POSIX_ACL | 956 | #if HAVE_POSIX_ACL | ||
| 898 | // valid symlink, will get the ACLs of the destination | 957 | // valid symlink, will get the ACLs of the destination | ||
| 899 | targetPath = linkTargetBuffer; | 958 | targetPath = linkTargetBuffer; | ||
| 900 | #endif | 959 | #endif | ||
| 901 | } | 960 | } | ||
| 902 | } | 961 | } | ||
| 903 | } | 962 | } | ||
| 904 | } else { | 963 | } else { | ||
| 905 | // qCWarning(KIO_FILE) << "lstat didn't work on " << path.data(); | 964 | // qCWarning(KIO_FILE) << "lstat didn't work on " << path.data(); | ||
| 906 | return false; | 965 | return false; | ||
| 907 | } | 966 | } | ||
| 908 | 967 | | |||
| 909 | if (isBrokenSymLink) { | 968 | if (isBrokenSymLink) { | ||
| 910 | // It is a link pointing to nowhere | 969 | // It is a link pointing to nowhere | ||
| 911 | type = S_IFMT - 1; | 970 | type = S_IFMT - 1; | ||
| 912 | access = S_IRWXU | S_IRWXG | S_IRWXO; | 971 | access = S_IRWXU | S_IRWXG | S_IRWXO; | ||
| 913 | size = 0LL; | 972 | size = 0LL; | ||
| 914 | } else { | 973 | } else { | ||
| 915 | type = buff.st_mode & S_IFMT; // extract file type | 974 | type = stat_mode(buff) & S_IFMT; // extract file type | ||
| 916 | access = buff.st_mode & 07777; // extract permissions | 975 | access = stat_mode(buff) & 07777; // extract permissions | ||
| 917 | size = buff.st_size; | 976 | size = stat_size(buff); | ||
| 918 | } | 977 | } | ||
| 919 | 978 | | |||
| 920 | entry.fastInsert(KIO::UDSEntry::UDS_FILE_TYPE, type); | 979 | entry.fastInsert(KIO::UDSEntry::UDS_FILE_TYPE, type); | ||
| 921 | entry.fastInsert(KIO::UDSEntry::UDS_ACCESS, access); | 980 | entry.fastInsert(KIO::UDSEntry::UDS_ACCESS, access); | ||
| 922 | entry.fastInsert(KIO::UDSEntry::UDS_SIZE, size); | 981 | entry.fastInsert(KIO::UDSEntry::UDS_SIZE, size); | ||
| 923 | 982 | | |||
| 924 | #if HAVE_POSIX_ACL | 983 | #if HAVE_POSIX_ACL | ||
| 925 | if (details > 1) { | 984 | if (details > 1) { | ||
| 926 | /* Append an atom indicating whether the file has extended acl information | 985 | /* Append an atom indicating whether the file has extended acl information | ||
| 927 | * and if withACL is specified also one with the acl itself. If it's a directory | 986 | * and if withACL is specified also one with the acl itself. If it's a directory | ||
| 928 | * and it has a default ACL, also append that. */ | 987 | * and it has a default ACL, also append that. */ | ||
| 929 | appendACLAtoms(targetPath, entry, type); | 988 | appendACLAtoms(targetPath, entry, type); | ||
| 930 | } | 989 | } | ||
| 931 | #endif | 990 | #endif | ||
| 932 | 991 | | |||
| 933 | if (details > 0) { | 992 | if (details > 0) { | ||
| 934 | entry.fastInsert(KIO::UDSEntry::UDS_MODIFICATION_TIME, buff.st_mtime); | 993 | entry.fastInsert(KIO::UDSEntry::UDS_MODIFICATION_TIME, stat_mtime(buff)); | ||
| 994 | entry.fastInsert(KIO::UDSEntry::UDS_ACCESS_TIME, stat_atime(buff)); | ||||
| 935 | #ifndef Q_OS_WIN | 995 | #ifndef Q_OS_WIN | ||
| 936 | entry.fastInsert(KIO::UDSEntry::UDS_USER, getUserName(KUserId(buff.st_uid))); | 996 | entry.fastInsert(KIO::UDSEntry::UDS_USER, getUserName(KUserId(stat_uid(buff)))); | ||
| 937 | entry.fastInsert(KIO::UDSEntry::UDS_GROUP, getGroupName(KGroupId(buff.st_gid))); | 997 | entry.fastInsert(KIO::UDSEntry::UDS_GROUP, getGroupName(KGroupId(stat_gid(buff)))); | ||
| 938 | #else | 998 | #else | ||
| 939 | #pragma message("TODO: st_uid and st_gid are always zero, use GetSecurityInfo to find the owner") | 999 | #pragma message("TODO: st_uid and st_gid are always zero, use GetSecurityInfo to find the owner") | ||
| 940 | #endif | 1000 | #endif | ||
| 941 | entry.fastInsert(KIO::UDSEntry::UDS_ACCESS_TIME, buff.st_atime); | 1001 | | ||
| 942 | #ifdef st_birthtime | 1002 | #ifdef st_birthtime | ||
| 943 | /* For example FreeBSD's and NetBSD's stat contains a field for | 1003 | /* For example FreeBSD's and NetBSD's stat contains a field for | ||
| 944 | * the inode birth time: st_birthtime | 1004 | * the inode birth time: st_birthtime | ||
| 945 | * This however only works on UFS and ZFS, and not, on say, NFS. | 1005 | * This however only works on UFS and ZFS, and not, on say, NFS. | ||
| 946 | * Instead of setting a bogus fallback like st_mtime, only use | 1006 | * Instead of setting a bogus fallback like st_mtime, only use | ||
| 947 | * it if it is greater than 0. */ | 1007 | * it if it is greater than 0. */ | ||
| 948 | if (buff.st_birthtime > 0) { | 1008 | if (buff.st_birthtime > 0) { | ||
| 949 | entry.fastInsert(KIO::UDSEntry::UDS_CREATION_TIME, buff.st_birthtime); | 1009 | entry.fastInsert(KIO::UDSEntry::UDS_CREATION_TIME, buff.st_birthtime); | ||
| 950 | } | 1010 | } | ||
| 951 | #elif defined __st_birthtime | 1011 | #elif defined __st_birthtime | ||
| 952 | /* As above, but OpenBSD calls it slightly differently. */ | 1012 | /* As above, but OpenBSD calls it slightly differently. */ | ||
| 953 | if (buff.__st_birthtime > 0) { | 1013 | if (buff.__st_birthtime > 0) { | ||
| 954 | entry.fastInsert(KIO::UDSEntry::UDS_CREATION_TIME, buff.__st_birthtime); | 1014 | entry.fastInsert(KIO::UDSEntry::UDS_CREATION_TIME, buff.__st_birthtime); | ||
| 955 | } | 1015 | } | ||
| 1016 | #elif defined USE_STATX | ||||
| 1017 | /* And linux version using statx syscall */ | ||||
| 1018 | if (buff.stx_btime.tv_nsec > 0) { | ||||
This check seems to be wrong with me - there can be files with legitimate zero tv_nsec. Use buff.stx_mask & STATX_BTIME instead. fvogt: This check seems to be wrong with me - there can be files with legitimate zero `tv_nsec`.
Use… | |||||
meven: Thanks for the feedback, I read about stx_mask after writing this. | |||||
| 1019 | entry.fastInsert(KIO::UDSEntry::UDS_CREATION_TIME, buff.stx_btime.tv_sec); | ||||
| 1020 | } | ||||
| 956 | #endif | 1021 | #endif | ||
| 957 | } | 1022 | } | ||
| 958 | 1023 | | |||
| 959 | // Note: buff.st_ctime isn't the creation time ! | | |||
| 960 | // We made that mistake for KDE 2.0, but it's in fact the | | |||
| 961 | // "file status" change time, which we don't care about. | | |||
| 962 | // For FreeBSD and NetBSD, use st_birthtime. For OpenBSD, | | |||
| 963 | // use __st_birthtime. | | |||
| 964 | | ||||
| 965 | return true; | 1024 | return true; | ||
| 966 | } | 1025 | } | ||
| 967 | 1026 | | |||
| 968 | void FileProtocol::special(const QByteArray &data) | 1027 | void FileProtocol::special(const QByteArray &data) | ||
| 969 | { | 1028 | { | ||
| 970 | int tmp; | 1029 | int tmp; | ||
| 971 | QDataStream stream(data); | 1030 | QDataStream stream(data); | ||
| 972 | 1031 | | |||
| ▲ Show 20 Lines • Show All 499 Lines • Show Last 20 Lines | |||||
no need for the Q_OS_LINUX check here