mirror of
https://github.com/Garux/netradiant-custom.git
synced 2026-09-29 00:00:03 +02:00
Vorschreibung
c100cc2ccb
In the case of using q3map2 with 'build monitoring', the output of q3map2 was being written twice, once for the logs received through the 'watchbsp' net connection and once as the fork/subprocess that actually runs q3map2 was using the same stdout file descriptor as netradiant-custom itself. In order to prevent this, we redirect stdout/stderr to /dev/null in case we use q3map2 with build monitoring for the subprocess and rely on the received logs, which also get written to netradiant-custom's QT console.
157 lines
3.5 KiB
C++
157 lines
3.5 KiB
C++
/*
|
|
Copyright (C) 1999-2006 Id Software, Inc. and contributors.
|
|
For a list of contributors, see the accompanying CONTRIBUTORS file.
|
|
|
|
This file is part of GtkRadiant.
|
|
|
|
GtkRadiant is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
GtkRadiant is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GtkRadiant; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
//
|
|
// start of shared cmdlib stuff
|
|
//
|
|
|
|
#include "commandlib.h"
|
|
|
|
#include <cstring>
|
|
#include <cstdio>
|
|
|
|
|
|
#if defined ( POSIX )
|
|
|
|
#include <cstdlib>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include <sys/types.h>
|
|
#include <sys/wait.h>
|
|
|
|
|
|
bool Q_Exec( const char *cmd, char *cmdline, const char *, bool, bool waitfor ){
|
|
char fullcmd[2048];
|
|
char *pCmd;
|
|
|
|
pid_t pid;
|
|
#ifdef _DEBUG
|
|
printf( "Q_Exec damnit\n" );
|
|
#endif
|
|
switch ( ( pid = fork() ) )
|
|
{
|
|
default:
|
|
if ( waitfor ) {
|
|
waitpid( pid, NULL, 0 );
|
|
}
|
|
break;
|
|
case -1:
|
|
return true;
|
|
break;
|
|
case 0:
|
|
// XXX : if we run q3map2 with '-connect' - redirect stdout and stderr
|
|
// to /dev/null - aka build monitoring - as it's already going to
|
|
// be written to stdout via 'radiant/console.cpp → Sys_print
|
|
if ( cmdline != NULL && ( strstr( cmdline, "q3map2" ) != NULL ) && ( strstr( cmdline, "-connect" ) != NULL ) ) {
|
|
int devNullFd = open( "/dev/null", 0 );
|
|
if ( devNullFd != -1 ) {
|
|
dup2( devNullFd, 1 );
|
|
dup2( devNullFd, 2 );
|
|
}
|
|
}
|
|
|
|
// always concat the command on linux
|
|
if ( cmd ) {
|
|
strcpy( fullcmd, cmd );
|
|
}
|
|
else{
|
|
fullcmd[0] = '\0';
|
|
}
|
|
if ( cmdline ) {
|
|
strcat( fullcmd, " " );
|
|
strcat( fullcmd, cmdline );
|
|
}
|
|
pCmd = fullcmd;
|
|
while ( *pCmd == ' ' )
|
|
pCmd++;
|
|
#ifdef _DEBUG
|
|
printf( "Running system...\n" );
|
|
printf( "Command: %s\n", pCmd );
|
|
#endif
|
|
system( pCmd );
|
|
#ifdef _DEBUG
|
|
printf( "system() returned\n" );
|
|
#endif
|
|
_exit( 0 );
|
|
break;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
#elif defined( WIN32 )
|
|
|
|
#include <windows.h>
|
|
|
|
// NOTE TTimo windows is VERY nitpicky about the syntax in CreateProcess
|
|
bool Q_Exec( const char *cmd, char *cmdline, const char *execdir, bool bCreateConsole, bool waitfor ){
|
|
PROCESS_INFORMATION ProcessInformation;
|
|
STARTUPINFO startupinfo;
|
|
DWORD dwCreationFlags;
|
|
GetStartupInfo( &startupinfo );
|
|
if ( bCreateConsole ) {
|
|
dwCreationFlags = CREATE_NEW_CONSOLE | NORMAL_PRIORITY_CLASS;
|
|
}
|
|
else{
|
|
dwCreationFlags = DETACHED_PROCESS | NORMAL_PRIORITY_CLASS;
|
|
}
|
|
const char *pCmd;
|
|
char *pCmdline;
|
|
pCmd = cmd;
|
|
if ( pCmd ) {
|
|
while ( *pCmd == ' ' )
|
|
pCmd++;
|
|
}
|
|
pCmdline = cmdline;
|
|
if ( pCmdline ) {
|
|
while ( *pCmdline == ' ' )
|
|
pCmdline++;
|
|
}
|
|
|
|
if ( CreateProcess(
|
|
pCmd,
|
|
pCmdline,
|
|
NULL,
|
|
NULL,
|
|
FALSE,
|
|
dwCreationFlags,
|
|
NULL,
|
|
execdir,
|
|
&startupinfo,
|
|
&ProcessInformation
|
|
) ) {
|
|
if ( waitfor ) {
|
|
WaitForSingleObject( ProcessInformation.hProcess, INFINITE );
|
|
}
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
#endif
|
|
|
|
#include <filesystem>
|
|
|
|
bool Q_mkdir( const char* path ){
|
|
std::error_code err;
|
|
std::filesystem::create_directories( path, err );
|
|
return !err;
|
|
}
|