mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-05-16 14:16:09 -06:00
This might bring some incompatibilities in the code that expects wchar to be 16 bit, which escpecially involves dealing with Win32 (and to lesser extend MacOS) APIs, so if your application is doing that, please check all instances of WCHAR (UniChar on MacOS) or even wchar especially type casts. To support host APIs, char16 is introduced (but there is no 16-bit String varian). Use ToSystemCharsetW, FromSystemCharsetW to convert texts to Win32 API. - Support of drawing non-BMP characters in GUI - Vastly improved character font replacement code (when drawing characters missing with requested font, replacement font is used) - Last instances of Win32 ANSI calls (those ending with A) are removed - UTF handling routines are refactored and their's naming is unified - RTF is now being able to handle non-BMP characters (RTF is used as clipboard format for RichText) Other minor changes: - fixed TryRealloc issue - improved MemoryCheck - Removed MemoryAlloc48/MemoryFree48 - In theide Background parsing should less often cause delays in the main thread
680 lines
16 KiB
C++
680 lines
16 KiB
C++
#include "Core.h"
|
|
|
|
namespace Upp {
|
|
|
|
#ifdef PLATFORM_POSIX
|
|
//#BLITZ_APPROVE
|
|
#include <signal.h>
|
|
#include <sys/types.h>
|
|
#include <sys/wait.h>
|
|
#endif
|
|
|
|
#define LLOG(x) // DLOG(x)
|
|
|
|
void LocalProcess::Init() {
|
|
#ifdef PLATFORM_WIN32
|
|
hProcess = hOutputRead = hErrorRead = hInputWrite = NULL;
|
|
#endif
|
|
#ifdef PLATFORM_POSIX
|
|
pid = 0;
|
|
doublefork = false;
|
|
rpipe[0] = rpipe[1] = wpipe[0] = wpipe[1] = epipe[0] = epipe[1] = -1;
|
|
#endif
|
|
exit_code = Null;
|
|
convertcharset = true;
|
|
}
|
|
|
|
void LocalProcess::Free() {
|
|
#ifdef PLATFORM_WIN32
|
|
if(hProcess) {
|
|
CloseHandle(hProcess);
|
|
hProcess = NULL;
|
|
}
|
|
if(hOutputRead) {
|
|
CloseHandle(hOutputRead);
|
|
hOutputRead = NULL;
|
|
}
|
|
if(hErrorRead) {
|
|
CloseHandle(hErrorRead);
|
|
hErrorRead = NULL;
|
|
}
|
|
if(hInputWrite) {
|
|
CloseHandle(hInputWrite);
|
|
hInputWrite = NULL;
|
|
}
|
|
#endif
|
|
#ifdef PLATFORM_POSIX
|
|
LLOG("\nLocalProcess::Free, pid = " << (int)getpid());
|
|
LLOG("rpipe[" << rpipe[0] << ", " << rpipe[1] << "]");
|
|
LLOG("wpipe[" << wpipe[0] << ", " << wpipe[1] << "]");
|
|
if(rpipe[0] >= 0) { close(rpipe[0]); rpipe[0] = -1; }
|
|
if(rpipe[1] >= 0) { close(rpipe[1]); rpipe[1] = -1; }
|
|
if(wpipe[0] >= 0) { close(wpipe[0]); wpipe[0] = -1; }
|
|
if(wpipe[1] >= 0) { close(wpipe[1]); wpipe[1] = -1; }
|
|
if(epipe[0] >= 0) { close(epipe[0]); epipe[0] = -1; }
|
|
if(epipe[1] >= 0) { close(epipe[1]); epipe[1] = -1; }
|
|
if(pid) waitpid(pid, 0, WNOHANG | WUNTRACED);
|
|
pid = 0;
|
|
#endif
|
|
}
|
|
|
|
#ifdef PLATFORM_POSIX
|
|
static void sNoBlock(int fd)
|
|
{
|
|
fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
|
|
}
|
|
#endif
|
|
|
|
#ifdef PLATFORM_WIN32
|
|
bool Win32CreateProcess(const char *command, const char *envptr, STARTUPINFOW& si, PROCESS_INFORMATION& pi, const char *cd)
|
|
{ // provides conversion of charset for cmdline and envptr
|
|
Vector<WCHAR> cmd = ToSystemCharsetW(command);
|
|
cmd.Add(0);
|
|
#if 0 // unicode environment not necessary for now
|
|
wchar wenvptr = NULL;
|
|
Buffer<WCHAR> env(n);
|
|
if(envptr) {
|
|
int len = 0;
|
|
while(envptr[len] || envptr[len + 1])
|
|
len++;
|
|
WString wenv(envptr, len + 1);
|
|
env.Alloc(len + 2);
|
|
memcpy(env, wenv, (len + 2) * sizeof(wchar));
|
|
}
|
|
#endif
|
|
return CreateProcessW(NULL, cmd, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, (void *)envptr,
|
|
cd ? ToSystemCharsetW(cd).begin() : NULL, &si, &pi);
|
|
}
|
|
#endif
|
|
|
|
bool LocalProcess::DoStart(const char *command, const Vector<String> *arg, bool spliterr, const char *envptr, const char *cd)
|
|
{
|
|
LLOG("LocalProcess::Start(\"" << command << "\")");
|
|
|
|
Kill();
|
|
exit_code = Null;
|
|
|
|
while(*command && (byte)*command <= ' ')
|
|
command++;
|
|
|
|
#ifdef PLATFORM_WIN32
|
|
HANDLE hOutputReadTmp, hOutputWrite;
|
|
HANDLE hInputWriteTmp, hInputRead;
|
|
HANDLE hErrorReadTmp, hErrorWrite;
|
|
|
|
HANDLE hp = GetCurrentProcess();
|
|
|
|
SECURITY_ATTRIBUTES sa;
|
|
|
|
sa.nLength = sizeof(SECURITY_ATTRIBUTES);
|
|
sa.lpSecurityDescriptor = NULL;
|
|
sa.bInheritHandle = TRUE;
|
|
|
|
CreatePipe(&hInputRead, &hInputWriteTmp, &sa, 0);
|
|
DuplicateHandle(hp, hInputWriteTmp, hp, &hInputWrite, 0, FALSE, DUPLICATE_SAME_ACCESS);
|
|
CloseHandle(hInputWriteTmp);
|
|
|
|
CreatePipe(&hOutputReadTmp, &hOutputWrite, &sa, 0);
|
|
DuplicateHandle(hp, hOutputReadTmp, hp, &hOutputRead, 0, FALSE, DUPLICATE_SAME_ACCESS);
|
|
CloseHandle(hOutputReadTmp);
|
|
|
|
if(spliterr) {
|
|
CreatePipe(&hErrorReadTmp, &hErrorWrite, &sa, 0);
|
|
DuplicateHandle(hp, hErrorReadTmp, hp, &hErrorRead, 0, FALSE, DUPLICATE_SAME_ACCESS);
|
|
CloseHandle(hErrorReadTmp);
|
|
}
|
|
else
|
|
DuplicateHandle(hp, hOutputWrite, hp, &hErrorWrite, 0, TRUE, DUPLICATE_SAME_ACCESS);
|
|
|
|
PROCESS_INFORMATION pi;
|
|
STARTUPINFOW si;
|
|
ZeroMemory(&si, sizeof(STARTUPINFOW));
|
|
si.cb = sizeof(STARTUPINFO);
|
|
si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
|
|
si.wShowWindow = SW_HIDE;
|
|
si.hStdInput = hInputRead;
|
|
si.hStdOutput = hOutputWrite;
|
|
si.hStdError = hErrorWrite;
|
|
String cmdh;
|
|
if(arg) {
|
|
cmdh = command;
|
|
for(int i = 0; i < arg->GetCount(); i++) {
|
|
cmdh << ' ';
|
|
String argument = (*arg)[i];
|
|
if(argument.GetCount() && argument.FindFirstOf(" \t\n\v\"") < 0)
|
|
cmdh << argument;
|
|
else {
|
|
cmdh << '\"';
|
|
const char *s = argument;
|
|
for(;;) {
|
|
int num_backslashes = 0;
|
|
while(*s == '\\') {
|
|
s++;
|
|
num_backslashes++;
|
|
}
|
|
if(*s == '\0') {
|
|
cmdh.Cat('\\', 2 * num_backslashes);
|
|
break;
|
|
}
|
|
else
|
|
if(*s == '\"') {
|
|
cmdh.Cat('\\', 2 * num_backslashes + 1);
|
|
cmdh << '\"';
|
|
}
|
|
else {
|
|
cmdh.Cat('\\', num_backslashes);
|
|
cmdh.Cat(*s);
|
|
}
|
|
s++;
|
|
}
|
|
cmdh << '\"';
|
|
}
|
|
}
|
|
command = cmdh;
|
|
}
|
|
bool h = Win32CreateProcess(command, envptr, si, pi, cd);
|
|
LLOG("CreateProcess " << (h ? "succeeded" : "failed"));
|
|
CloseHandle(hErrorWrite);
|
|
CloseHandle(hInputRead);
|
|
CloseHandle(hOutputWrite);
|
|
if(h) {
|
|
hProcess = pi.hProcess;
|
|
CloseHandle(pi.hThread);
|
|
}
|
|
else {
|
|
Free();
|
|
return false;
|
|
}
|
|
return true;
|
|
#endif
|
|
#ifdef PLATFORM_POSIX
|
|
Buffer<char> cmd_buf;
|
|
Vector<char *> args;
|
|
|
|
String app;
|
|
if(arg) {
|
|
app = command;
|
|
int n = strlen(command) + 1;
|
|
for(int i = 0; i < arg->GetCount(); i++)
|
|
n += (*arg)[i].GetCount() + 1;
|
|
cmd_buf.Alloc(n + 1);
|
|
char *p = cmd_buf;
|
|
args.Add(p);
|
|
int l = strlen(command) + 1;
|
|
memcpy(p, command, l);
|
|
p += l;
|
|
for(int i = 0; i < arg->GetCount(); i++) {
|
|
args.Add(p);
|
|
l = (*arg)[i].GetCount() + 1;
|
|
memcpy(p, ~(*arg)[i], l);
|
|
p += l;
|
|
}
|
|
}
|
|
else { // parse command line for execve
|
|
cmd_buf.Alloc(strlen(command) + 1);
|
|
char *cmd_out = cmd_buf;
|
|
const char *p = command;
|
|
while(*p)
|
|
if((byte)*p <= ' ')
|
|
p++;
|
|
else {
|
|
args.Add(cmd_out);
|
|
while(*p && (byte)*p > ' ') {
|
|
int c = *p;
|
|
if(c == '\\') {
|
|
if(*++p)
|
|
*cmd_out++ = *p++;
|
|
}
|
|
else if(c == '\"' || c == '\'') {
|
|
p++;
|
|
while(*p && *p != c)
|
|
if(*p == '\\') {
|
|
if(*++p)
|
|
*cmd_out++ = *p++;
|
|
}
|
|
else
|
|
*cmd_out++ = *p++;
|
|
if(*p == c)
|
|
p++;
|
|
}
|
|
else
|
|
*cmd_out++ = *p++;
|
|
}
|
|
*cmd_out++ = '\0';
|
|
}
|
|
}
|
|
|
|
if(args.GetCount() == 0)
|
|
return false;
|
|
|
|
args.Add(NULL);
|
|
|
|
String app_full = GetFileOnPath(args[0], getenv("PATH"), true);
|
|
if(IsNull(app_full))
|
|
return false;
|
|
|
|
Buffer<char> arg0(app_full.GetCount() + 1);
|
|
memcpy(~arg0, ~app_full, app_full.GetCount() + 1);
|
|
args[0] = ~arg0;
|
|
|
|
if(pipe(rpipe) || pipe(wpipe))
|
|
return false;
|
|
|
|
if(spliterr && pipe(epipe))
|
|
return false;
|
|
|
|
LLOG("\nLocalProcess::Start");
|
|
LLOG("rpipe[" << rpipe[0] << ", " << rpipe[1] << "]");
|
|
LLOG("wpipe[" << wpipe[0] << ", " << wpipe[1] << "]");
|
|
LLOG("epipe[" << epipe[0] << ", " << epipe[1] << "]");
|
|
|
|
#ifdef CPU_BLACKFIN
|
|
pid = vfork(); //we *can* use vfork here, since exec is done later or the parent will exit
|
|
#else
|
|
pid = fork();
|
|
#endif
|
|
LLOG("\tfork, pid = " << (int)pid << ", getpid = " << (int)getpid());
|
|
if(pid < 0)
|
|
return false;
|
|
// throw Exc(NFormat(t_("fork() error; error code = %d"), errno));
|
|
|
|
if(pid) {
|
|
LLOG("parent process - continue");
|
|
close(rpipe[0]); rpipe[0]=-1;
|
|
close(wpipe[1]); wpipe[1]=-1;
|
|
sNoBlock(rpipe[1]);
|
|
sNoBlock(wpipe[0]);
|
|
if (spliterr) {
|
|
sNoBlock(epipe[0]);
|
|
close(epipe[1]); epipe[1]=-1;
|
|
}
|
|
if (doublefork)
|
|
pid = 0;
|
|
return true;
|
|
}
|
|
|
|
if (doublefork) {
|
|
pid_t pid2 = fork();
|
|
LLOG("\tfork2, pid2 = " << (int)pid2 << ", getpid = " << (int)getpid());
|
|
if (pid2 < 0) {
|
|
LLOG("fork2 failed");
|
|
Exit(1);
|
|
}
|
|
if (pid2) {
|
|
LLOG("exiting intermediary process");
|
|
close(rpipe[0]); rpipe[0]=-1;
|
|
close(wpipe[1]); wpipe[1]=-1;
|
|
sNoBlock(rpipe[1]);
|
|
sNoBlock(wpipe[0]);
|
|
if (spliterr) {
|
|
sNoBlock(epipe[0]);
|
|
close(epipe[1]); epipe[1]=-1;
|
|
}
|
|
// we call exec instead of Exit, because exit doesn't behave nicelly with threads
|
|
execl("/usr/bin/true", "[closing fork]", (char*)NULL);
|
|
// only call Exit when execl fails
|
|
Exit(0);
|
|
}
|
|
}
|
|
|
|
LLOG("child process - execute application");
|
|
// rpipe[1] = wpipe[0] = -1;
|
|
dup2(rpipe[0], 0);
|
|
dup2(wpipe[1], 1);
|
|
dup2(spliterr ? epipe[1] : wpipe[1], 2);
|
|
close(rpipe[0]);
|
|
close(rpipe[1]);
|
|
close(wpipe[0]);
|
|
close(wpipe[1]);
|
|
if (spliterr) {
|
|
close(epipe[0]);
|
|
close(epipe[1]);
|
|
}
|
|
rpipe[0] = rpipe[1] = wpipe[0] = wpipe[1] = epipe[0] = epipe[1] = -1;
|
|
#if DO_LLOG
|
|
LLOG(args.GetCount() << "arguments:");
|
|
for(int a = 0; a < args.GetCount(); a++)
|
|
LLOG("[" << a << "]: <" << (args[a] ? args[a] : "NULL") << ">");
|
|
#endif
|
|
|
|
if(cd)
|
|
(void)!chdir(cd); // that (void)! strange thing is to silence GCC warning
|
|
|
|
LLOG("running execve, app = " << app << ", #args = " << args.GetCount());
|
|
if(envptr) {
|
|
const char *from = envptr;
|
|
Vector<const char *> env;
|
|
while(*from) {
|
|
env.Add(from);
|
|
from += strlen(from) + 1;
|
|
}
|
|
env.Add(NULL);
|
|
execve(app_full, args.Begin(), (char *const *)env.Begin());
|
|
}
|
|
else
|
|
execv(app_full, args.Begin());
|
|
LLOG("execve failed, errno = " << errno);
|
|
// printf("Error running '%s', error code %d\n", command, errno);
|
|
exit(-errno);
|
|
return true;
|
|
#endif
|
|
}
|
|
|
|
#ifdef PLATFORM_POSIX
|
|
bool LocalProcess::DecodeExitCode(int status)
|
|
{
|
|
if(WIFEXITED(status)) {
|
|
exit_code = (byte)WEXITSTATUS(status);
|
|
return true;
|
|
}
|
|
else if(WIFSIGNALED(status) || WIFSTOPPED(status)) {
|
|
static const struct {
|
|
const char *name;
|
|
int code;
|
|
}
|
|
signal_map[] = {
|
|
#define SIGDEF(s) { #s, s },
|
|
SIGDEF(SIGHUP) SIGDEF(SIGINT) SIGDEF(SIGQUIT) SIGDEF(SIGILL) SIGDEF(SIGABRT)
|
|
SIGDEF(SIGFPE) SIGDEF(SIGKILL) SIGDEF(SIGSEGV) SIGDEF(SIGPIPE) SIGDEF(SIGALRM)
|
|
SIGDEF(SIGPIPE) SIGDEF(SIGTERM) SIGDEF(SIGUSR1) SIGDEF(SIGUSR2) SIGDEF(SIGTRAP)
|
|
SIGDEF(SIGURG) SIGDEF(SIGVTALRM) SIGDEF(SIGXCPU) SIGDEF(SIGXFSZ) SIGDEF(SIGIOT)
|
|
SIGDEF(SIGIO) SIGDEF(SIGWINCH)
|
|
#ifndef PLATFORM_BSD
|
|
//SIGDEF(SIGCLD) SIGDEF(SIGPWR)
|
|
#endif
|
|
//SIGDEF(SIGSTKFLT) SIGDEF(SIGUNUSED) // not in Solaris, make conditional if needed
|
|
#undef SIGDEF
|
|
};
|
|
|
|
int sig = (WIFSIGNALED(status) ? WTERMSIG(status) : WSTOPSIG(status));
|
|
exit_code = (WIFSIGNALED(status) ? 1000 : 2000) + sig;
|
|
exit_string << "\nProcess " << (WIFSIGNALED(status) ? "terminated" : "stopped") << " on signal " << sig;
|
|
for(int i = 0; i < __countof(signal_map); i++)
|
|
if(signal_map[i].code == sig)
|
|
{
|
|
exit_string << " (" << signal_map[i].name << ")";
|
|
break;
|
|
}
|
|
exit_string << "\n";
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
#endif//PLATFORM_POSIX
|
|
|
|
void LocalProcess::Kill() {
|
|
#ifdef PLATFORM_WIN32
|
|
if(hProcess && IsRunning()) {
|
|
TerminateProcess(hProcess, (DWORD)-1);
|
|
exit_code = 255;
|
|
}
|
|
#endif
|
|
#ifdef PLATFORM_POSIX
|
|
if(IsRunning()) {
|
|
LLOG("\nLocalProcess::Kill, pid = " << (int)pid);
|
|
exit_code = 255;
|
|
kill(pid, SIGTERM);
|
|
GetExitCode();
|
|
int status;
|
|
if(pid && waitpid(pid, &status, 0) == pid)
|
|
DecodeExitCode(status);
|
|
exit_string = "Child process has been killed.\n";
|
|
}
|
|
#endif
|
|
Free();
|
|
}
|
|
|
|
void LocalProcess::Detach()
|
|
{
|
|
#ifdef PLATFORM_POSIX
|
|
if (doublefork)
|
|
waitpid(pid, 0, WUNTRACED);
|
|
#endif
|
|
Free();
|
|
}
|
|
|
|
bool LocalProcess::IsRunning() {
|
|
#ifdef PLATFORM_WIN32
|
|
dword exitcode;
|
|
if(!hProcess)
|
|
return false;
|
|
if(GetExitCodeProcess(hProcess, &exitcode) && exitcode == STILL_ACTIVE)
|
|
return true;
|
|
dword n;
|
|
if(PeekNamedPipe(hOutputRead, NULL, 0, NULL, &n, NULL) && n)
|
|
return true;
|
|
exit_code = exitcode;
|
|
return false;
|
|
#endif
|
|
#ifdef PLATFORM_POSIX
|
|
if(!pid || !IsNull(exit_code)) {
|
|
LLOG("IsRunning() -> no");
|
|
return false;
|
|
}
|
|
int status = 0, wp;
|
|
if(!( (wp = waitpid(pid, &status, WNOHANG | WUNTRACED)) == pid &&
|
|
DecodeExitCode(status) ))
|
|
return true;
|
|
LLOG("IsRunning() -> no, just exited, exit code = " << exit_code);
|
|
return false;
|
|
#endif
|
|
}
|
|
|
|
int LocalProcess::GetExitCode() {
|
|
#ifdef PLATFORM_WIN32
|
|
return IsRunning() ? (int)Null : exit_code;
|
|
#endif
|
|
#ifdef PLATFORM_POSIX
|
|
if(!IsRunning())
|
|
return Nvl(exit_code, -1);
|
|
int status;
|
|
if(!( waitpid(pid, &status, WNOHANG | WUNTRACED) == pid &&
|
|
DecodeExitCode(status) ))
|
|
return -1;
|
|
LLOG("GetExitCode() -> " << exit_code << " (just exited)");
|
|
return exit_code;
|
|
#endif
|
|
}
|
|
|
|
String LocalProcess::GetExitMessage() {
|
|
#ifdef PLATFORM_POSIX
|
|
if (!IsRunning() && GetExitCode() == -1)
|
|
return exit_string;
|
|
else
|
|
#endif
|
|
return String();
|
|
}
|
|
|
|
bool LocalProcess::Read(String& res) {
|
|
String dummy;
|
|
return Read2(res, dummy);
|
|
}
|
|
|
|
bool LocalProcess::Read2(String& reso, String& rese)
|
|
{
|
|
LLOG("LocalProcess::Read2");
|
|
reso = wreso;
|
|
rese = wrese;
|
|
wreso.Clear();
|
|
wrese.Clear();
|
|
|
|
#ifdef PLATFORM_WIN32
|
|
LLOG("LocalProcess::Read");
|
|
bool was_running = IsRunning();
|
|
char buffer[1024];
|
|
dword n;
|
|
if(hOutputRead && PeekNamedPipe(hOutputRead, NULL, 0, NULL, &n, NULL) && n &&
|
|
ReadFile(hOutputRead, buffer, sizeof(buffer), &n, NULL) && n)
|
|
reso.Cat(buffer, n);
|
|
|
|
if(hErrorRead && PeekNamedPipe(hErrorRead, NULL, 0, NULL, &n, NULL) && n &&
|
|
ReadFile(hErrorRead, buffer, sizeof(buffer), &n, NULL) && n)
|
|
rese.Cat(buffer, n);
|
|
|
|
if(convertcharset) {
|
|
reso = FromOEMCharset(reso);
|
|
rese = FromOEMCharset(rese);
|
|
}
|
|
|
|
return reso.GetCount() || rese.GetCount() || was_running;
|
|
#endif
|
|
#ifdef PLATFORM_POSIX
|
|
String res[2];
|
|
bool was_running = IsRunning() || wpipe[0] >= 0 || epipe[0] >= 0;
|
|
for (int wp=0; wp<2;wp++) {
|
|
int *pipe = wp ? epipe : wpipe;
|
|
if (pipe[0] < 0) {
|
|
LLOG("Pipe["<<wp<<"] closed");
|
|
continue;
|
|
}
|
|
fd_set set[1];
|
|
FD_ZERO(set);
|
|
FD_SET(pipe[0], set);
|
|
timeval tval = { 0, 0 };
|
|
int sv;
|
|
if((sv = select(pipe[0]+1, set, NULL, NULL, &tval)) > 0) {
|
|
LLOG("Read() -> select");
|
|
char buffer[1024];
|
|
int done = read(pipe[0], buffer, sizeof(buffer));
|
|
LLOG("Read(), read -> " << done);
|
|
if(done > 0)
|
|
res[wp].Cat(buffer, done);
|
|
else if (done == 0) {
|
|
close(pipe[0]);
|
|
pipe[0] = -1;
|
|
}
|
|
}
|
|
LLOG("Pipe["<<wp<<"]=="<<pipe[0]<<" sv:"<<sv);
|
|
if(sv < 0) {
|
|
LLOG("select -> " << sv);
|
|
}
|
|
}
|
|
if(convertcharset) {
|
|
reso << FromSystemCharset(res[0]);
|
|
rese << FromSystemCharset(res[1]);
|
|
} else {
|
|
reso << res[0];
|
|
rese << res[1];
|
|
}
|
|
return !IsNull(res[0]) || !IsNull(res[1]) || was_running;
|
|
#endif
|
|
}
|
|
|
|
void LocalProcess::Write(String s)
|
|
{
|
|
if(convertcharset)
|
|
s = ToSystemCharset(s);
|
|
#ifdef PLATFORM_WIN32
|
|
if (hInputWrite) {
|
|
bool ret = true;
|
|
dword n;
|
|
for(int wn = 0; ret && wn < s.GetLength(); wn += n) {
|
|
ret = WriteFile(hInputWrite, ~s + wn, s.GetLength(), &n, NULL);
|
|
String ho = wreso;
|
|
String he = wrese;
|
|
wreso = wrese = Null;
|
|
Read2(wreso, wrese);
|
|
wreso = ho + wreso;
|
|
wrese = he + wrese;
|
|
}
|
|
}
|
|
#endif
|
|
#ifdef PLATFORM_POSIX
|
|
if (rpipe[1] >= 0) {
|
|
int ret=1;
|
|
for(int wn = 0; (ret > 0 || errno == EINTR) && wn < s.GetLength(); wn += ret) {
|
|
String ho = wreso;
|
|
String he = wrese;
|
|
wreso = wrese = Null;
|
|
Read2(wreso, wrese);
|
|
wreso = ho + wreso;
|
|
wrese = he + wrese;
|
|
ret = write(rpipe[1], ~s + wn, s.GetLength() - wn);
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
|
|
void LocalProcess::CloseRead()
|
|
{
|
|
#ifdef PLATFORM_WIN32
|
|
if(hOutputRead) {
|
|
CloseHandle(hOutputRead);
|
|
hOutputRead = NULL;
|
|
}
|
|
#endif
|
|
#ifdef PLATFORM_POSIX
|
|
if (wpipe[0] >= 0) {
|
|
close(wpipe[0]);
|
|
wpipe[0]=-1;
|
|
}
|
|
#endif
|
|
}
|
|
|
|
void LocalProcess::CloseWrite()
|
|
{
|
|
#ifdef PLATFORM_WIN32
|
|
if(hInputWrite) {
|
|
CloseHandle(hInputWrite);
|
|
hInputWrite = NULL;
|
|
}
|
|
#endif
|
|
#ifdef PLATFORM_POSIX
|
|
if (rpipe[1] >= 0) {
|
|
close(rpipe[1]);
|
|
rpipe[1]=-1;
|
|
}
|
|
#endif
|
|
}
|
|
|
|
int LocalProcess::Finish(String& out)
|
|
{
|
|
out.Clear();
|
|
while(IsRunning()) {
|
|
String h = Get();
|
|
if(IsNull(h))
|
|
Sleep(1); // p.Wait would be much better here!
|
|
else
|
|
out.Cat(h);
|
|
}
|
|
LLOG("Finish: About to read the rest of output");
|
|
for(;;) {
|
|
String h = Get();
|
|
if(h.IsVoid())
|
|
break;
|
|
out.Cat(h);
|
|
}
|
|
return GetExitCode();
|
|
}
|
|
|
|
int Sys(const char *cmd, String& out, bool convertcharset)
|
|
{
|
|
LocalProcess p;
|
|
p.ConvertCharset(convertcharset);
|
|
if(!p.Start(cmd))
|
|
return -1;
|
|
return p.Finish(out);
|
|
}
|
|
|
|
String Sys(const char *cmd, bool convertcharset)
|
|
{
|
|
String r;
|
|
return Sys(cmd, r, convertcharset) ? String::GetVoid() : r;
|
|
}
|
|
|
|
int Sys(const char *cmd, const Vector<String>& arg, String& out, bool convertcharset)
|
|
{
|
|
LocalProcess p;
|
|
p.ConvertCharset(convertcharset);
|
|
if(!p.Start(cmd, arg))
|
|
return -1;
|
|
return p.Finish(out);
|
|
}
|
|
|
|
String Sys(const char *cmd, const Vector<String>& arg, bool convertcharset)
|
|
{
|
|
String r;
|
|
return Sys(cmd, arg, r, convertcharset) ? String::GetVoid() : r;
|
|
}
|
|
|
|
}
|