Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdecore: replace KTempDir::create() with its body

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-09-30 21:33:18 +03:00
parent c03977c492
commit 5f7912004c
2 changed files with 40 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
kdecore/io/ktempdir.cpp
View file

@ -111,52 +111,49 @@ public:
}
};
KTempDir::KTempDir(const QString &directoryPrefix, int mode)
: d(new Private)
KTempDir::KTempDir(const QString &_directoryPrefix, int mode)
: d(new Private())
{
(void) create(directoryPrefix.isEmpty() ? KStandardDirs::locateLocal("tmp", KGlobal::mainComponent().componentName()) : directoryPrefix , mode);
}
QString directoryPrefix = _directoryPrefix;
if (directoryPrefix.isEmpty()) {
directoryPrefix = KStandardDirs::locateLocal("tmp", KGlobal::mainComponent().componentName());
}
bool KTempDir::create(const QString &directoryPrefix, int mode)
{
QByteArray nme = QFile::encodeName(directoryPrefix) + "XXXXXX";
char *realName = ::mkdtemp(nme.data());
if (realName == 0) {
// Recreate it for the warning, mkdtemps emptied it
nme = QFile::encodeName(directoryPrefix) + "XXXXXX";
kWarning(180) << "KTempDir: Error trying to create " << nme.data()
<< ": " << ::strerror(errno) << endl;
d->error = errno;
d->tmpName.clear();
return false;
QByteArray nme = QFile::encodeName(directoryPrefix) + "XXXXXX";
char *realName = ::mkdtemp(nme.data());
if (realName == 0) {
// Recreate it for the warning, mkdtemps emptied it
nme = QFile::encodeName(directoryPrefix) + "XXXXXX";
kWarning(180) << "KTempDir: Error trying to create " << nme.data()
<< ": " << ::strerror(errno) << endl;
d->error = errno;
d->tmpName.clear();
return;
}
QByteArray realNameStr(realName);
d->tmpName = QFile::decodeName(realNameStr)+QLatin1Char('/');
kDebug(180) << "KTempDir: Temporary directory created :" << d->tmpName << endl;
mode_t umsk = KGlobal::umask();
if (::chmod(nme, mode & (~umsk)) < 0) {
kWarning(180) << "KTempDir: Unable to change permissions on" << d->tmpName
<< ":" << ::strerror(errno);
d->error = errno;
d->tmpName.clear();
(void) ::rmdir(realName); // Cleanup created directory
return;
}
// got a return value != 0
QByteArray realNameStr(realName);
d->tmpName = QFile::decodeName(realNameStr)+QLatin1Char('/');
kDebug(180) << "KTempDir: Temporary directory created :" << d->tmpName << endl;
// Success!
d->exists = true;
mode_t umsk = KGlobal::umask();
if (::chmod(nme, mode & (~umsk)) < 0) {
kWarning(180) << "KTempDir: Unable to change permissions on" << d->tmpName
<< ":" << ::strerror(errno);
d->error = errno;
d->tmpName.clear();
(void) ::rmdir(realName); // Cleanup created directory
return false;
// Set uid/gid (necessary for SUID programs)
if (::chown(nme, ::getuid(), ::getgid()) < 0) {
// Just warn, but don't failover yet
kWarning(180) << "KTempDir: Unable to change owner on" << d->tmpName
<< ":" << ::strerror(errno);
}
// Success!
d->exists = true;
// Set uid/gid (necessary for SUID programs)
if (::chown(nme, ::getuid(), ::getgid()) < 0) {
// Just warn, but don't failover yet
kWarning(180) << "KTempDir: Unable to change owner on" << d->tmpName
<< ":" << ::strerror(errno);
}
return true;
}
KTempDir::~KTempDir()
@ -164,7 +161,6 @@ KTempDir::~KTempDir()
if (d->autoRemove) {
unlink();
}
delete d;
}
@ -208,9 +204,10 @@ void KTempDir::unlink()
bool KTempDir::removeDir(const QString &path)
{
//kDebug(180) << path;
// kDebug(180) << path;
if (!QDir(path).exists()) {
return true; // The goal is that there is no directory
// The goal is that there is no directory
return true;
}
const QByteArray cstr(QFile::encodeName(path));

11
kdecore/io/ktempdir.h
View file

@ -146,17 +146,6 @@ public:
*/
static bool removeDir(const QString &path);
protected:
/**
* Creates a "random" directory with specified mode
* @param directoryPrefix to use when creating temp directory
* (the rest is generated randomly)
* @param mode directory permissions
* @return true upon success
*/
bool create(const QString &directoryPrefix, int mode);
private:
Q_DISABLE_COPY(KTempDir)
class Private;