+2005-09-05 Christopher Faylor <cgf@timesys.com>
+
+ * cygheap.cc (cygheap_init): Eliminate debugging #if.
+
+ * fork.cc (fork_parent): Don't issue errors if "somebody" has set the
+ PID_EXITED flag on a child. Don't close process handle if it has
+ potentially already been closed.
+ * pinfo.cc (winpids::add): Eliminate PID_ALLPIDS handling which was
+ obsoleted by previous changes.
+
+ * spawn.cc (av::fixup): Do win16 detection for .com files. Make sure
+ that buffer has been unmapped in all cases.
+
2005-09-05 Corinna Vinschen <corinna@vinschen.de>
* thread.h (pthread_mutex::get_pthread_self): Remove.
pthread::atforkprepare ();
- int c_flags = GetPriorityClass (hMainProc) /*|
- CREATE_NEW_PROCESS_GROUP*/;
+ int c_flags = GetPriorityClass (hMainProc);
STARTUPINFO si = {0, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL};
/* If we don't have a console, then don't create a console for the
/* Remove impersonation */
cygheap->user.deimpersonate ();
- syscall_printf ("CreateProcess (%s, %s, 0, 0, 1, %x, 0, 0, %p, %p)",
+ syscall_printf ("CreateProcess (%s, %s, 0, 0, 1, %p, 0, 0, %p, %p)",
myself->progname, myself->progname, c_flags, &si, &pi);
bool locked = __malloc_lock ();
rc = CreateProcess (myself->progname, /* image to run */
/* Wait for subproc to initialize itself. */
if (!ch.sync (child->pid, pi.hProcess, FORK_WAIT_TIMEOUT))
{
- system_printf ("child %d died waiting for longjmp before initialization", child_pid);
+ if (NOTSTATE (child, PID_EXITED))
+ system_printf ("child %d died waiting for longjmp before initialization", child_pid);
goto cleanup;
}
goto cleanup;
else if (!ch.sync (child->pid, pi.hProcess, FORK_WAIT_TIMEOUT))
{
- system_printf ("child %d died waiting for dll loading", child_pid);
+ if (NOTSTATE (child, PID_EXITED))
+ system_printf ("child %d died waiting for dll loading", child_pid);
goto cleanup;
}
__malloc_unlock ();
/* Remember to de-allocate the fd table. */
- if (pi.hProcess)
+ if (pi.hProcess && !child.hProcess)
ForceCloseHandle1 (pi.hProcess, childhProc);
if (pi.hThread)
ForceCloseHandle (pi.hThread);
pinfolist = (pinfo *) realloc (pinfolist, size_pinfolist (npidlist + 1));
}
- pinfolist[nelem].init (cygpid, PID_NOREDIR | (winpid ? PID_ALLPIDS : 0)
- | pinfo_access, NULL);
+ pinfolist[nelem].init (cygpid, PID_NOREDIR | pinfo_access, NULL);
if (winpid)
goto out;
{
if (!pinfo_access)
return;
- pinfolist[nelem].init (cygpid, PID_NOREDIR | (winpid ? PID_ALLPIDS : 0), NULL);
+ pinfolist[nelem].init (cygpid, PID_NOREDIR, NULL);
if (!pinfolist[nelem])
return;
}
{
/* If the file name ends in either .exe, .com, .bat, or .cmd we assume
that it is NOT a script file */
- while (*ext == '\0' || chtype == PROC_SPAWN || (wincap.detect_win16_exe () && strcasematch (ext, ".exe")))
+ while (*ext == '\0' || chtype == PROC_SPAWN
+ || (wincap.detect_win16_exe () && (strcasematch (ext, ".exe")
+ || strcasematch (ext, ".com"))))
{
HANDLE h = CreateFile (real_path, GENERIC_READ,
FILE_SHARE_READ | FILE_SHARE_WRITE,
if (real_path.has_acls () && allow_ntsec
&& check_file_access (real_path, X_OK))
{
+ UnmapViewOfFile (buf);
debug_printf ("... but not executable");
break;
}