]> git.pld-linux.org Git - packages/qt4.git/blame - qt-everywhere-opensource-src-4.8.3-QTBUG-4862.patch
rebuild with openssl 3.0.0
[packages/qt4.git] / qt-everywhere-opensource-src-4.8.3-QTBUG-4862.patch
CommitLineData
31a0326c
AM
1diff -up qt-everywhere-opensource-src-4.8.3/src/corelib/io/qfilesystemengine_unix.cpp.QTBUG-4862 qt-everywhere-opensource-src-4.8.3/src/corelib/io/qfilesystemengine_unix.cpp
2--- qt-everywhere-opensource-src-4.8.3/src/corelib/io/qfilesystemengine_unix.cpp.QTBUG-4862 2012-09-10 20:36:50.000000000 -0500
3+++ qt-everywhere-opensource-src-4.8.3/src/corelib/io/qfilesystemengine_unix.cpp 2012-10-22 14:16:42.672111081 -0500
ee6e148c 4@@ -624,6 +624,25 @@ QString QFileSystemEngine::homePath()
31a0326c
AM
5 {
6 QString home = QFile::decodeName(qgetenv("HOME"));
ee6e148c 7 if (home.isEmpty())
31a0326c
AM
8+ {
9+#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
ee6e148c
AM
10+ int size_max = sysconf(_SC_GETPW_R_SIZE_MAX);
11+ if (size_max == -1)
12+ size_max = 1024;
13+ QVarLengthArray<char, 1024> buf(size_max);
31a0326c 14+#endif
ee6e148c
AM
15+ struct passwd *pw = 0;
16+ uid_t user_id = getuid();
17+ pw = getpwuid(user_id);
31a0326c 18+#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
ee6e148c
AM
19+ struct passwd entry;
20+ getpwuid_r(user_id, &entry, buf.data(), buf.size(), &pw);
31a0326c 21+#else
ee6e148c 22+ pw = getpwuid(user_id);
31a0326c 23+#endif
ee6e148c 24+ home = QFile::decodeName(QByteArray(pw->pw_dir));
31a0326c
AM
25+ }
26+ if (home.isEmpty())
27 home = rootPath();
28 return QDir::cleanPath(home);
29 }
ee6e148c 30
This page took 0.066932 seconds and 4 git commands to generate.