JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert previous erroneous checkin.

Browse Source
This commit is contained in:
Christopher Faylor
2000-08-23 14:56:28 +00:00
parent c19e7ba723
commit e1cf4ae80c
6 changed files with 12 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
winsup/cygwin/pinfo.cc
View File

@@ -30,17 +30,17 @@ static pinfo NO_COPY myself_identity ((_pinfo *)&pinfo_dummy);
This is done once when the dll is first loaded. */
void __stdcall
set_myself (pid_t pid, HANDLE h)
set_myself (pid_t pid)
{
DWORD winpid = GetCurrentProcessId ();
if (pid == 1)
pid = cygwin_pid (winpid);
myself.init (pid, 1, h);
myself.init (pid, 1);
myself->dwProcessId = winpid;
myself->process_state |= PID_IN_USE;
myself->start_time = time (NULL); /* Register our starting time. */
pid_t myself_cyg_pid = cygwin_pid (myself->dwProcessId);
if (pid != myself_cyg_pid && parent_alive)
if (pid != myself_cyg_pid)
myself_identity.init (myself_cyg_pid, PID_EXECED);
char buf[30];
@@ -95,7 +95,7 @@ pinfo_init (LPBYTE info)
{
/* Invent our own pid. */
set_myself (1, NULL);
set_myself (1);
myself->ppid = 1;
myself->pgid = myself->sid = myself->pid;
myself->ctty = -1;
@@ -197,7 +197,7 @@ _pinfo::record_death ()
}
void
pinfo::init (pid_t n, DWORD create, HANDLE in_h)
pinfo::init (pid_t n, DWORD create)
{
if (n == myself->pid)
{
@@ -217,12 +217,7 @@ pinfo::init (pid_t n, DWORD create, HANDLE in_h)
else
mapsize = sizeof (_pinfo);
if (in_h)
{
h = in_h;
created = 0;
}
else if (!create)
if (!create)
{
/* CGF FIXME -- deal with inheritance after an exec */
h = OpenFileMappingA (FILE_MAP_READ | FILE_MAP_WRITE, FALSE, mapname);
@@ -230,7 +225,7 @@ pinfo::init (pid_t n, DWORD create, HANDLE in_h)
}
else
{
h = CreateFileMapping ((HANDLE) 0xffffffff, &sec_all_nih,
h = CreateFileMapping ((HANDLE) 0xffffffff, &sec_none_nih,
PAGE_READWRITE, 0, mapsize, mapname);
created = h && GetLastError () != ERROR_ALREADY_EXISTS;
}
@@ -243,13 +238,11 @@ pinfo::init (pid_t n, DWORD create, HANDLE in_h)
return;
}
ProtectHandle1 (h, pinfo_shared_handle);
child = (_pinfo *) MapViewOfFile (h, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0);
if (child->process_state & PID_EXECED)
{
pid_t realpid = child->pid;
debug_printf ("execed process windows pid %d, cygwin pid %d", n, realpid);
release ();
if (realpid == n)
api_fatal ("retrieval of execed process info for pid %d failed due to recursion.", n);