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

kdecore: fetch environment variables only if needed in KShell::envExpand()

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-10-11 02:05:32 +03:00
parent cee8f0b972
commit 9fd7e104aa
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
kdecore/util/kshell.cpp
View file

@ -24,7 +24,8 @@
#include "kdebug.h"
#include <QtCore/QDir>
#include <QtCore/QProcessEnvironment>
#include <stdlib.h>
namespace KShell {
@ -75,10 +76,6 @@ static bool isVariableChar(const QChar &ch)
QString KShell::envExpand( const QString &fname )
{
if (!fname.contains(QLatin1Char('$'))) {
return fname;
}
const QProcessEnvironment qprocenv = QProcessEnvironment::systemEnvironment();
QString result = fname;
int i = 0;
while (i < result.size()) {
@ -105,9 +102,10 @@ QString KShell::envExpand( const QString &fname )
varlen++;
varend++;
}
const QString varname = result.mid(varstart, varend - i - 1);
// kDebug() << "replacing" << varname << "with" << qprocenv.value(varname);
result = result.replace(i, varlen + 1, qprocenv.value(varname));
const QByteArray varname = result.mid(varstart, varend - i - 1).toLocal8Bit();
const QString varvalue = QString::fromLocal8Bit(::getenv(varname.constData()));
// kDebug() << "replacing" << varname << "with" << varvalue);
result = result.replace(i, varlen + 1, varvalue);
i = 0;
continue;
}