X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2FGlobal.cpp;h=7b079f3a7cf1d11c928be9bbe5c90a105c737839;hb=5a54e2219dd047e9b63a446ee966566a1fc1d360;hp=2028e69dc1b6622c5b18388c7b17564c60f99b90;hpb=de57843e3a4a1965b8b8c99ac68225ad99233d3a;p=mutilities%2FMUtilities.git diff --git a/src/Global.cpp b/src/Global.cpp index 2028e69..7b079f3 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -27,6 +27,7 @@ #include #include #include +#include "Internal.h" //Internal #include "DirLocker.h" @@ -38,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -52,6 +54,9 @@ #include #endif +//Global +const QString MUtils::Internal::g_empty; + /////////////////////////////////////////////////////////////////////////////// // Random Support /////////////////////////////////////////////////////////////////////////////// @@ -121,6 +126,23 @@ quint32 MUtils::next_rand_u32(void) return rnd; } +quint32 MUtils::next_rand_u32(const quint32 max) +{ + static const uint32_t DIV_LUT[64] = + { + 0xFFFFFFFF, 0xFFFFFFFF, 0x80000000, 0x55555556, 0x40000000, 0x33333334, 0x2AAAAAAB, 0x24924925, + 0x20000000, 0x1C71C71D, 0x1999999A, 0x1745D175, 0x15555556, 0x13B13B14, 0x12492493, 0x11111112, + 0x10000000, 0x0F0F0F10, 0x0E38E38F, 0x0D79435F, 0x0CCCCCCD, 0x0C30C30D, 0x0BA2E8BB, 0x0B21642D, + 0x0AAAAAAB, 0x0A3D70A4, 0x09D89D8A, 0x097B425F, 0x0924924A, 0x08D3DCB1, 0x08888889, 0x08421085, + 0x08000000, 0x07C1F07D, 0x07878788, 0x07507508, 0x071C71C8, 0x06EB3E46, 0x06BCA1B0, 0x06906907, + 0x06666667, 0x063E7064, 0x06186187, 0x05F417D1, 0x05D1745E, 0x05B05B06, 0x0590B217, 0x0572620B, + 0x05555556, 0x0539782A, 0x051EB852, 0x05050506, 0x04EC4EC5, 0x04D4873F, 0x04BDA130, 0x04A7904B, + 0x04924925, 0x047DC120, 0x0469EE59, 0x0456C798, 0x04444445, 0x04325C54, 0x04210843, 0x04104105 + }; + return (max < 64) ? (next_rand_u32() / DIV_LUT[max]) : (next_rand_u32() / (UINT32_MAX / max + 1U)); +} + + quint64 MUtils::next_rand_u64(void) { return (quint64(next_rand_u32()) << 32) | quint64(next_rand_u32()); @@ -187,9 +209,20 @@ QString MUtils::trim_left(const QString &str) QString MUtils::make_temp_file(const QString &basePath, const QString &extension, const bool placeholder) { + return make_temp_file(QDir(basePath), extension, placeholder); +} + +QString MUtils::make_temp_file(const QDir &basePath, const QString &extension, const bool placeholder) +{ + if (extension.isEmpty()) + { + qWarning("Cannot generate temp file name with invalid parameters!"); + return QString(); + } + for(int i = 0; i < 4096; i++) { - const QString tempFileName = QString("%1/%2.%3").arg(basePath, next_rand_str(), extension); + const QString tempFileName = basePath.absoluteFilePath(QString("%1.%2").arg(next_rand_str(), extension)); if(!QFileInfo(tempFileName).exists()) { if(placeholder) @@ -212,21 +245,32 @@ QString MUtils::make_temp_file(const QString &basePath, const QString &extension return QString(); } -QString MUtils::make_unique_file(const QString &basePath, const QString &baseName, const QString &extension, const bool fancy) +QString MUtils::make_unique_file(const QString &basePath, const QString &baseName, const QString &extension, const bool fancy, const bool placeholder) { + return make_unique_file(QDir(basePath), baseName, extension, fancy); +} + +QString MUtils::make_unique_file(const QDir &basePath, const QString &baseName, const QString &extension, const bool fancy, const bool placeholder) +{ + if (baseName.isEmpty() || extension.isEmpty()) + { + qWarning("Cannot generate unique file name with invalid parameters!"); + return QString(); + } + quint32 n = fancy ? 2 : 0; - QString fileName = fancy ? QString("%1/%2.%3").arg(basePath, baseName, extension) : QString(); + QString fileName = fancy ? basePath.absoluteFilePath(QString("%1.%2").arg(baseName, extension)) : QString(); while (fileName.isEmpty() || QFileInfo(fileName).exists()) { if (n <= quint32(USHRT_MAX)) { if (fancy) { - fileName = QString("%1/%2 (%3).%4").arg(basePath, baseName, QString::number(n++), extension); + fileName = basePath.absoluteFilePath(QString("%1 (%2).%3").arg(baseName, QString::number(n++), extension)); } else { - fileName = QString("%1/%2.%3.%4").arg(basePath, baseName, QString::number(n++, 16).rightJustified(4, QLatin1Char('0')), extension); + fileName = basePath.absoluteFilePath(QString("%1.%2.%3").arg(baseName, QString::number(n++, 16).rightJustified(4, QLatin1Char('0')), extension)); } } else @@ -235,6 +279,16 @@ QString MUtils::make_unique_file(const QString &basePath, const QString &baseNam return QString(); } } + + if (placeholder && (!fileName.isEmpty())) + { + QFile placeholder(fileName); + if (placeholder.open(QIODevice::WriteOnly)) + { + placeholder.close(); + } + } + return fileName; } @@ -398,58 +452,39 @@ static const QFile::Permissions FILE_PERMISSIONS_NONE = QFile::ReadOther | QFile bool MUtils::remove_file(const QString &fileName) { QFileInfo fileInfo(fileName); - if(!(fileInfo.exists() && fileInfo.isFile())) - { - return true; - } - for(int i = 0; i < 32; i++) + for(size_t round = 0; round < 13; ++round) { - QFile file(fileName); - file.setPermissions(FILE_PERMISSIONS_NONE); - if((!(fileInfo.exists() && fileInfo.isFile())) || file.remove()) + if (round > 0) { - return true; + MUtils::OS::sleep_ms(round); + fileInfo.refresh(); } - MUtils::OS::sleep_ms(1); - fileInfo.refresh(); - } - - qWarning("Could not delete \"%s\"", MUTILS_UTF8(fileName)); - return false; -} - -static bool remove_directory_helper(const QDir &folder) -{ - if(!folder.exists()) - { - return true; - } - const QString dirName = folder.dirName(); - if(!dirName.isEmpty()) - { - QDir parent(folder); - if(parent.cdUp()) + if (fileInfo.exists()) { - QFile::setPermissions(folder.absolutePath(), FILE_PERMISSIONS_NONE); - if(parent.rmdir(dirName)) + QFile file(fileName); + if (round > 0) { - return true; + file.setPermissions(FILE_PERMISSIONS_NONE); } + file.remove(); + fileInfo.refresh(); + } + if (!fileInfo.exists()) + { + return true; /*success*/ } } + + qWarning("Could not delete \"%s\"", MUTILS_UTF8(fileName)); return false; } bool MUtils::remove_directory(const QString &folderPath, const bool &recursive) { - QDir folder(folderPath); - if(!folder.exists()) - { - return true; - } + const QDir folder(folderPath); - if(recursive) + if(recursive && folder.exists()) { const QFileInfoList entryList = folder.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot | QDir::Hidden); for(QFileInfoList::ConstIterator iter = entryList.constBegin(); iter != entryList.constEnd(); iter++) @@ -458,21 +493,37 @@ bool MUtils::remove_directory(const QString &folderPath, const bool &recursive) { remove_directory(iter->canonicalFilePath(), true); } - else if(iter->isFile()) + else { remove_file(iter->canonicalFilePath()); } } } - for(int i = 0; i < 32; i++) + for(size_t round = 0; round < 13; ++round) { - if(remove_directory_helper(folder)) + if(round > 0) { - return true; + MUtils::OS::sleep_ms(round); + folder.refresh(); + } + if (folder.exists()) + { + QDir parent = folder; + if (parent.cdUp()) + { + if (round > 0) + { + QFile::setPermissions(folder.absolutePath(), FILE_PERMISSIONS_NONE); + } + parent.rmdir(folder.dirName()); + folder.refresh(); + } + } + if (!folder.exists()) + { + return true; /*success*/ } - MUtils::OS::sleep_ms(1); - folder.refresh(); } qWarning("Could not rmdir \"%s\"", MUTILS_UTF8(folderPath)); @@ -485,42 +536,58 @@ bool MUtils::remove_directory(const QString &folderPath, const bool &recursive) static void prependToPath(QProcessEnvironment &env, const QString &value) { - const QLatin1String PATH = QLatin1String("PATH"); + static const QLatin1String PATH("PATH"); const QString path = env.value(PATH, QString()).trimmed(); env.insert(PATH, path.isEmpty() ? value : QString("%1;%2").arg(value, path)); } -void MUtils::init_process(QProcess &process, const QString &wokringDir, const bool bReplaceTempDir, const QStringList *const extraPaths) +void MUtils::init_process(QProcess &process, const QString &wokringDir, const bool bReplaceTempDir, const QStringList *const extraPaths, const QHash *const extraEnv) { //Environment variable names - static const char *const s_envvar_names_temp[] = + static const char *const ENVVAR_NAMES_TMP[] = { "TEMP", "TMP", "TMPDIR", "HOME", "USERPROFILE", "HOMEPATH", NULL }; - static const char *const s_envvar_names_remove[] = + static const char *const ENVVAR_NAMES_SYS[] = + { + "WINDIR", "SYSTEMROOT", NULL + }; + static const char *const ENVVAR_NAMES_DEL[] = { - "WGETRC", "SYSTEM_WGETRC", "HTTP_PROXY", "FTP_PROXY", "NO_PROXY", "GNUPGHOME", "LC_ALL", "LC_COLLATE", "LC_CTYPE", "LC_MESSAGES", "LC_MONETARY", "LC_NUMERIC", "LC_TIME", "LANG", NULL + "HTTP_PROXY", "FTP_PROXY", "NO_PROXY", "HOME", "LC_ALL", "LC_COLLATE", "LC_CTYPE", + "LC_MESSAGES", "LC_MONETARY", "LC_NUMERIC", "LC_TIME", "LANG", NULL }; //Initialize environment QProcessEnvironment env = process.processEnvironment(); - if(env.isEmpty()) env = QProcessEnvironment::systemEnvironment(); + if (env.isEmpty()) + { + env = QProcessEnvironment::systemEnvironment(); + } - //Clean a number of enviroment variables that might affect our tools - for(size_t i = 0; s_envvar_names_remove[i]; i++) + //Clean enviroment variables that might affect our tools + for(const char *const *ptr = ENVVAR_NAMES_DEL; *ptr; ++ptr) { - env.remove(QString::fromLatin1(s_envvar_names_remove[i])); - env.remove(QString::fromLatin1(s_envvar_names_remove[i]).toLower()); + env.remove(QString::fromLatin1(*ptr)); } - const QString tempDir = QDir::toNativeSeparators(temp_folder()); + //Set up system root directory + const QString sysRoot = QDir::toNativeSeparators(OS::known_folder(OS::FOLDER_SYSTROOT_DIR)); + if (!sysRoot.isEmpty()) + { + for (const char *const *ptr = ENVVAR_NAMES_SYS; *ptr; ++ptr) + { + env.insert(QString::fromLatin1(*ptr), sysRoot); + } + } //Replace TEMP directory in environment + const QString tempDir = QDir::toNativeSeparators(temp_folder()); if(bReplaceTempDir) { - for(size_t i = 0; s_envvar_names_temp[i]; i++) + for (const char *const *ptr = ENVVAR_NAMES_TMP; *ptr; ++ptr) { - env.insert(s_envvar_names_temp[i], tempDir); + env.insert(QString::fromLatin1(*ptr), tempDir); } } @@ -536,6 +603,15 @@ void MUtils::init_process(QProcess &process, const QString &wokringDir, const bo } } + //Setup environment + if (extraEnv && (!extraEnv->isEmpty())) + { + for (QHash::ConstIterator iter = extraEnv->constBegin(); iter != extraEnv->constEnd(); iter++) + { + env.insert(iter.key(), iter.value()); + } + } + //Setup QPorcess object process.setWorkingDirectory(wokringDir); process.setProcessChannelMode(QProcess::MergedChannels); @@ -812,8 +888,16 @@ QStringList MUtils::available_codepages(const bool &noAliases) MUtils::fp_parts_t MUtils::break_fp(const double value) { - fp_parts_t result; - result.fractpart = modf(value, &result.intpart); + fp_parts_t result = { }; + if (_finite(value)) + { + result.parts[1] = modf(value, &result.parts[0]); + } + else + { + result.parts[0] = std::numeric_limits::quiet_NaN(); + result.parts[1] = std::numeric_limits::quiet_NaN(); + } return result; }