1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFileDialog: split a static helper

Browse Source 
Split the getpwnam* related code to a separate helper; this makes the
code more readable.

Change-Id: Ia7c6b6f7801d88b6b3a8809e973ede6c58e89923
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
This commit is contained in:
Ahmad Samir 2023-05-29 12:52:35 +03:00
parent 8d77ee0f2b
commit 79710abf95
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/widgets/dialogs/qfiledialog.cpp
View File

@ -1104,6 +1104,30 @@ void QFileDialog::selectUrl(const QUrl &url)
} }
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
static QString homeDirFromPasswdEntry(const QString &path, const QByteArray &userName)
{
#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_WASM)
passwd pw;
passwd *tmpPw;
char buf[200];
const int bufSize = sizeof(buf);
int err = 0;
# if defined(Q_OS_SOLARIS) && (_POSIX_C_SOURCE - 0 < 199506L)
tmpPw = getpwnam_r(userName.constData(), &pw, buf, bufSize);
# else
err = getpwnam_r(userName.constData(), &pw, buf, bufSize, &tmpPw);
# endif
if (err || !tmpPw)
return path;
return QFile::decodeName(pw.pw_dir);
#else
passwd *pw = getpwnam(userName.constData());
if (!pw)
return path;
return QFile::decodeName(pw->pw_dir);
#endif // defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_WASM)
}
Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path) Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path)
{ {
if (!path.startsWith(u'~')) if (!path.startsWith(u'~'))
@ -1118,26 +1142,7 @@ Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path)
const QString homePath = QDir::homePath(); const QString homePath = QDir::homePath();
#else #else
const QByteArray userName = QStringView{path}.mid(1, separatorPosition - 1).toLocal8Bit(); const QByteArray userName = QStringView{path}.mid(1, separatorPosition - 1).toLocal8Bit();
# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_WASM) QString homePath = homeDirFromPasswdEntry(path, userName);
passwd pw;
passwd *tmpPw;
char buf[200];
const int bufSize = sizeof(buf);
int err = 0;
# if defined(Q_OS_SOLARIS) && (_POSIX_C_SOURCE - 0 < 199506L)
tmpPw = getpwnam_r(userName.constData(), &pw, buf, bufSize);
# else
err = getpwnam_r(userName.constData(), &pw, buf, bufSize, &tmpPw);
# endif
if (err || !tmpPw)
return path;
const QString homePath = QString::fromLocal8Bit(pw.pw_dir);
# else
passwd *pw = getpwnam(userName.constData());
if (!pw)
return path;
const QString homePath = QString::fromLocal8Bit(pw->pw_dir);
# endif
#endif #endif
return homePath + QStringView{path}.mid(separatorPosition); return homePath + QStringView{path}.mid(separatorPosition);
} }