* uinfo.cc (cygheap_user::ontherange): Use env_name for NetUserGetInfo.
(cygheap_user::env_logsrv): Verify env_domain is valid. * environ.cc: Include child_info.h and keep spenvs[] sorted. (environ_init): Check child_proc_info instead of myself->ppid_handle.
This commit is contained in:
@@ -1588,7 +1588,7 @@ __pthread_join (pthread_t *thread, void **return_val)
|
||||
if ( joiner == *thread)
|
||||
{
|
||||
if (return_val)
|
||||
*return_val = NULL;
|
||||
*return_val = NULL;
|
||||
return EDEADLK;
|
||||
}
|
||||
|
||||
@@ -1597,7 +1597,7 @@ __pthread_join (pthread_t *thread, void **return_val)
|
||||
if((*thread)->attr.joinable == PTHREAD_CREATE_DETACHED)
|
||||
{
|
||||
if (return_val)
|
||||
*return_val = NULL;
|
||||
*return_val = NULL;
|
||||
(*thread)->mutex.UnLock ();
|
||||
return EINVAL;
|
||||
}
|
||||
@@ -1608,7 +1608,7 @@ __pthread_join (pthread_t *thread, void **return_val)
|
||||
(*thread)->mutex.UnLock ();
|
||||
WaitForSingleObject ((*thread)->win32_obj_id, INFINITE);
|
||||
if (return_val)
|
||||
*return_val = (*thread)->return_ptr;
|
||||
*return_val = (*thread)->return_ptr;
|
||||
// cleanup
|
||||
delete (*thread);
|
||||
} /*End if */
|
||||
|
Reference in New Issue
Block a user