Differential D20096 Diff 55079 src/ioslaves/file/file.cpp

Changeset View

Standalone View

View Options

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
pinoUnsubmitted
Done

no need for the Q_OS_LINUX check here

pino: no need for the Q_OS_LINUX check here
69​#include <errno.h>
70​#include <fcntl.h>
71​#include <sys/stat.h>
fvogtUnsubmitted
Done

This won't work as expected, USE_STATX is unconditionally defined.

fvogt: This won't work as expected, `USE_STATX` is unconditionally defined.
mevenAuthorUnsubmitted
Done

Thanks

meven: Thanks
72​#include <sys/sysmacros.h>
73​#endif
74​
pinoUnsubmitted
Done

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…
mevenAuthorUnsubmitted
Done

It was not too easy to do.

meven: It was not too easy to do.
68#if HAVE_VOLMGT 75​#if HAVE_VOLMGT
69#include <volmgt.h> 76​#include <volmgt.h>
70#include <sys/mnttab.h> 77​#include <sys/mnttab.h>
71#endif 78​#endif
72 79​
73#include <kdirnotify.h> 80​#include <kdirnotify.h>
74#include <ioslave_defaults.h> 81​#include <ioslave_defaults.h>
75 82​
▲ Show 20 Lines • Show All 757 Lines • ▼ Show 20 Line(s)837 if (it == mGroupcache.end()) {
833 if (name.isEmpty()) { 840​ if (name.isEmpty()) {
834 name = gid.toString(); 841​ name = gid.toString();
835 } 842​ }
836 it = mGroupcache.insert(gid, name); 843​ it = mGroupcache.insert(gid, name);
837 } 844​ }
838 return *it; 845​ return *it;
839} 846​}
840 847​
848​#ifdef STATX_BASIC_STATS
849​// statx syscall is available
850​inline int STAT(const char* path, struct statx * buff) {
851​ return statx(AT_FDCWD, path, 0, STATX_BASIC_STATS | STATX_BTIME, buff);
852​}
853​inline static int stat_mode(struct statx buf) { return buf.stx_mode; }
854​inline static int stat_dev(struct statx buf) { return buf.stx_dev_major; }
855​inline static int stat_ino(struct statx buf) { return buf.stx_ino; }
856​inline static int stat_size(struct statx buf) { return buf.stx_size; }
857​inline static int stat_uid(struct statx buf) { return buf.stx_uid; }
858​inline static int stat_gid(struct statx buf) { return buf.stx_gid; }
859​inline static int stat_atime(struct statx buf) { return buf.stx_atime.tv_sec; }
860​inline static int stat_mtime(struct statx buf) { return buf.stx_mtime.tv_sec; }
861​#else
862​// regular stat struct
863​inline int STAT(const char* path, QT_STATBUF * buff) {
864​ return QT_LSTAT(path, buff);
865​}
866​inline static int stat_mode(QT_STATBUF buf) { return buf.st_mode; }
867​inline static int stat_dev(QT_STATBUF buf) { return buf.st_dev; }
868​inline static int stat_ino(QT_STATBUF buf) { return buf.st_ino; }
869​inline static int stat_size(QT_STATBUF buf) { return buf.st_size; }
870​inline static int stat_uid(QT_STATBUF buf) { return buf.st_uid; }
871​inline static int stat_gid(QT_STATBUF buf) { return buf.st_gid; }
872​inline static int stat_atime(QT_STATBUF buf) { return buf.st_atime; }
873​inline static int stat_mtime(QT_STATBUF buf) { return buf.st_mtime; }
anthonyfieroniUnsubmitted
Done

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++.
mevenAuthorUnsubmitted
Done

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…
mevenAuthorUnsubmitted
Done

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.

/file/file.cpp:850:34: warning: inline variables are only available with -std=c++17 or -std=gnu++17

377   │  inline static uint16_t stat_mode(statx buf) { return buf.stx_mode; }
meven: Unfortunately this is not possible here : statx is also a function, the compiler gets messed up…
pinoUnsubmitted
Done

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…
mevenAuthorUnsubmitted
Done

Thanks

meven: Thanks
mevenAuthorUnsubmitted
Done

@pino
No, he means using a const& for the argument, e.g:

I think he meant both.

meven: > @pino > No, he means using a const& for the argument, e.g: I think he meant both.
874​#endif
875​
841bool FileProtocol::createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, 876​bool FileProtocol::createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry,
842 short int details) 877​ short int details)
843{ 878​{
844 assert(entry.count() == 0); // by contract :-) 879​ assert(entry.count() == 0); // by contract :-)
845 entry.reserve(8); 880​ if (details > 0) {
brunsUnsubmitted
Done

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.
mevenAuthorUnsubmitted
Done

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 881​ // uid, gid, atime, mtime, btime
882​ if (details > 2){
883​ // dev, inode
884​ entry.reserve(12);
885​ } else {
886​ entry.reserve(10);
887​ }
888​ } else {
889​ // filename, access, type, size, linkdest
890​ entry.reserve(5);
891​ }
brunsUnsubmitted
Done

switch (details) { ...}

bruns: `switch (details) { ...}`
brunsUnsubmitted
Done

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); 892​ entry.fastInsert(KIO::UDSEntry::UDS_NAME, filename);
848 893​
brunsUnsubmitted
Done

This is wrong in case someone uses details > 3, should be case 0: reserve(5), case 3: default: reserve(15) .
all checks below do e.g if (details > 2), so handle 5 the same as 3.

bruns: This is wrong in case someone uses details > 3, should be `case 0: reserve(5)`, `case 3…
mevenAuthorUnsubmitted
Done

Thanks

meven: Thanks
849 mode_t type; 894​ mode_t type;
850 mode_t access; 895​ mode_t access;
851 bool isBrokenSymLink = false; 896​ bool isBrokenSymLink = false;
852 long long size = 0LL; 897​ long long size = 0LL;
853#if HAVE_POSIX_ACL 898​#if HAVE_POSIX_ACL
854 QByteArray targetPath = path; 899​ QByteArray targetPath = path;
855#endif 900​#endif
901​
902​#ifdef STATX_BASIC_STATS
brunsUnsubmitted
Done

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…
mevenAuthorUnsubmitted
Done

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.
903​ // statx syscall is available
904​ struct statx buff;
905​#else
856 QT_STATBUF buff; 906​ QT_STATBUF buff;
907​#endif
857 908​
858 if (QT_LSTAT(path.data(), &buff) == 0) { 909​ if (STAT(path.data(), &buff) == 0) {
859 910​
860 if (details > 2) { 911​ if (details > 2) {
861 entry.fastInsert(KIO::UDSEntry::UDS_DEVICE_ID, buff.st_dev); 912​ entry.fastInsert(KIO::UDSEntry::UDS_DEVICE_ID, stat_mode(buff));
862 entry.fastInsert(KIO::UDSEntry::UDS_INODE, buff.st_ino); 913​ entry.fastInsert(KIO::UDSEntry::UDS_INODE, stat_ino(buff));
863 } 914​ }
864 915​
865 if ((buff.st_mode & QT_STAT_MASK) == QT_STAT_LNK) { 916​ if ((stat_mode(buff) & QT_STAT_MASK) == QT_STAT_LNK) {
866 917​
867#ifdef Q_OS_WIN 918​#ifdef Q_OS_WIN
868 const QString linkTarget = QFile::symLinkTarget(QFile::decodeName(path)); 919​ const QString linkTarget = QFile::symLinkTarget(QFile::decodeName(path));
869#else 920​#else
870 // Use readlink on Unix because symLinkTarget turns relative targets into absolute (#352927) 921​ // Use readlink on Unix because symLinkTarget turns relative targets into absolute (#352927)
871 const off_t lowerLimit = 1; 922​ size_t bufferSize = qBound(1, stat_size(buff), 1024);
brunsUnsubmitted
Done

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; 923​ QByteArray linkTargetBuffer;
875 linkTargetBuffer.resize(bufferSize); 924​ linkTargetBuffer.resize(bufferSize);
brunsUnsubmitted
Done

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.
mevenAuthorUnsubmitted
Done

Let me know if I have handled this correctly.

meven: Let me know if I have handled this correctly.
876 while (true) { 925​ while (true) {
877 ssize_t n = readlink(path.constData(), linkTargetBuffer.data(), bufferSize); 926​ ssize_t n = readlink(path.constData(), linkTargetBuffer.data(), bufferSize);
878 if (n < 0 && errno != ERANGE) { 927​ if (n < 0 && errno != ERANGE) {
879 qCWarning(KIO_FILE) << "readlink failed!" << path; 928​ qCWarning(KIO_FILE) << "readlink failed!" << path;
880 return false; 929​ return false;
881 } else if (n > 0 && static_cast<size_t>(n) != bufferSize) { 930​ } else if (n > 0 && static_cast<size_t>(n) != bufferSize) {
882 linkTargetBuffer.truncate(n); 931​ linkTargetBuffer.truncate(n);
883 break; 932​ break;
884 } 933​ }
885 bufferSize *= 2; 934​ bufferSize *= 2;
886 linkTargetBuffer.resize(bufferSize); 935​ linkTargetBuffer.resize(bufferSize);
887 } 936​ }
brunsUnsubmitted
Not Done

missing space, size + 1

bruns: missing space, `size + 1`
888 const QString linkTarget = QFile::decodeName(linkTargetBuffer); 937​ const QString linkTarget = QFile::decodeName(linkTargetBuffer);
889#endif 938​#endif
890 entry.fastInsert(KIO::UDSEntry::UDS_LINK_DEST, linkTarget); 939​ entry.fastInsert(KIO::UDSEntry::UDS_LINK_DEST, linkTarget);
891 940​
brunsUnsubmitted
Done

This comment is no longer relevant.

bruns: This comment is no longer relevant.
892 // A symlink -> follow it only if details>1 941​ // A symlink -> follow it only if details>1
893 if (details > 1) { 942​ if (details > 1) {
894 if (QT_STAT(path.constData(), &buff) == -1) { 943​ if (STAT(path.constData(), &buff) == -1) {
895 isBrokenSymLink = true; 944​ isBrokenSymLink = true;
896 } else { 945​ } else {
897#if HAVE_POSIX_ACL 946​#if HAVE_POSIX_ACL
898 // valid symlink, will get the ACLs of the destination 947​ // valid symlink, will get the ACLs of the destination
899 targetPath = linkTargetBuffer; 948​ targetPath = linkTargetBuffer;
900#endif 949​#endif
901 } 950​ }
902 } 951​ }
903 } 952​ }
904 } else { 953​ } else {
905 // qCWarning(KIO_FILE) << "lstat didn't work on " << path.data(); 954​ // qCWarning(KIO_FILE) << "lstat didn't work on " << path.data();
906 return false; 955​ return false;
907 } 956​ }
908 957​
909 if (isBrokenSymLink) { 958​ if (isBrokenSymLink) {
910 // It is a link pointing to nowhere 959​ // It is a link pointing to nowhere
911 type = S_IFMT - 1; 960​ type = S_IFMT - 1;
912 access = S_IRWXU | S_IRWXG | S_IRWXO; 961​ access = S_IRWXU | S_IRWXG | S_IRWXO;
913 size = 0LL; 962​ size = 0LL;
914 } else { 963​ } else {
915 type = buff.st_mode & S_IFMT; // extract file type 964​ type = stat_mode(buff) & S_IFMT; // extract file type
916 access = buff.st_mode & 07777; // extract permissions 965​ access = stat_mode(buff) & 07777; // extract permissions
917 size = buff.st_size; 966​ size = stat_size(buff);
918 } 967​ }
919 968​
920 entry.fastInsert(KIO::UDSEntry::UDS_FILE_TYPE, type); 969​ entry.fastInsert(KIO::UDSEntry::UDS_FILE_TYPE, type);
921 entry.fastInsert(KIO::UDSEntry::UDS_ACCESS, access); 970​ entry.fastInsert(KIO::UDSEntry::UDS_ACCESS, access);
922 entry.fastInsert(KIO::UDSEntry::UDS_SIZE, size); 971​ entry.fastInsert(KIO::UDSEntry::UDS_SIZE, size);
923 972​
924#if HAVE_POSIX_ACL 973​#if HAVE_POSIX_ACL
925 if (details > 1) { 974​ if (details > 1) {
926 /* Append an atom indicating whether the file has extended acl information 975​ /* 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 976​ * 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. */ 977​ * and it has a default ACL, also append that. */
929 appendACLAtoms(targetPath, entry, type); 978​ appendACLAtoms(targetPath, entry, type);
930 } 979​ }
931#endif 980​#endif
932 981​
933 if (details > 0) { 982​ if (details > 0) {
934 entry.fastInsert(KIO::UDSEntry::UDS_MODIFICATION_TIME, buff.st_mtime); 983​ entry.fastInsert(KIO::UDSEntry::UDS_MODIFICATION_TIME, stat_mtime(buff));
984​ entry.fastInsert(KIO::UDSEntry::UDS_ACCESS_TIME, stat_atime(buff));
935#ifndef Q_OS_WIN 985​#ifndef Q_OS_WIN
936 entry.fastInsert(KIO::UDSEntry::UDS_USER, getUserName(KUserId(buff.st_uid))); 986​ entry.fastInsert(KIO::UDSEntry::UDS_USER, getUserName(KUserId(stat_uid(buff))));
937 entry.fastInsert(KIO::UDSEntry::UDS_GROUP, getGroupName(KGroupId(buff.st_gid))); 987​ entry.fastInsert(KIO::UDSEntry::UDS_GROUP, getGroupName(KGroupId(stat_gid(buff))));
938#else 988​#else
939#pragma message("TODO: st_uid and st_gid are always zero, use GetSecurityInfo to find the owner") 989​#pragma message("TODO: st_uid and st_gid are always zero, use GetSecurityInfo to find the owner")
940#endif 990​#endif
941 entry.fastInsert(KIO::UDSEntry::UDS_ACCESS_TIME, buff.st_atime); 991​
942#ifdef st_birthtime 992​#ifdef st_birthtime
943 /* For example FreeBSD's and NetBSD's stat contains a field for 993​ /* For example FreeBSD's and NetBSD's stat contains a field for
944 * the inode birth time: st_birthtime 994​ * the inode birth time: st_birthtime
945 * This however only works on UFS and ZFS, and not, on say, NFS. 995​ * 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 996​ * Instead of setting a bogus fallback like st_mtime, only use
947 * it if it is greater than 0. */ 997​ * it if it is greater than 0. */
948 if (buff.st_birthtime > 0) { 998​ if (buff.st_birthtime > 0) {
949 entry.fastInsert(KIO::UDSEntry::UDS_CREATION_TIME, buff.st_birthtime); 999​ entry.fastInsert(KIO::UDSEntry::UDS_CREATION_TIME, buff.st_birthtime);
950 } 1000​ }
951#elif defined __st_birthtime 1001​#elif defined __st_birthtime
952 /* As above, but OpenBSD calls it slightly differently. */ 1002​ /* As above, but OpenBSD calls it slightly differently. */
953 if (buff.__st_birthtime > 0) { 1003​ if (buff.__st_birthtime > 0) {
954 entry.fastInsert(KIO::UDSEntry::UDS_CREATION_TIME, buff.__st_birthtime); 1004​ entry.fastInsert(KIO::UDSEntry::UDS_CREATION_TIME, buff.__st_birthtime);
955 } 1005​ }
1006​#elif defined STATX_BASIC_STATS
1007​ /* And linux version using statx syscall */
1008​ if (buff.stx_btime.tv_nsec > 0) {
fvogtUnsubmitted
Done

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…
mevenAuthorUnsubmitted
Done

Thanks for the feedback, I read about stx_mask after writing this.

meven: Thanks for the feedback, I read about stx_mask after writing this.
1009​ entry.fastInsert(KIO::UDSEntry::UDS_CREATION_TIME, buff.stx_btime.tv_sec);
1010​ }
956#endif 1011​#endif
957 } 1012​ }
958 1013​
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; 1014​ return true;
966} 1015​}
967 1016​
968void FileProtocol::special(const QByteArray &data) 1017​void FileProtocol::special(const QByteArray &data)
969{ 1018​{
970 int tmp; 1019​ int tmp;
971 QDataStream stream(data); 1020​ QDataStream stream(data);
972 1021​
▲ Show 20 Lines • Show All 499 Lines • Show Last 20 Lines