diff options
author | Fathi Boudra <fabo@debian.org> | 2009-02-20 20:24:25 +0000 |
---|---|---|
committer | Fathi Boudra <fabo@debian.org> | 2009-02-20 20:24:25 +0000 |
commit | 7b37d1bc4f6b27188b0688dcdc2b89db3101575c (patch) | |
tree | dccc02bc71441fbb202d0bfd622af264fc33c89f /debian/patches/0167-fix-group-reading.diff | |
parent | 6ad728b38295ae6479662a58b8c640f389bfa607 (diff) | |
download | qt4-x11-debian/4.5.0-rc1-1.tar.gz |
Merge Qt4 4.5 branch to trunk.debian/4.5.0-rc1-1
Diffstat (limited to 'debian/patches/0167-fix-group-reading.diff')
-rw-r--r-- | debian/patches/0167-fix-group-reading.diff | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/debian/patches/0167-fix-group-reading.diff b/debian/patches/0167-fix-group-reading.diff deleted file mode 100644 index 60e2efc..0000000 --- a/debian/patches/0167-fix-group-reading.diff +++ /dev/null @@ -1,28 +0,0 @@ -qt-bugs@ issue : none -Trolltech task ID : none yet -bugs.kde.org number : None -applied: no -author: Dirk Mueller <mueller@kde.org> - -in big user environments, getgrgid_r() needs more memory than sysconf() returns. -Try a bit harder. - ---- a/src/corelib/io/qfsfileengine_unix.cpp -+++ b/src/corelib/io/qfsfileengine_unix.cpp -@@ -857,9 +857,13 @@ - size_max = sysconf(_SC_GETGR_R_SIZE_MAX); - if (size_max == -1) - size_max = 1024; -- buf.resize(size_max); -- struct group entry; -- getgrgid_r(ownerId(own), &entry, buf.data(), buf.size(), &gr); -+ for (;size_max < 256000; size_max += size_max) { -+ buf.resize(size_max); -+ struct group entry; -+ if (!getgrgid_r(ownerId(own), &entry, buf.data(), buf.size(), &gr) || errno != ERANGE) -+ break; -+ -+ } - #else - gr = getgrgid(ownerId(own)); - #endif |