MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-17 16:53:13 +00:00
Code Issues Releases Wiki Activity

Updated Cleanup for Linux/MacOS, still need to fix

Browse Source
This commit is contained in:
Bryan Roe
2019-06-06 18:47:41 -07:00
parent 67e10e0e33
commit 4451e12e7a
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
microstack/ILibProcessPipe.c
View File

@@ -480,8 +480,11 @@ void ILibProcessPipe_Manager_OnPreSelect(void* object, fd_set *readset, fd_set *
node = ILibLinkedList_GetNode_Head(man->ActivePipes); node = ILibLinkedList_GetNode_Head(man->ActivePipes);
while(node != NULL && (j = (ILibProcessPipe_PipeObject*)ILibLinkedList_GetDataFromNode(node)) != NULL) while(node != NULL && (j = (ILibProcessPipe_PipeObject*)ILibLinkedList_GetDataFromNode(node)) != NULL)
{
if (j->mPipe_ReadEnd != -1)
{ {
FD_SET(j->mPipe_ReadEnd, readset); FD_SET(j->mPipe_ReadEnd, readset);
}
node = ILibLinkedList_GetNextNode(node); node = ILibLinkedList_GetNextNode(node);
} }
@@ -498,7 +501,7 @@ void ILibProcessPipe_Manager_OnPostSelect(void* object, int slct, fd_set *readse
nextNode = ILibLinkedList_GetNextNode(node); nextNode = ILibLinkedList_GetNextNode(node);
if (ILibMemory_CanaryOK(j)) if (ILibMemory_CanaryOK(j))
{ {
if (FD_ISSET(j->mPipe_ReadEnd, readset) != 0) if (j->mPipe_ReadEnd != -1 && FD_ISSET(j->mPipe_ReadEnd, readset) != 0)
{ {
ILibProcessPipe_Process_ReadHandler(j); ILibProcessPipe_Process_ReadHandler(j);
} }
@@ -565,6 +568,8 @@ void ILibProcessPipe_FreePipe(ILibProcessPipe_PipeObject *pipeObject)
if (pipeObject->mPipe_Reader_ResumeEvent != NULL) { CloseHandle(pipeObject->mPipe_Reader_ResumeEvent); } if (pipeObject->mPipe_Reader_ResumeEvent != NULL) { CloseHandle(pipeObject->mPipe_Reader_ResumeEvent); }
if (pipeObject->buffer != NULL && pipeObject->usingCompletionRoutine == 0) { free(pipeObject->buffer); } if (pipeObject->buffer != NULL && pipeObject->usingCompletionRoutine == 0) { free(pipeObject->buffer); }
#else #else
if (pipeObject->mPipe_ReadEnd != -1) { close(pipeObject->mPipe_ReadEnd); }
if (pipeObject->mPipe_WriteEnd != -1 && pipeObject->mPipe_WriteEnd != pipeObject->mPipe_ReadEnd) { close(pipeObject->mPipe_WriteEnd); }
if (pipeObject->buffer != NULL) { free(pipeObject->buffer); } if (pipeObject->buffer != NULL) { free(pipeObject->buffer); }
#endif #endif
@@ -583,6 +588,7 @@ void ILibProcessPipe_FreePipe(ILibProcessPipe_PipeObject *pipeObject)
if (pipeObject->mProcess->stdOut == pipeObject) { pipeObject->mProcess->stdOut = NULL; } if (pipeObject->mProcess->stdOut == pipeObject) { pipeObject->mProcess->stdOut = NULL; }
if (pipeObject->mProcess->stdErr == pipeObject) { pipeObject->mProcess->stdErr = NULL; } if (pipeObject->mProcess->stdErr == pipeObject) { pipeObject->mProcess->stdErr = NULL; }
} }
printf("PipeFree => %p\n", (void*)pipeObject);
ILibMemory_Free(pipeObject); ILibMemory_Free(pipeObject);
} }
@@ -714,7 +720,7 @@ void ILibProcessPipe_Process_Destroy(ILibProcessPipe_Process_Object *p)
if (p->stdIn != NULL) { ILibProcessPipe_FreePipe(p->stdIn); } if (p->stdIn != NULL) { ILibProcessPipe_FreePipe(p->stdIn); }
if (p->stdOut != NULL) { ILibProcessPipe_FreePipe(p->stdOut); } if (p->stdOut != NULL) { ILibProcessPipe_FreePipe(p->stdOut); }
if (p->stdErr != NULL) { ILibProcessPipe_FreePipe(p->stdErr); } if (p->stdErr != NULL) { ILibProcessPipe_FreePipe(p->stdErr); }
free(p); ILibMemory_Free(p);
#endif #endif
} }
#ifndef WIN32 #ifndef WIN32
@@ -730,6 +736,7 @@ void ILibProcessPipe_Process_BrokenPipeSink(ILibProcessPipe_Pipe sender)
waitpid((pid_t)p->PID, &status, 0); waitpid((pid_t)p->PID, &status, 0);
p->exitHandler(p, WEXITSTATUS(status), p->userObject); p->exitHandler(p, WEXITSTATUS(status), p->userObject);
} }
ILibProcessPipe_Process_Destroy(p);
} }
} }
#endif #endif
@@ -971,12 +978,12 @@ ILibProcessPipe_Process ILibProcessPipe_Manager_SpawnProcessEx4(ILibProcessPipe_
if (spawnType != ILibProcessPipe_SpawnTypes_TERM && spawnType != ILibProcessPipe_SpawnTypes_DETACHED) if (spawnType != ILibProcessPipe_SpawnTypes_TERM && spawnType != ILibProcessPipe_SpawnTypes_DETACHED)
{ {
close(retVal->stdIn->mPipe_ReadEnd); close(retVal->stdIn->mPipe_ReadEnd); retVal->stdIn->mPipe_ReadEnd = -1;
close(retVal->stdOut->mPipe_WriteEnd); close(retVal->stdOut->mPipe_WriteEnd); retVal->stdOut->mPipe_WriteEnd = -1;
} }
if (spawnType != ILibProcessPipe_SpawnTypes_DETACHED) if (spawnType != ILibProcessPipe_SpawnTypes_DETACHED)
{ {
close(retVal->stdErr->mPipe_WriteEnd); close(retVal->stdErr->mPipe_WriteEnd); retVal->stdErr->mPipe_WriteEnd = -1;
} }
retVal->PID = pid; retVal->PID = pid;
#endif #endif