2016-03-04 23:02:44 +00:00
|
|
|
#include "hecl/hecl.hpp"
|
2016-08-12 02:33:03 +00:00
|
|
|
#include <thread>
|
|
|
|
#include <mutex>
|
|
|
|
#include <unordered_map>
|
2015-07-06 01:35:08 +00:00
|
|
|
|
2016-01-02 02:27:17 +00:00
|
|
|
#ifdef WIN32
|
|
|
|
#include <windows.h>
|
|
|
|
#ifndef _WIN32_IE
|
|
|
|
#define _WIN32_IE 0x0400
|
|
|
|
#endif
|
|
|
|
#include <shlobj.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef __APPLE__
|
|
|
|
#include <Carbon/Carbon.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef __linux__
|
|
|
|
#include <mntent.h>
|
2017-02-26 02:42:57 +00:00
|
|
|
#include <sys/wait.h>
|
2016-01-02 02:27:17 +00:00
|
|
|
#endif
|
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
namespace hecl {
|
2015-08-06 19:10:12 +00:00
|
|
|
unsigned VerbosityLevel = 0;
|
2017-12-16 02:13:20 +00:00
|
|
|
bool GuiMode = false;
|
2016-03-04 23:02:44 +00:00
|
|
|
logvisor::Module LogModule("hecl");
|
2019-06-15 00:37:53 +00:00
|
|
|
static const std::string Illegals{"<>?\""};
|
2015-08-05 01:54:35 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
void SanitizePath(std::string& path) {
|
|
|
|
if (path.empty())
|
|
|
|
return;
|
|
|
|
path.erase(std::remove(path.begin(), path.end(), '\n'), path.end());
|
|
|
|
path.erase(std::remove(path.begin(), path.end(), '\r'), path.end());
|
|
|
|
std::string::iterator p1 = path.begin();
|
|
|
|
bool ic = false;
|
|
|
|
std::transform(path.begin(), path.end(), path.begin(), [&](const char a) -> char {
|
|
|
|
++p1;
|
|
|
|
if (Illegals.find_first_of(a) != std::string::npos) {
|
|
|
|
ic = false;
|
|
|
|
return '_';
|
|
|
|
}
|
2015-11-11 08:41:25 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
if (ic) {
|
|
|
|
ic = false;
|
|
|
|
return a;
|
|
|
|
}
|
|
|
|
if (a == '\\' && (p1 == path.end() || *p1 != '\\')) {
|
|
|
|
ic = true;
|
|
|
|
return '/';
|
|
|
|
}
|
|
|
|
return a;
|
|
|
|
});
|
|
|
|
while (path.back() == '/')
|
|
|
|
path.pop_back();
|
2015-08-05 01:54:35 +00:00
|
|
|
}
|
|
|
|
|
2019-06-15 00:37:53 +00:00
|
|
|
static const std::wstring WIllegals{L"<>?\""};
|
2018-12-08 05:18:42 +00:00
|
|
|
|
|
|
|
void SanitizePath(std::wstring& path) {
|
|
|
|
if (path.empty())
|
|
|
|
return;
|
|
|
|
path.erase(std::remove(path.begin(), path.end(), L'\n'), path.end());
|
|
|
|
path.erase(std::remove(path.begin(), path.end(), L'\r'), path.end());
|
|
|
|
std::wstring::iterator p1 = path.begin();
|
|
|
|
bool ic = false;
|
|
|
|
std::transform(path.begin(), path.end(), path.begin(), [&](const wchar_t a) -> wchar_t {
|
|
|
|
++p1;
|
|
|
|
if (WIllegals.find_first_of(a) != std::wstring::npos) {
|
|
|
|
ic = false;
|
|
|
|
return L'_';
|
|
|
|
}
|
2015-11-11 08:41:25 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
if (ic) {
|
|
|
|
ic = false;
|
|
|
|
return a;
|
|
|
|
}
|
|
|
|
if (a == L'\\' && (p1 == path.end() || *p1 != L'\\')) {
|
|
|
|
ic = true;
|
|
|
|
return L'/';
|
|
|
|
}
|
|
|
|
return a;
|
|
|
|
});
|
|
|
|
while (path.back() == L'/')
|
|
|
|
path.pop_back();
|
2015-08-05 01:54:35 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
SystemString GetcwdStr() {
|
|
|
|
/* http://stackoverflow.com/a/2869667 */
|
|
|
|
// const size_t ChunkSize=255;
|
|
|
|
// const int MaxChunks=10240; // 2550 KiBs of current path are more than enough
|
|
|
|
|
|
|
|
SystemChar stackBuffer[255]; // Stack buffer for the "normal" case
|
|
|
|
if (Getcwd(stackBuffer, 255) != nullptr)
|
|
|
|
return SystemString(stackBuffer);
|
|
|
|
if (errno != ERANGE) {
|
|
|
|
// It's not ERANGE, so we don't know how to handle it
|
2019-07-20 04:22:58 +00:00
|
|
|
LogModule.report(logvisor::Fatal, fmt("Cannot determine the current path."));
|
2018-12-08 05:18:42 +00:00
|
|
|
// Of course you may choose a different error reporting method
|
|
|
|
}
|
|
|
|
// Ok, the stack buffer isn't long enough; fallback to heap allocation
|
|
|
|
for (int chunks = 2; chunks < 10240; chunks++) {
|
|
|
|
// With boost use scoped_ptr; in C++0x, use unique_ptr
|
|
|
|
// If you want to be less C++ but more efficient you may want to use realloc
|
|
|
|
std::unique_ptr<SystemChar[]> cwd(new SystemChar[255 * chunks]);
|
|
|
|
if (Getcwd(cwd.get(), 255 * chunks) != nullptr)
|
|
|
|
return SystemString(cwd.get());
|
|
|
|
if (errno != ERANGE) {
|
|
|
|
// It's not ERANGE, so we don't know how to handle it
|
2019-07-20 04:22:58 +00:00
|
|
|
LogModule.report(logvisor::Fatal, fmt("Cannot determine the current path."));
|
2018-12-08 05:18:42 +00:00
|
|
|
// Of course you may choose a different error reporting method
|
2018-05-25 06:34:58 +00:00
|
|
|
}
|
2018-12-08 05:18:42 +00:00
|
|
|
}
|
2019-07-20 04:22:58 +00:00
|
|
|
LogModule.report(logvisor::Fatal, fmt("Cannot determine the current path; the path is apparently unreasonably long"));
|
2018-12-08 05:18:42 +00:00
|
|
|
return SystemString();
|
2018-05-25 06:34:58 +00:00
|
|
|
}
|
|
|
|
|
2016-08-12 02:33:03 +00:00
|
|
|
static std::mutex PathsMutex;
|
|
|
|
static std::unordered_map<std::thread::id, ProjectPath> PathsInProgress;
|
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
bool ResourceLock::InProgress(const ProjectPath& path) {
|
2019-08-21 21:01:00 +00:00
|
|
|
std::unique_lock lk{PathsMutex};
|
2018-12-08 05:18:42 +00:00
|
|
|
for (const auto& p : PathsInProgress)
|
|
|
|
if (p.second == path)
|
|
|
|
return true;
|
|
|
|
return false;
|
2016-08-12 02:33:03 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
bool ResourceLock::SetThreadRes(const ProjectPath& path) {
|
2019-08-21 21:01:00 +00:00
|
|
|
std::unique_lock lk{PathsMutex};
|
2018-12-08 05:18:42 +00:00
|
|
|
if (PathsInProgress.find(std::this_thread::get_id()) != PathsInProgress.cend())
|
2019-07-20 04:22:58 +00:00
|
|
|
LogModule.report(logvisor::Fatal, fmt("multiple resource locks on thread"));
|
2016-08-12 02:33:03 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
for (const auto& p : PathsInProgress)
|
|
|
|
if (p.second == path)
|
|
|
|
return false;
|
2016-08-12 02:33:03 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
PathsInProgress[std::this_thread::get_id()] = path;
|
|
|
|
return true;
|
2016-08-12 02:33:03 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
void ResourceLock::ClearThreadRes() {
|
2019-08-21 21:01:00 +00:00
|
|
|
std::unique_lock lk{PathsMutex};
|
2018-12-08 05:18:42 +00:00
|
|
|
PathsInProgress.erase(std::this_thread::get_id());
|
2016-08-12 02:33:03 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
bool IsPathPNG(const hecl::ProjectPath& path) {
|
2019-08-21 23:33:25 +00:00
|
|
|
const auto fp = hecl::FopenUnique(path.getAbsolutePath().data(), _SYS_STR("rb"));
|
|
|
|
if (fp == nullptr) {
|
2018-12-08 05:18:42 +00:00
|
|
|
return false;
|
2019-08-21 23:33:25 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
uint32_t buf = 0;
|
2019-08-21 23:33:25 +00:00
|
|
|
if (std::fread(&buf, 1, sizeof(buf), fp.get()) != sizeof(buf)) {
|
2015-10-01 00:40:06 +00:00
|
|
|
return false;
|
2018-12-08 05:18:42 +00:00
|
|
|
}
|
2019-08-21 23:33:25 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
buf = hecl::SBig(buf);
|
2019-08-21 23:33:25 +00:00
|
|
|
return buf == 0x89504e47;
|
2015-10-01 00:40:06 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
bool IsPathBlend(const hecl::ProjectPath& path) {
|
2019-08-21 23:33:25 +00:00
|
|
|
const auto lastCompExt = path.getLastComponentExt();
|
|
|
|
if (lastCompExt.empty() || hecl::StrCmp(lastCompExt.data(), _SYS_STR("blend"))) {
|
2018-12-08 05:18:42 +00:00
|
|
|
return false;
|
2019-08-21 23:33:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
const auto fp = hecl::FopenUnique(path.getAbsolutePath().data(), _SYS_STR("rb"));
|
|
|
|
if (fp == nullptr) {
|
2018-12-08 05:18:42 +00:00
|
|
|
return false;
|
2019-08-21 23:33:25 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
uint32_t buf = 0;
|
2019-08-21 23:33:25 +00:00
|
|
|
if (std::fread(&buf, 1, sizeof(buf), fp.get()) != sizeof(buf)) {
|
2015-10-01 00:40:06 +00:00
|
|
|
return false;
|
2018-12-08 05:18:42 +00:00
|
|
|
}
|
2019-08-21 23:33:25 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
buf = hecl::SLittle(buf);
|
2019-08-21 23:33:25 +00:00
|
|
|
return buf == 0x4e454c42 || buf == 0x88b1f;
|
2015-10-01 00:40:06 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
bool IsPathYAML(const hecl::ProjectPath& path) {
|
|
|
|
if (!hecl::StrCmp(path.getLastComponent().data(), _SYS_STR("!catalog.yaml")))
|
|
|
|
return false; /* !catalog.yaml is exempt from general use */
|
|
|
|
auto lastCompExt = path.getLastComponentExt();
|
|
|
|
if (lastCompExt.empty())
|
2015-10-01 00:40:06 +00:00
|
|
|
return false;
|
2018-12-08 05:18:42 +00:00
|
|
|
if (!hecl::StrCmp(lastCompExt.data(), _SYS_STR("yaml")) || !hecl::StrCmp(lastCompExt.data(), _SYS_STR("yml")))
|
|
|
|
return true;
|
|
|
|
return false;
|
2015-10-01 00:40:06 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
hecl::DirectoryEnumerator::DirectoryEnumerator(SystemStringView path, Mode mode, bool sizeSort, bool reverse,
|
|
|
|
bool noHidden) {
|
|
|
|
hecl::Sstat theStat;
|
|
|
|
if (hecl::Stat(path.data(), &theStat) || !S_ISDIR(theStat.st_mode))
|
|
|
|
return;
|
2016-01-01 00:16:20 +00:00
|
|
|
|
|
|
|
#if _WIN32
|
2018-12-08 05:18:42 +00:00
|
|
|
hecl::SystemString wc(path);
|
|
|
|
wc += _SYS_STR("/*");
|
|
|
|
WIN32_FIND_DATAW d;
|
|
|
|
HANDLE dir = FindFirstFileW(wc.c_str(), &d);
|
|
|
|
if (dir == INVALID_HANDLE_VALUE)
|
|
|
|
return;
|
|
|
|
switch (mode) {
|
|
|
|
case Mode::Native:
|
|
|
|
do {
|
|
|
|
if (!wcscmp(d.cFileName, _SYS_STR(".")) || !wcscmp(d.cFileName, _SYS_STR("..")))
|
|
|
|
continue;
|
|
|
|
if (noHidden && (d.cFileName[0] == L'.' || (d.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) != 0))
|
|
|
|
continue;
|
|
|
|
hecl::SystemString fp(path);
|
|
|
|
fp += _SYS_STR('/');
|
|
|
|
fp += d.cFileName;
|
|
|
|
hecl::Sstat st;
|
|
|
|
if (hecl::Stat(fp.c_str(), &st))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
size_t sz = 0;
|
|
|
|
bool isDir = false;
|
|
|
|
if (S_ISDIR(st.st_mode))
|
|
|
|
isDir = true;
|
|
|
|
else if (S_ISREG(st.st_mode))
|
|
|
|
sz = st.st_size;
|
|
|
|
else
|
|
|
|
continue;
|
|
|
|
|
|
|
|
m_entries.emplace_back(fp, d.cFileName, sz, isDir);
|
|
|
|
} while (FindNextFileW(dir, &d));
|
|
|
|
break;
|
|
|
|
case Mode::DirsThenFilesSorted:
|
|
|
|
case Mode::DirsSorted: {
|
|
|
|
std::map<hecl::SystemString, Entry, CaseInsensitiveCompare> sort;
|
|
|
|
do {
|
|
|
|
if (!wcscmp(d.cFileName, _SYS_STR(".")) || !wcscmp(d.cFileName, _SYS_STR("..")))
|
|
|
|
continue;
|
|
|
|
if (noHidden && (d.cFileName[0] == L'.' || (d.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) != 0))
|
|
|
|
continue;
|
|
|
|
hecl::SystemString fp(path);
|
|
|
|
fp += _SYS_STR('/');
|
|
|
|
fp += d.cFileName;
|
|
|
|
hecl::Sstat st;
|
|
|
|
if (hecl::Stat(fp.c_str(), &st) || !S_ISDIR(st.st_mode))
|
|
|
|
continue;
|
|
|
|
sort.emplace(std::make_pair(d.cFileName, Entry(std::move(fp), d.cFileName, 0, true)));
|
|
|
|
} while (FindNextFileW(dir, &d));
|
|
|
|
|
|
|
|
if (reverse)
|
|
|
|
for (auto it = sort.crbegin(); it != sort.crend(); ++it)
|
|
|
|
m_entries.push_back(std::move(it->second));
|
|
|
|
else
|
|
|
|
for (auto& e : sort)
|
|
|
|
m_entries.push_back(std::move(e.second));
|
2016-01-01 00:16:20 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
if (mode == Mode::DirsSorted)
|
|
|
|
break;
|
|
|
|
FindClose(dir);
|
|
|
|
dir = FindFirstFileW(wc.c_str(), &d);
|
|
|
|
}
|
|
|
|
case Mode::FilesSorted: {
|
|
|
|
if (mode == Mode::FilesSorted)
|
|
|
|
m_entries.clear();
|
|
|
|
|
|
|
|
if (sizeSort) {
|
|
|
|
std::multimap<size_t, Entry> sort;
|
|
|
|
do {
|
|
|
|
if (!wcscmp(d.cFileName, _SYS_STR(".")) || !wcscmp(d.cFileName, _SYS_STR("..")))
|
|
|
|
continue;
|
|
|
|
if (noHidden && (d.cFileName[0] == L'.' || (d.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) != 0))
|
|
|
|
continue;
|
|
|
|
hecl::SystemString fp(path);
|
|
|
|
fp += _SYS_STR('/');
|
|
|
|
fp += d.cFileName;
|
|
|
|
hecl::Sstat st;
|
|
|
|
if (hecl::Stat(fp.c_str(), &st) || !S_ISREG(st.st_mode))
|
|
|
|
continue;
|
|
|
|
sort.emplace(std::make_pair(st.st_size, Entry(std::move(fp), d.cFileName, st.st_size, false)));
|
|
|
|
} while (FindNextFileW(dir, &d));
|
|
|
|
|
|
|
|
if (reverse)
|
|
|
|
for (auto it = sort.crbegin(); it != sort.crend(); ++it)
|
|
|
|
m_entries.push_back(std::move(it->second));
|
|
|
|
else
|
|
|
|
for (auto& e : sort)
|
|
|
|
m_entries.push_back(std::move(e.second));
|
|
|
|
} else {
|
|
|
|
std::map<hecl::SystemString, Entry, CaseInsensitiveCompare> sort;
|
|
|
|
do {
|
|
|
|
if (!wcscmp(d.cFileName, _SYS_STR(".")) || !wcscmp(d.cFileName, _SYS_STR("..")))
|
|
|
|
continue;
|
|
|
|
if (noHidden && (d.cFileName[0] == L'.' || (d.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) != 0))
|
|
|
|
continue;
|
|
|
|
hecl::SystemString fp(path);
|
|
|
|
fp += _SYS_STR('/');
|
|
|
|
fp += d.cFileName;
|
|
|
|
hecl::Sstat st;
|
|
|
|
if (hecl::Stat(fp.c_str(), &st) || !S_ISREG(st.st_mode))
|
|
|
|
continue;
|
|
|
|
sort.emplace(std::make_pair(d.cFileName, Entry(std::move(fp), d.cFileName, st.st_size, false)));
|
|
|
|
} while (FindNextFileW(dir, &d));
|
|
|
|
|
|
|
|
if (reverse)
|
|
|
|
for (auto it = sort.crbegin(); it != sort.crend(); ++it)
|
|
|
|
m_entries.push_back(std::move(it->second));
|
|
|
|
else
|
|
|
|
for (auto& e : sort)
|
|
|
|
m_entries.push_back(std::move(e.second));
|
2016-01-01 00:16:20 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
FindClose(dir);
|
2016-01-01 00:16:20 +00:00
|
|
|
|
|
|
|
#else
|
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
DIR* dir = opendir(path.data());
|
|
|
|
if (!dir)
|
|
|
|
return;
|
|
|
|
const dirent* d;
|
|
|
|
switch (mode) {
|
|
|
|
case Mode::Native:
|
|
|
|
while ((d = readdir(dir))) {
|
|
|
|
if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
|
|
|
|
continue;
|
|
|
|
if (noHidden && d->d_name[0] == '.')
|
|
|
|
continue;
|
|
|
|
hecl::SystemString fp(path);
|
|
|
|
fp += '/';
|
|
|
|
fp += d->d_name;
|
|
|
|
hecl::Sstat st;
|
|
|
|
if (hecl::Stat(fp.c_str(), &st))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
size_t sz = 0;
|
|
|
|
bool isDir = false;
|
|
|
|
if (S_ISDIR(st.st_mode))
|
|
|
|
isDir = true;
|
|
|
|
else if (S_ISREG(st.st_mode))
|
|
|
|
sz = st.st_size;
|
|
|
|
else
|
|
|
|
continue;
|
|
|
|
|
|
|
|
m_entries.push_back(Entry(std::move(fp), d->d_name, sz, isDir));
|
2016-01-01 00:16:20 +00:00
|
|
|
}
|
2018-12-08 05:18:42 +00:00
|
|
|
break;
|
|
|
|
case Mode::DirsThenFilesSorted:
|
|
|
|
case Mode::DirsSorted: {
|
|
|
|
std::map<hecl::SystemString, Entry, CaseInsensitiveCompare> sort;
|
|
|
|
while ((d = readdir(dir))) {
|
|
|
|
if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
|
|
|
|
continue;
|
|
|
|
if (noHidden && d->d_name[0] == '.')
|
|
|
|
continue;
|
|
|
|
hecl::SystemString fp(path);
|
|
|
|
fp += '/';
|
|
|
|
fp += d->d_name;
|
|
|
|
hecl::Sstat st;
|
|
|
|
if (hecl::Stat(fp.c_str(), &st) || !S_ISDIR(st.st_mode))
|
|
|
|
continue;
|
|
|
|
sort.emplace(std::make_pair(d->d_name, Entry(std::move(fp), d->d_name, 0, true)));
|
2016-01-01 00:16:20 +00:00
|
|
|
}
|
2018-12-08 05:18:42 +00:00
|
|
|
|
|
|
|
if (reverse)
|
|
|
|
for (auto it = sort.crbegin(); it != sort.crend(); ++it)
|
|
|
|
m_entries.push_back(std::move(it->second));
|
|
|
|
else
|
|
|
|
for (auto& e : sort)
|
|
|
|
m_entries.push_back(std::move(e.second));
|
|
|
|
|
|
|
|
if (mode == Mode::DirsSorted)
|
|
|
|
break;
|
|
|
|
rewinddir(dir);
|
2019-02-18 05:44:46 +00:00
|
|
|
[[fallthrough]];
|
2018-12-08 05:18:42 +00:00
|
|
|
}
|
|
|
|
case Mode::FilesSorted: {
|
|
|
|
if (mode == Mode::FilesSorted)
|
|
|
|
m_entries.clear();
|
|
|
|
|
|
|
|
if (sizeSort) {
|
|
|
|
std::multimap<size_t, Entry> sort;
|
|
|
|
while ((d = readdir(dir))) {
|
|
|
|
if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
|
|
|
|
continue;
|
|
|
|
if (noHidden && d->d_name[0] == '.')
|
|
|
|
continue;
|
|
|
|
hecl::SystemString fp(path);
|
|
|
|
fp += '/';
|
|
|
|
fp += d->d_name;
|
|
|
|
hecl::Sstat st;
|
|
|
|
if (hecl::Stat(fp.c_str(), &st) || !S_ISREG(st.st_mode))
|
|
|
|
continue;
|
|
|
|
sort.emplace(std::make_pair(st.st_size, Entry(std::move(fp), d->d_name, st.st_size, false)));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (reverse)
|
|
|
|
for (auto it = sort.crbegin(); it != sort.crend(); ++it)
|
|
|
|
m_entries.push_back(std::move(it->second));
|
|
|
|
else
|
|
|
|
for (auto& e : sort)
|
|
|
|
m_entries.push_back(std::move(e.second));
|
|
|
|
} else {
|
|
|
|
std::map<hecl::SystemString, Entry, CaseInsensitiveCompare> sort;
|
|
|
|
while ((d = readdir(dir))) {
|
|
|
|
if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
|
|
|
|
continue;
|
|
|
|
if (noHidden && d->d_name[0] == '.')
|
|
|
|
continue;
|
|
|
|
hecl::SystemString fp(path);
|
|
|
|
fp += '/';
|
|
|
|
fp += d->d_name;
|
|
|
|
hecl::Sstat st;
|
|
|
|
if (hecl::Stat(fp.c_str(), &st) || !S_ISREG(st.st_mode))
|
|
|
|
continue;
|
|
|
|
sort.emplace(std::make_pair(d->d_name, Entry(std::move(fp), d->d_name, st.st_size, false)));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (reverse)
|
|
|
|
for (auto it = sort.crbegin(); it != sort.crend(); ++it)
|
|
|
|
m_entries.push_back(std::move(it->second));
|
|
|
|
else
|
|
|
|
for (auto& e : sort)
|
|
|
|
m_entries.push_back(std::move(e.second));
|
2016-01-01 00:16:20 +00:00
|
|
|
}
|
2018-12-08 05:18:42 +00:00
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
closedir(dir);
|
2016-01-01 00:16:20 +00:00
|
|
|
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2016-01-02 04:16:20 +00:00
|
|
|
#define FILE_MAXDIR 768
|
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
static std::pair<hecl::SystemString, std::string> NameFromPath(hecl::SystemStringView path) {
|
|
|
|
hecl::SystemUTF8Conv utf8(path);
|
|
|
|
if (utf8.str().size() == 1 && utf8.str()[0] == '/')
|
|
|
|
return {hecl::SystemString(path), "/"};
|
|
|
|
size_t lastSlash = utf8.str().rfind('/');
|
|
|
|
if (lastSlash != std::string::npos)
|
|
|
|
return {hecl::SystemString(path), std::string(utf8.str().cbegin() + lastSlash + 1, utf8.str().cend())};
|
|
|
|
else
|
|
|
|
return {hecl::SystemString(path), std::string(utf8.str())};
|
2016-01-02 04:16:20 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
std::vector<std::pair<hecl::SystemString, std::string>> GetSystemLocations() {
|
|
|
|
std::vector<std::pair<hecl::SystemString, std::string>> ret;
|
2016-01-02 02:27:17 +00:00
|
|
|
#ifdef WIN32
|
2017-12-06 03:22:31 +00:00
|
|
|
#if !WINDOWS_STORE
|
2018-12-08 05:18:42 +00:00
|
|
|
/* Add the drive names to the listing (as queried by blender) */
|
|
|
|
{
|
|
|
|
wchar_t wline[FILE_MAXDIR];
|
|
|
|
wchar_t* name;
|
|
|
|
__int64 tmp;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
tmp = GetLogicalDrives();
|
|
|
|
|
|
|
|
for (i = 0; i < 26; i++) {
|
|
|
|
if ((tmp >> i) & 1) {
|
|
|
|
wline[0] = L'A' + i;
|
|
|
|
wline[1] = L':';
|
|
|
|
wline[2] = L'/';
|
|
|
|
wline[3] = L'\0';
|
|
|
|
name = nullptr;
|
|
|
|
|
|
|
|
/* Flee from horrible win querying hover floppy drives! */
|
|
|
|
if (i > 1) {
|
|
|
|
/* Try to get volume label as well... */
|
|
|
|
if (GetVolumeInformationW(wline, wline + 4, FILE_MAXDIR - 4, nullptr, nullptr, nullptr, nullptr, 0)) {
|
|
|
|
size_t labelLen = wcslen(wline + 4);
|
|
|
|
_snwprintf(wline + 4 + labelLen, FILE_MAXDIR - 4 - labelLen, L" (%.2s)", wline);
|
|
|
|
name = wline + 4;
|
|
|
|
}
|
2016-01-02 02:27:17 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
wline[2] = L'\0';
|
|
|
|
if (name)
|
|
|
|
ret.emplace_back(wline, hecl::WideToUTF8(name));
|
|
|
|
else
|
|
|
|
ret.push_back(NameFromPath(wline));
|
|
|
|
}
|
2016-01-02 02:27:17 +00:00
|
|
|
}
|
2018-12-08 05:18:42 +00:00
|
|
|
|
|
|
|
/* Adding Desktop and My Documents */
|
|
|
|
SystemString wpath;
|
|
|
|
SHGetSpecialFolderPathW(0, wline, CSIDL_PERSONAL, 0);
|
|
|
|
wpath.assign(wline);
|
|
|
|
SanitizePath(wpath);
|
|
|
|
ret.push_back(NameFromPath(wpath));
|
|
|
|
SHGetSpecialFolderPathW(0, wline, CSIDL_DESKTOPDIRECTORY, 0);
|
|
|
|
wpath.assign(wline);
|
|
|
|
SanitizePath(wpath);
|
|
|
|
ret.push_back(NameFromPath(wpath));
|
|
|
|
}
|
2017-12-06 03:22:31 +00:00
|
|
|
#endif
|
2016-01-02 02:27:17 +00:00
|
|
|
#else
|
|
|
|
#ifdef __APPLE__
|
2018-12-08 05:18:42 +00:00
|
|
|
{
|
|
|
|
hecl::Sstat theStat;
|
|
|
|
const char* home = getenv("HOME");
|
|
|
|
|
|
|
|
if (home) {
|
|
|
|
ret.push_back(NameFromPath(home));
|
|
|
|
std::string desktop(home);
|
|
|
|
desktop += "/Desktop";
|
|
|
|
if (!hecl::Stat(desktop.c_str(), &theStat))
|
|
|
|
ret.push_back(NameFromPath(desktop));
|
|
|
|
}
|
2016-01-02 02:27:17 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
/* Get mounted volumes better method OSX 10.6 and higher, see: */
|
|
|
|
/*https://developer.apple.com/library/mac/#documentation/CoreFOundation/Reference/CFURLRef/Reference/reference.html*/
|
|
|
|
/* we get all volumes sorted including network and do not relay on user-defined finder visibility, less confusing */
|
2016-01-02 02:27:17 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
CFURLRef cfURL = NULL;
|
|
|
|
CFURLEnumeratorResult result = kCFURLEnumeratorSuccess;
|
|
|
|
CFURLEnumeratorRef volEnum = CFURLEnumeratorCreateForMountedVolumes(NULL, kCFURLEnumeratorSkipInvisibles, NULL);
|
2016-01-02 02:27:17 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
while (result != kCFURLEnumeratorEnd) {
|
|
|
|
char defPath[1024];
|
2016-01-02 02:27:17 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
result = CFURLEnumeratorGetNextURL(volEnum, &cfURL, NULL);
|
|
|
|
if (result != kCFURLEnumeratorSuccess)
|
|
|
|
continue;
|
2016-01-02 02:27:17 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
CFURLGetFileSystemRepresentation(cfURL, false, (UInt8*)defPath, 1024);
|
|
|
|
ret.push_back(NameFromPath(defPath));
|
2016-01-02 02:27:17 +00:00
|
|
|
}
|
2018-12-08 05:18:42 +00:00
|
|
|
|
|
|
|
CFRelease(volEnum);
|
|
|
|
}
|
2016-01-02 02:27:17 +00:00
|
|
|
#else
|
2018-12-08 05:18:42 +00:00
|
|
|
/* unix */
|
|
|
|
{
|
|
|
|
hecl::Sstat theStat;
|
|
|
|
const char* home = getenv("HOME");
|
|
|
|
|
|
|
|
if (home) {
|
|
|
|
ret.push_back(NameFromPath(home));
|
|
|
|
std::string desktop(home);
|
|
|
|
desktop += "/Desktop";
|
|
|
|
if (!hecl::Stat(desktop.c_str(), &theStat))
|
|
|
|
ret.push_back(NameFromPath(desktop));
|
|
|
|
}
|
2016-01-02 02:27:17 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
{
|
|
|
|
bool found = false;
|
2016-01-02 02:27:17 +00:00
|
|
|
#ifdef __linux__
|
2018-12-08 05:18:42 +00:00
|
|
|
/* Loop over mount points */
|
|
|
|
struct mntent* mnt;
|
|
|
|
|
|
|
|
FILE* fp = setmntent(MOUNTED, "r");
|
|
|
|
if (fp) {
|
|
|
|
while ((mnt = getmntent(fp))) {
|
|
|
|
if (strlen(mnt->mnt_fsname) < 4 || strncmp(mnt->mnt_fsname, "/dev", 4))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
std::string mntStr(mnt->mnt_dir);
|
|
|
|
if (mntStr.size() > 1 && mntStr.back() == '/')
|
|
|
|
mntStr.pop_back();
|
|
|
|
ret.push_back(NameFromPath(mntStr));
|
|
|
|
|
|
|
|
found = true;
|
2016-01-02 02:27:17 +00:00
|
|
|
}
|
2018-12-08 05:18:42 +00:00
|
|
|
endmntent(fp);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
/* Fallback */
|
|
|
|
if (!found)
|
|
|
|
ret.push_back(NameFromPath("/"));
|
2016-01-02 02:27:17 +00:00
|
|
|
}
|
2018-12-08 05:18:42 +00:00
|
|
|
}
|
2016-01-02 02:27:17 +00:00
|
|
|
#endif
|
|
|
|
#endif
|
2018-12-08 05:18:42 +00:00
|
|
|
return ret;
|
2016-01-02 02:27:17 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
std::wstring Char16ToWide(std::u16string_view src) { return std::wstring(src.begin(), src.end()); }
|
2017-01-24 07:55:26 +00:00
|
|
|
|
2017-02-04 03:45:39 +00:00
|
|
|
/* recursive mkdir */
|
|
|
|
#if _WIN32
|
|
|
|
int RecursiveMakeDir(const SystemChar* dir) {
|
2018-12-08 05:18:42 +00:00
|
|
|
SystemChar tmp[1024];
|
|
|
|
SystemChar* p = nullptr;
|
|
|
|
Sstat sb;
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
/* copy path */
|
|
|
|
wcsncpy(tmp, dir, 1024);
|
|
|
|
len = wcslen(tmp);
|
|
|
|
if (len >= 1024) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* remove trailing slash */
|
|
|
|
if (tmp[len - 1] == '/' || tmp[len - 1] == '\\') {
|
|
|
|
tmp[len - 1] = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* recursive mkdir */
|
|
|
|
for (p = tmp + 1; *p; p++) {
|
|
|
|
if (*p == '/' || *p == '\\') {
|
|
|
|
*p = 0;
|
|
|
|
/* test path */
|
|
|
|
if (Stat(tmp, &sb) != 0) {
|
2017-02-04 03:45:39 +00:00
|
|
|
/* path does not exist - create directory */
|
|
|
|
if (!CreateDirectoryW(tmp, nullptr)) {
|
2018-12-08 05:18:42 +00:00
|
|
|
return -1;
|
2017-02-04 03:45:39 +00:00
|
|
|
}
|
2018-12-08 05:18:42 +00:00
|
|
|
} else if (!S_ISDIR(sb.st_mode)) {
|
2017-02-04 03:45:39 +00:00
|
|
|
/* not a directory */
|
|
|
|
return -1;
|
2018-12-08 05:18:42 +00:00
|
|
|
}
|
|
|
|
*p = '/';
|
2017-02-04 03:45:39 +00:00
|
|
|
}
|
2018-12-08 05:18:42 +00:00
|
|
|
}
|
|
|
|
/* test path */
|
|
|
|
if (Stat(tmp, &sb) != 0) {
|
|
|
|
/* path does not exist - create directory */
|
|
|
|
if (!CreateDirectoryW(tmp, nullptr)) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
} else if (!S_ISDIR(sb.st_mode)) {
|
|
|
|
/* not a directory */
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
2017-02-04 03:45:39 +00:00
|
|
|
}
|
|
|
|
#else
|
|
|
|
int RecursiveMakeDir(const SystemChar* dir) {
|
2018-12-08 05:18:42 +00:00
|
|
|
SystemChar tmp[1024];
|
|
|
|
SystemChar* p = nullptr;
|
|
|
|
Sstat sb;
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
/* copy path */
|
|
|
|
strncpy(tmp, dir, 1024);
|
|
|
|
len = strlen(tmp);
|
|
|
|
if (len >= 1024) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* remove trailing slash */
|
|
|
|
if (tmp[len - 1] == '/') {
|
|
|
|
tmp[len - 1] = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* recursive mkdir */
|
|
|
|
for (p = tmp + 1; *p; p++) {
|
|
|
|
if (*p == '/') {
|
|
|
|
*p = 0;
|
|
|
|
/* test path */
|
|
|
|
if (Stat(tmp, &sb) != 0) {
|
2017-02-04 03:45:39 +00:00
|
|
|
/* path does not exist - create directory */
|
|
|
|
if (mkdir(tmp, 0755) < 0) {
|
2018-12-08 05:18:42 +00:00
|
|
|
return -1;
|
2017-02-04 03:45:39 +00:00
|
|
|
}
|
2018-12-08 05:18:42 +00:00
|
|
|
} else if (!S_ISDIR(sb.st_mode)) {
|
2017-02-04 03:45:39 +00:00
|
|
|
/* not a directory */
|
|
|
|
return -1;
|
2018-12-08 05:18:42 +00:00
|
|
|
}
|
|
|
|
*p = '/';
|
2017-02-04 03:45:39 +00:00
|
|
|
}
|
2018-12-08 05:18:42 +00:00
|
|
|
}
|
|
|
|
/* test path */
|
|
|
|
if (Stat(tmp, &sb) != 0) {
|
|
|
|
/* path does not exist - create directory */
|
|
|
|
if (mkdir(tmp, 0755) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
} else if (!S_ISDIR(sb.st_mode)) {
|
|
|
|
/* not a directory */
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
2017-02-04 03:45:39 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
const SystemChar* GetTmpDir() {
|
2017-02-24 08:27:07 +00:00
|
|
|
#ifdef _WIN32
|
2017-12-06 03:22:31 +00:00
|
|
|
#if WINDOWS_STORE
|
2018-12-08 05:18:42 +00:00
|
|
|
wchar_t* TMPDIR = nullptr;
|
2017-12-06 03:22:31 +00:00
|
|
|
#else
|
2018-12-08 05:18:42 +00:00
|
|
|
wchar_t* TMPDIR = _wgetenv(L"TEMP");
|
|
|
|
if (!TMPDIR)
|
|
|
|
TMPDIR = (wchar_t*)L"\\Temp";
|
2017-12-06 03:22:31 +00:00
|
|
|
#endif
|
2017-02-24 08:27:07 +00:00
|
|
|
#else
|
2018-12-08 05:18:42 +00:00
|
|
|
char* TMPDIR = getenv("TMPDIR");
|
|
|
|
if (!TMPDIR)
|
|
|
|
TMPDIR = (char*)"/tmp";
|
2017-02-24 08:27:07 +00:00
|
|
|
#endif
|
2018-12-08 05:18:42 +00:00
|
|
|
return TMPDIR;
|
2017-02-24 08:27:07 +00:00
|
|
|
}
|
|
|
|
|
2017-12-06 03:22:31 +00:00
|
|
|
#if !WINDOWS_STORE
|
2018-12-08 05:18:42 +00:00
|
|
|
int RunProcess(const SystemChar* path, const SystemChar* const args[]) {
|
2017-02-24 08:27:07 +00:00
|
|
|
#ifdef _WIN32
|
2018-12-08 05:18:42 +00:00
|
|
|
SECURITY_ATTRIBUTES sattrs = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE};
|
|
|
|
HANDLE consoleOutReadTmp, consoleOutWrite, consoleErrWrite, consoleOutRead;
|
|
|
|
if (!CreatePipe(&consoleOutReadTmp, &consoleOutWrite, &sattrs, 0)) {
|
2019-07-20 04:22:58 +00:00
|
|
|
LogModule.report(logvisor::Fatal, fmt("Error with CreatePipe"));
|
2018-12-08 05:18:42 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2017-02-25 07:58:36 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
if (!DuplicateHandle(GetCurrentProcess(), consoleOutWrite, GetCurrentProcess(), &consoleErrWrite, 0, TRUE,
|
|
|
|
DUPLICATE_SAME_ACCESS)) {
|
2019-07-20 04:22:58 +00:00
|
|
|
LogModule.report(logvisor::Fatal, fmt("Error with DuplicateHandle"));
|
2017-02-25 07:58:36 +00:00
|
|
|
CloseHandle(consoleOutReadTmp);
|
2018-12-08 05:18:42 +00:00
|
|
|
CloseHandle(consoleOutWrite);
|
|
|
|
return -1;
|
|
|
|
}
|
2017-02-25 07:58:36 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
if (!DuplicateHandle(GetCurrentProcess(), consoleOutReadTmp, GetCurrentProcess(),
|
|
|
|
&consoleOutRead, // Address of new handle.
|
|
|
|
0, FALSE, // Make it uninheritable.
|
|
|
|
DUPLICATE_SAME_ACCESS)) {
|
2019-07-20 04:22:58 +00:00
|
|
|
LogModule.report(logvisor::Fatal, fmt("Error with DupliateHandle"));
|
2018-12-08 05:18:42 +00:00
|
|
|
CloseHandle(consoleOutReadTmp);
|
|
|
|
CloseHandle(consoleOutWrite);
|
|
|
|
CloseHandle(consoleErrWrite);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
CloseHandle(consoleOutReadTmp);
|
|
|
|
|
|
|
|
hecl::SystemString cmdLine;
|
|
|
|
const SystemChar* const* arg = &args[1];
|
|
|
|
while (*arg) {
|
|
|
|
cmdLine += _SYS_STR(" \"");
|
|
|
|
cmdLine += *arg++;
|
|
|
|
cmdLine += _SYS_STR('"');
|
|
|
|
}
|
|
|
|
|
|
|
|
STARTUPINFO sinfo = {sizeof(STARTUPINFO)};
|
|
|
|
HANDLE nulHandle = CreateFileW(L"nul", GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, &sattrs, OPEN_EXISTING,
|
|
|
|
FILE_ATTRIBUTE_NORMAL, NULL);
|
|
|
|
sinfo.dwFlags = STARTF_USESTDHANDLES;
|
|
|
|
sinfo.hStdInput = nulHandle;
|
|
|
|
sinfo.hStdError = consoleErrWrite;
|
|
|
|
sinfo.hStdOutput = consoleOutWrite;
|
|
|
|
|
|
|
|
PROCESS_INFORMATION pinfo = {};
|
|
|
|
if (!CreateProcessW(path, (LPWSTR)cmdLine.c_str(), NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, &sinfo,
|
|
|
|
&pinfo)) {
|
|
|
|
LPWSTR messageBuffer = nullptr;
|
|
|
|
FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
|
|
|
|
GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&messageBuffer, 0, NULL);
|
2019-07-28 01:19:48 +00:00
|
|
|
LogModule.report(logvisor::Error, fmt(L"unable to launch process from {}: {}"), path, messageBuffer);
|
2018-12-08 05:18:42 +00:00
|
|
|
LocalFree(messageBuffer);
|
2017-02-25 07:58:36 +00:00
|
|
|
|
|
|
|
CloseHandle(nulHandle);
|
|
|
|
CloseHandle(consoleErrWrite);
|
|
|
|
CloseHandle(consoleOutWrite);
|
2018-12-08 05:18:42 +00:00
|
|
|
CloseHandle(consoleOutRead);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
CloseHandle(nulHandle);
|
|
|
|
CloseHandle(consoleErrWrite);
|
|
|
|
CloseHandle(consoleOutWrite);
|
|
|
|
|
|
|
|
bool consoleThreadRunning = true;
|
|
|
|
auto consoleThread = std::thread([=, &consoleThreadRunning]() {
|
|
|
|
CHAR lpBuffer[256];
|
|
|
|
DWORD nBytesRead;
|
|
|
|
DWORD nCharsWritten;
|
|
|
|
|
|
|
|
while (consoleThreadRunning) {
|
|
|
|
if (!ReadFile(consoleOutRead, lpBuffer, sizeof(lpBuffer), &nBytesRead, NULL) || !nBytesRead) {
|
|
|
|
DWORD err = GetLastError();
|
|
|
|
if (err == ERROR_BROKEN_PIPE)
|
|
|
|
break; // pipe done - normal exit path.
|
|
|
|
else
|
2019-07-28 01:19:48 +00:00
|
|
|
LogModule.report(logvisor::Error, fmt("Error with ReadFile: {:08X}"), err); // Something bad happened.
|
2018-12-08 05:18:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Display the character read on the screen.
|
|
|
|
auto lk = logvisor::LockLog();
|
|
|
|
if (!WriteConsoleA(GetStdHandle(STD_OUTPUT_HANDLE), lpBuffer, nBytesRead, &nCharsWritten, NULL)) {
|
2019-07-20 04:22:58 +00:00
|
|
|
// LogModule.report(logvisor::Error, fmt("Error with WriteConsole: %08X"), GetLastError());
|
2018-12-08 05:18:42 +00:00
|
|
|
}
|
|
|
|
}
|
2017-02-25 07:58:36 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
CloseHandle(consoleOutRead);
|
|
|
|
});
|
2017-02-25 07:58:36 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
WaitForSingleObject(pinfo.hProcess, INFINITE);
|
|
|
|
DWORD ret;
|
|
|
|
if (!GetExitCodeProcess(pinfo.hProcess, &ret))
|
|
|
|
ret = -1;
|
|
|
|
consoleThreadRunning = false;
|
|
|
|
if (consoleThread.joinable())
|
|
|
|
consoleThread.join();
|
2017-02-25 07:58:36 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
CloseHandle(pinfo.hProcess);
|
|
|
|
CloseHandle(pinfo.hThread);
|
2017-02-25 07:58:36 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
return ret;
|
2017-02-24 08:27:07 +00:00
|
|
|
#else
|
2018-12-08 05:18:42 +00:00
|
|
|
pid_t pid = fork();
|
|
|
|
if (!pid) {
|
2019-02-27 05:13:19 +00:00
|
|
|
closefrom(3);
|
2018-12-08 05:18:42 +00:00
|
|
|
execvp(path, (char* const*)args);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
int ret;
|
|
|
|
if (waitpid(pid, &ret, 0) < 0)
|
2017-02-24 08:27:07 +00:00
|
|
|
return -1;
|
2018-12-08 05:18:42 +00:00
|
|
|
if (WIFEXITED(ret))
|
|
|
|
return WEXITSTATUS(ret);
|
|
|
|
return -1;
|
2017-02-24 08:27:07 +00:00
|
|
|
#endif
|
|
|
|
}
|
2017-12-06 03:22:31 +00:00
|
|
|
#endif
|
2017-02-24 08:27:07 +00:00
|
|
|
|
2018-12-08 05:18:42 +00:00
|
|
|
} // namespace hecl
|