haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use individual parameter version of wxExecute. 

Fixes https://gitlab.com/kicad/code/kicad/issues/9236
This commit is contained in:
Jeff Young 2021-09-26 15:02:14 +01:00
parent b799d563e5
commit 5bf042fcc1
8 changed files with 100 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/common.cpp
View File

@ -43,12 +43,6 @@
#endif
int ProcessExecute( const wxString& aCommandLine, int aFlags, wxProcess *callback )
{
return (int) wxExecute( aCommandLine, aFlags, callback );
}
enum Bracket
{
Bracket_None,

2
common/eda_doc.cpp
View File

@ -185,7 +185,7 @@ bool GetAssociatedDocument( wxWindow* aParent, const wxString& aDocName, PROJECT
delete filetype;
if( success )
success = ProcessExecute( command );
success = wxExecute( command );
}
if( !success )

184
common/gestfich.cpp
View File

@ -112,72 +112,56 @@ wxString FindKicadFile( const wxString& shortname )
}
int ExecuteFile( const wxString& ExecFile, const wxString& param, wxProcess *callback )
int ExecuteFile( const wxString& aEditorName, const wxString& aFileName, wxProcess *aCallback )
{
wxString fullFileName;
wxString fullParams;
wxString fullEditorName;
wxString param;
#ifdef __UNIX__
int space = ExecFile.Find( ' ' );
int space = aEditorName.Find( ' ' );
if( space > 0 && !ExecFile.Contains( "\"" ) && !ExecFile.Contains( "\'" ) )
if( space > 0 && !aEditorName.Contains( "\"" ) && !aEditorName.Contains( "\'" ) )
{
fullFileName = FindKicadFile( ExecFile.Mid( 0, space ) );
fullParams = ExecFile.Mid( space + 1 ) + wxS( " " ) + param;
fullEditorName = FindKicadFile( aEditorName.Mid( 0, space ) );
param = aEditorName.Mid( space + 1 );
}
else
#endif
{
fullFileName = FindKicadFile( ExecFile );
fullParams = param;
fullEditorName = FindKicadFile( aEditorName );
}
if( wxFileExists( fullFileName ) )
if( wxFileExists( fullEditorName ) )
{
if( !fullParams.IsEmpty() )
fullFileName += wxS( " " ) + fullParams;
int i = 0;
const char* args[4];
return ProcessExecute( fullFileName, wxEXEC_ASYNC, callback );
}
#ifdef __WXMAC__
else
{
QuoteString( fullFileName );
args[i++] = fullEditorName.c_str();
if( !param.IsEmpty() )
fullFileName += wxT( " " ) + param;
args[i++] = param.c_str();
return ProcessExecute( wxT( "/usr/bin/open -a " ) + fullFileName, wxEXEC_ASYNC, callback );
args[i++] = aFileName.c_str();
args[i] = nullptr;
return wxExecute( args, wxEXEC_ASYNC, aCallback );
}
#else
else
{
wxString msg;
msg.Printf( _( "Command '%s' could not be found." ), fullFileName );
DisplayError( nullptr, msg, 20 );
return -1;
}
#endif
wxString msg;
msg.Printf( _( "Command '%s' could not be found." ), fullEditorName );
DisplayError( nullptr, msg, 20 );
return -1;
}
bool OpenPDF( const wxString& file )
{
wxString command;
wxString msg;
wxString filename = file;
Pgm().ReadPdfBrowserInfos();
if( !Pgm().UseSystemPdfBrowser() ) // Run the preferred PDF Browser
{
#ifdef __WXMSW__
// Windows requires double quotes around the filename to handle spaces
command = Pgm().GetPdfBrowserName() + wxT( " \"" ) + filename + wxT( "\"" );
#else
command = Pgm().GetPdfBrowserName() + wxT( " '" ) + filename + wxT( "'" );
#endif
}
else
if( Pgm().UseSystemPdfBrowser() )
{
// wxLaunchDefaultApplication on Unix systems is run as an external process passing
// the filename to the appropriate application as a command argument.
@ -187,44 +171,44 @@ bool OpenPDF( const wxString& file )
// See https://github.com/wxWidgets/wxWidgets/blob/master/src/unix/utilsx11.cpp#L2654
#ifdef __WXGTK__
#if !wxCHECK_VERSION( 3, 1, 0 )
// Quote in case there are spaces in the path.
// Not needed on 3.1.4, but needed in 3.0 versions
// Moreover, on Linux, on 3.1.4 wx version, adding quotes breaks wxLaunchDefaultApplication
QuoteString( filename );
// Quote in case there are spaces in the path.
// Not needed on 3.1.4, but needed in 3.0 versions
// Moreover, on Linux, 3.1.4 wx version, adding quotes breaks wxLaunchDefaultApplication
QuoteString( filename );
#endif
#endif
if( wxLaunchDefaultApplication( filename ) )
return true;
#ifdef __WXMAC__
command = wxT( "/usr/bin/open -a '" ) + file + wxT( "'" );
#endif
// If launching the system default PDF viewer fails, fall through with empty command
// string so the error message is displayed.
}
if( !command.IsEmpty() )
{
if( ProcessExecute( command ) != -1 )
if( !wxLaunchDefaultApplication( filename ) )
{
return true;
}
else
{
wxString msg;
msg.Printf( _( "Problem while running the PDF viewer.\nCommand is '%s'." ), command );
msg.Printf( _( "Unable to find a PDF viewer for '%s'." ), filename );
DisplayError( nullptr, msg );
return false;
}
}
else
{
wxString msg;
msg.Printf( _( "Unable to find a PDF viewer for '%s'." ), file );
DisplayError( nullptr, msg );
const char* args[3];
#if 0 // Is this still needed with the separate arguments version of wxExecute?
#ifdef __WXMSW__
// Windows requires double quotes around the filename to handle spaces
filename = "\"" + filename + "\"";
#endif
#endif
args[0] = Pgm().GetPdfBrowserName().c_str();
args[1] = filename.c_str();
args[2] = nullptr;
if( wxExecute( args ) == -1 )
{
msg.Printf( _( "Problem while running the PDF viewer '%s'." ), args[0] );
DisplayError( nullptr, msg );
return false;
}
}
return false;
return true;
}
@ -243,35 +227,36 @@ void OpenFile( const wxString& file )
delete filetype;
if( !command.IsEmpty() )
ProcessExecute( command );
wxExecute( command );
}
bool doPrintFile( const wxString& file, bool aDryRun )
{
wxFileName fileName( file );
wxString ext = fileName.GetExt();
wxString ext = wxFileName( file ).GetExt();
wxString application;
#ifdef __WXMSW__
wxFileType* filetype = wxTheMimeTypesManager->GetFileTypeFromExtension( ext );
if( !filetype )
return false;
wxString printCommand;
wxString openCommand;
wxString application;
wxFileType::MessageParameters params( file );
filetype->GetPrintCommand( &printCommand, params );
filetype->GetOpenCommand( &openCommand, params );
delete filetype;
if( !printCommand.IsEmpty() )
if( filetype )
{
if( !aDryRun )
ProcessExecute( printCommand );
wxString printCommand;
wxFileType::MessageParameters params( file );
return true;
filetype->GetPrintCommand( &printCommand, params );
delete filetype;
if( !printCommand.IsEmpty() )
{
if( !aDryRun )
wxExecute( printCommand );
return true;
}
}
#endif
#ifdef __WXMAC__
if( ext == "ps" || ext == "pdf" )
@ -283,16 +268,17 @@ bool doPrintFile( const wxString& file, bool aDryRun )
if( !application.IsEmpty() )
{
printCommand.Printf( "osascript -e 'tell application \"%s\"' "
"-e ' set srcFileRef to (open POSIX file \"%s\")' "
"-e ' activate' "
"-e ' print srcFileRef print dialog true' "
"-e 'end tell' ",
application,
file );
wxString ascript;
ascript.Printf( "osascript -e 'tell application \"%s\"' "
"-e ' set srcFileRef to (open POSIX file \"%s\")' "
"-e ' activate' "
"-e ' print srcFileRef print dialog true' "
"-e 'end tell' ",
application,
file );
if( !aDryRun )
ProcessExecute( printCommand );
wxExecute( ascript );
return true;
}
@ -303,10 +289,14 @@ bool doPrintFile( const wxString& file, bool aDryRun )
|| ext == "csv"
|| ext == "txt" || ext == "rpt" || ext == "pos" || ext == "cmp" || ext == "net" )
{
printCommand.Printf( "lp \"%s\"", file );
if( !aDryRun )
ProcessExecute( printCommand );
{
char* params[3];
params[0] = "lp";
params[1] = file.c_str();
params[2] = nullptr;
wxExecute( params );
return true;
}

7
cvpcb/dialogs/dialog_config_equfiles.cpp
View File

@ -107,16 +107,11 @@ void DIALOG_CONFIG_EQUFILES::OnEditEquFile( wxCommandEvent& event )
wxArrayInt selections;
m_ListEquiv->GetSelections( selections );
wxString fullFileNames, tmp;
for( unsigned ii = 0; ii < selections.GetCount(); ii++ )
{
tmp = m_ListEquiv->GetString( selections[ii] );
fullFileNames << wxT( " \"" ) << wxExpandEnvVars( tmp ) << wxT( "\"" );
ExecuteFile( editorname, wxExpandEnvVars( m_ListEquiv->GetString( selections[ii] ) ) );
m_ListChanged = true;
}
ExecuteFile( editorname, fullFileNames );
}

2
eeschema/netlist_exporters/netlist_generator.cpp
View File

@ -144,7 +144,7 @@ bool SCH_EDIT_FRAME::WriteNetListFile( int aFormat, const wxString& aFullFileNam
}
else
{
ProcessExecute( commandLine, m_exec_flags );
wxExecute( commandLine, m_exec_flags );
}
DefaultExecFlags(); // Reset flags to default after executing

12
include/common.h
View File

@ -43,18 +43,6 @@ class PROJECT;
class SEARCH_STACK;
class REPORTER;
/**
* Run a command in a child process.
*
* @param aCommandLine The process and any arguments to it all in a single string.
* @param aFlags The same args as allowed for wxExecute()
* @param callback wxProcess implementing OnTerminate to be run when the
child process finishes
* @return pid of process, 0 in case of error (like return values of wxExecute()).
*/
int ProcessExecute( const wxString& aCommandLine, int aFlags = wxEXEC_ASYNC,
wxProcess *callback = nullptr );
/**
* Return the help file's full path.
*

6
include/gestfich.h
View File

@ -59,10 +59,10 @@ bool CanPrintFile( const wxString& file );
void KiCopyFile( const wxString& aSrcPath, const wxString& aDestPath, wxString& aErrors );
/**
* Call the executable file \a ExecFile with the command line parameters \a param.
* Call the executable file \a aEditorName with the parameter \a aFileName.
*/
int ExecuteFile( const wxString& ExecFile, const wxString& param = wxEmptyString,
wxProcess* callback = nullptr );
int ExecuteFile( const wxString& aEditorName, const wxString& aFileName = wxEmptyString,
wxProcess* aCallback = nullptr );
/**
* Add un " to the start and the end of string (if not already done).

19
kicad/tools/kicad_manager_control.cpp
View File

@ -742,7 +742,7 @@ private:
int KICAD_MANAGER_CONTROL::Execute( const TOOL_EVENT& aEvent )
{
wxString execFile;
wxString params;
wxString param;
if( aEvent.IsAction( &KICAD_MANAGER_ACTIONS::viewGerbers ) )
execFile = GERBVIEW_EXE;
@ -773,26 +773,21 @@ int KICAD_MANAGER_CONTROL::Execute( const TOOL_EVENT& aEvent )
return 0;
if( aEvent.Parameter<wxString*>() )
params = *aEvent.Parameter<wxString*>();
else if( ( aEvent.IsAction( &KICAD_MANAGER_ACTIONS::viewGerbers ) )
&& m_frame->IsProjectActive() )
params = m_frame->Prj().GetProjectPath();
if( !params.empty() )
QuoteString( params );
param = *aEvent.Parameter<wxString*>();
else if( aEvent.IsAction( &KICAD_MANAGER_ACTIONS::viewGerbers ) && m_frame->IsProjectActive() )
param = m_frame->Prj().GetProjectPath();
TERMINATE_HANDLER* callback = new TERMINATE_HANDLER( execFile );
long pid = ExecuteFile( execFile, params, callback );
long pid = ExecuteFile( execFile, param, callback );
if( pid > 0 )
{
wxString msg = wxString::Format( _( "%s %s opened [pid=%ld]\n" ), execFile, params, pid );
wxString msg = wxString::Format( _( "%s %s opened [pid=%ld]\n" ), execFile, param, pid );
m_frame->PrintMsg( msg );
#ifdef __WXMAC__
msg.Printf( "osascript -e 'activate application \"%s\"' ", execFile );
ProcessExecute( msg );
wxExecute( wxString::Format( "osascript -e 'activate application \"%s\"' ", execFile ) );
#endif
}
else