kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* win32/win32.c (CreateChild): search executable file if no program

Browse source 
name given. (backported from CVS HEAD)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7410 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2004-11-29 05:00:29 +00:00
parent 9247eb133b
commit c56fa330b2
2 changed files with 46 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Nov 29 13:57:38 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (CreateChild): search executable file if no program
name given. (backported from CVS HEAD)
Mon Nov 29 13:37:54 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (fptr_finalize): must not use FILE after fclose().

48
win32/win32.c
View file

@ -852,15 +852,17 @@ char **argv;
}
static struct ChildRecord *
CreateChild(char *cmd, char *prog, SECURITY_ATTRIBUTES *psa, HANDLE hInput, HANDLE hOutput, HANDLE hError)
CreateChild(const char *cmd, const char *prog, SECURITY_ATTRIBUTES *psa,
HANDLE hInput, HANDLE hOutput, HANDLE hError)
{
BOOL fRet;
DWORD dwCreationFlags;
STARTUPINFO aStartupInfo;
PROCESS_INFORMATION aProcessInformation;
SECURITY_ATTRIBUTES sa;
char *shell;
const char *shell;
struct ChildRecord *child;
char *p = NULL;
if (!cmd && !prog) {
errno = EFAULT;
@ -908,7 +910,9 @@ CreateChild(char *cmd, char *prog, SECURITY_ATTRIBUTES *psa, HANDLE hInput, HAND
dwCreationFlags = (NORMAL_PRIORITY_CLASS);
if (prog) {
shell = prog;
if (!(p = dln_find_exe(prog, NULL))) {
shell = prog;
}
}
else {
int redir = -1;
@ -938,15 +942,45 @@ CreateChild(char *cmd, char *prog, SECURITY_ATTRIBUTES *psa, HANDLE hInput, HAND
cmd = tmp;
}
else {
char *tmp = ALLOCA_N(char, len + 1);
sprintf(tmp, "%.*s", len, cmd);
cmd = tmp;
shell = NULL;
prog = cmd;
for (;;) {
if (!*prog) {
p = dln_find_exe(cmd, NULL);
break;
}
if (strchr(".:*?\"/\\", *prog)) {
if (cmd[len]) {
char *tmp = ALLOCA_N(char, len + 1);
memcpy(tmp, cmd, len);
tmp[len] = 0;
cmd = tmp;
}
break;
}
if (ISSPACE(*prog) || strchr("<>|", *prog)) {
len = prog - cmd;
p = ALLOCA_N(char, len + 1);
memcpy(p, cmd, len);
p[len] = 0;
p = dln_find_exe(p, NULL);
break;
}
prog++;
}
}
}
if (p) {
shell = p;
while (*p) {
if ((unsigned char)*p == '/')
*p = '\\';
p = CharNext(p);
}
}
RUBY_CRITICAL({
fRet = CreateProcess(shell, cmd, psa, psa,
fRet = CreateProcess(shell, (char *)cmd, psa, psa,
psa->bInheritHandle, dwCreationFlags, NULL, NULL,
&aStartupInfo, &aProcessInformation);
errno = map_errno(GetLastError());