neox
/
xml-copy-editor-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed crashes on startup

This commit is contained in:
Zane U. Ji 2012-08-09 19:23:00 +08:00
parent fd281aca5b
commit e60ce08f9b
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/xmlcopyeditor.cpp
View File

@ -1108,31 +1108,33 @@ void MyFrame::handleCommandLine()
wordFlag = styleFlag = false; wordFlag = styleFlag = false;
wxChar c; wxChar c;
int m_argc = wxTheApp->argc; int argc = wxTheApp->argc;
wxChar **m_argv = wxTheApp->argv; wxChar **argv = wxTheApp->argv;
while ( ( --m_argc > 0 && ( *++m_argv ) [0] == L'-' ) != 0 ) while ( ( --argc > 0 && ( *++argv ) [0] == L'-' ) != 0 )
{ {
wxString wideVersion ( ABOUT_VERSION ); wxString wideVersion ( ABOUT_VERSION );
std::string version = ( const char * ) wideVersion.mb_str ( wxConvUTF8 ); std::string version = ( const char * ) wideVersion.mb_str ( wxConvUTF8 );
while ( ( c = *++m_argv[0] ) != 0 ) const wxChar *s = argv[0];
while ( ( c = *++s ) != 0 )
{ {
switch ( c ) switch ( c )
{ {
case L'w': case 'w':
wordFlag = true; wordFlag = true;
break; break;
case L's': case 's':
styleFlag = true; styleFlag = true;
break; break;
case L'-': case '-':
if ( *++m_argv[0] == L'v' ) if ( *++s == 'v' )
{ {
std::cout << version.c_str() << std::endl; std::cout << version.c_str() << std::endl;
} }
else else
{ {
std::cout << "Usage: xmlcopyeditor [--version --help -ws] [<file>] [<file2>]" << std::endl << "Options -w (import Microsoft Word document) and -s (open Spelling and style check) are provided for integration with Microsoft Office and only available on Windows" << std::endl; std::cout << "Usage: xmlcopyeditor [--version --help -ws] [<file>] [<file2>]" << std::endl
<< "Options -w (import Microsoft Word document) and -s (open Spelling and style check) are provided for integration with Microsoft Office and only available on Windows" << std::endl;
} }
exit ( 0 ); exit ( 0 );
default: default:
@ -1143,7 +1145,7 @@ void MyFrame::handleCommandLine()
} }
} }
if ( ! ( *m_argv ) ) if ( argc <= 0 )
{ {
messagePane ( _ ( "Command line processing incomplete: no file specified" ), messagePane ( _ ( "Command line processing incomplete: no file specified" ),
CONST_STOP ); CONST_STOP );
@ -1157,9 +1159,9 @@ void MyFrame::handleCommandLine()
if ( !styleFlag && !wordFlag ) if ( !styleFlag && !wordFlag )
#endif #endif
{ {
for ( ; *m_argv; ++m_argv ) for ( ; argc > 0; --argc, ++argv )
{ {
fileName = wxString ( *m_argv, wxConvLocal, wcslen ( *m_argv ) ); fileName = wxString ( *argv, wxConvLocal );
fileName = PathResolver::run ( fileName ); fileName = PathResolver::run ( fileName );
if ( isOpen ( fileName ) ) if ( isOpen ( fileName ) )
continue; continue;
@ -1170,25 +1172,25 @@ void MyFrame::handleCommandLine()
} }
// options only available on Windows // options only available on Windows
fileName = wxString ( *m_argv, wxConvLocal, wcslen ( *m_argv ) ); fileName = wxString ( *argv, wxConvLocal );
// fetch as many parameters as possible // fetch as many parameters as possible
for ( ;; ) for ( ;; )
{ {
++m_argv; if ( --argc <= 0 )
if ( ! ( *m_argv ) )
break; break;
ruleSetPreset = wxString ( *m_argv, wxConvLocal, wcslen ( *m_argv ) ); ++argv;
ruleSetPreset = wxString ( *argv, wxConvLocal );
++m_argv; if ( --argc <= 0 )
if ( ! ( *m_argv ) )
break; break;
filterPreset = wxString ( *m_argv, wxConvLocal, wcslen ( *m_argv ) ); ++argv;
filterPreset = wxString ( *argv, wxConvLocal );
++m_argv; if ( --argc <= 0 )
if ( ! ( *m_argv ) )
break; break;
applicationDir = wxString ( *m_argv, wxConvLocal, wcslen ( *m_argv ) ); ++argv;
applicationDir = wxString ( *argv, wxConvLocal );
updatePaths(); updatePaths();
break; break;

3
src/xsllocator.cpp
View File

@ -59,12 +59,11 @@ void XMLCALL XslLocator::processingInstructionHandler (
{ {
if ( *iterator == '"' || *iterator == '\'' ) if ( *iterator == '"' || *iterator == '\'' )
{ {
*iterator = '\0';
break; break;
} }
} }
d->xslLocation = value; d->xslLocation = std::string ( value, iterator - value );
XML_StopParser ( d->parser, false ); XML_StopParser ( d->parser, false );
} }