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

pcad2kicadpcb: check for file format

This commit is contained in:
Alexander Lunev 2013-06-25 11:05:51 -05:00 committed by Dick Hollenbeck
parent e513380a85
commit b66d6e2d8c
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pcbnew/pcad2kicadpcb_plugin/s_expr_loader.cpp
View File

@ -34,9 +34,11 @@
namespace PCAD2KICAD { namespace PCAD2KICAD {
static KEYWORD empty_keywords[1] = {}; static KEYWORD empty_keywords[1] = {};
static const char ACCEL_ASCII_KEYWORD[] = "ACCEL_ASCII";
void LoadInputFile( wxString aFileName, wxXmlDocument* aXmlDoc ) void LoadInputFile( wxString aFileName, wxXmlDocument* aXmlDoc )
{ {
char line[sizeof( ACCEL_ASCII_KEYWORD )];
int tok; int tok;
XNODE* iNode = NULL, *cNode = NULL; XNODE* iNode = NULL, *cNode = NULL;
wxString str, propValue, content; wxString str, propValue, content;
@ -47,6 +49,14 @@ void LoadInputFile( wxString aFileName, wxXmlDocument* aXmlDoc )
if( !fp ) if( !fp )
THROW_IO_ERROR( wxT( "Unable to open file: " ) + aFileName ); THROW_IO_ERROR( wxT( "Unable to open file: " ) + aFileName );
// check file format
if( !fgets( line, sizeof( line ), fp )
|| strcmp( line, ACCEL_ASCII_KEYWORD ) )
THROW_IO_ERROR( "Unknown file type" );
// rewind the file
fseek( fp, 0, SEEK_SET );
// lexer now owns fp, will close on exception or return // lexer now owns fp, will close on exception or return
DSNLEXER lexer( empty_keywords, 0, fp, aFileName ); DSNLEXER lexer( empty_keywords, 0, fp, aFileName );