MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-22 19:23:31 +00:00
Code Issues Releases Wiki Activity

Fixed #include for FreeBSD/MacOS

Browse Source
This commit is contained in:
Bryan Roe
2020-02-05 11:04:09 -08:00
parent afe0deacb2
commit 91ec72b34d
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
microstack/ILibProcessPipe.c
View File

@@ -36,10 +36,13 @@ limitations under the License.
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#if !defined( __APPLE__) && !defined(_FREEBSD) #if !defined( __APPLE__) && !defined(_FREEBSD)
#include <pty.h> #include <pty.h>
#else
#include <util.h>
#endif #endif
#endif #endif
#define CONSOLE_SCREEN_WIDTH 80 #define CONSOLE_SCREEN_WIDTH 80
#define CONSOLE_SCREEN_HEIGHT 25 #define CONSOLE_SCREEN_HEIGHT 25
@@ -895,12 +898,8 @@ ILibProcessPipe_Process ILibProcessPipe_Manager_SpawnProcessEx4(ILibProcessPipe_
if (userToken != NULL) { CloseHandle(userToken); userToken = NULL; } if (userToken != NULL) { CloseHandle(userToken); userToken = NULL; }
#else #else
int UID = (int)(uint64_t)(ILibPtrCAST)sid; int UID = (int)(uint64_t)(ILibPtrCAST)sid;
#ifdef __APPLE__
if (spawnType == ILibProcessPipe_SpawnTypes_TERM) { spawnType = ILibProcessPipe_SpawnTypes_DEFAULT; }
#endif
if (spawnType == ILibProcessPipe_SpawnTypes_TERM) if (spawnType == ILibProcessPipe_SpawnTypes_TERM)
{ {
#ifndef __APPLE__
int pipe; int pipe;
struct winsize w; struct winsize w;
struct termios tios; struct termios tios;
@@ -958,9 +957,6 @@ ILibProcessPipe_Process ILibProcessPipe_Manager_SpawnProcessEx4(ILibProcessPipe_
retVal->stdIn->mProcess = retVal; retVal->stdIn->mProcess = retVal;
ILibProcessPipe_Pipe_SetBrokenPipeHandler(retVal->stdOut, ILibProcessPipe_Process_BrokenPipeSink); ILibProcessPipe_Pipe_SetBrokenPipeHandler(retVal->stdOut, ILibProcessPipe_Process_BrokenPipeSink);
retVal->stdOut->mProcess = retVal; retVal->stdOut->mProcess = retVal;
#else
pid = 0; // Apple LLVM is being dumb, and throws a warning if I don't do this, even tho it'll never run
#endif
} }
else else
{ {