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

Fix:Step export not working when special characters (non UTF7) in filename or path 

Fixes: lp:1785191
https://bugs.launchpad.net/kicad/+bug/1785191
This commit is contained in:
jean-pierre charras 2018-09-18 10:23:08 +02:00
parent 9cafe65e84
commit 7372acdaa5
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
utils/kicad2step/sexpr/sexpr_parser.cpp
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2016 Mark Roszko <mark.roszko@gmail.com> * Copyright (C) 2016 Mark Roszko <mark.roszko@gmail.com>
* Copyright (C) 2017 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2018 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -25,6 +25,8 @@
#include <fstream> #include <fstream>
#include <streambuf> #include <streambuf>
#include <wx/file.h>
#include <macros.h>
namespace SEXPR namespace SEXPR
{ {
@ -54,22 +56,22 @@ namespace SEXPR
std::string PARSER::GetFileContents( const std::string &aFileName ) std::string PARSER::GetFileContents( const std::string &aFileName )
{ {
std::ifstream file( aFileName.c_str(), std::ios::binary );
std::string str; std::string str;
// Faster than automatic allocation // the filename is not always a UTF7 string, so do not use ifstream
file.seekg( 0, std::ios::end ); // that do not work with unicode chars.
auto length = file.tellg(); wxString fname( FROM_UTF8( aFileName.c_str() ) );
wxFile file( fname );
size_t length = file.Length();
if( length < 0 ) if( length <= 0 )
{ {
throw PARSE_EXCEPTION( "Error occurred attempting to read in file" ); throw PARSE_EXCEPTION( "Error occurred attempting to read in file or empty file" );
} }
str.resize( static_cast<size_t>( length ) );
file.seekg( 0, std::ios::beg );
file.read( &str[0], str.length() ); str.resize( length );
file.Read( &str[0], str.length() );
return str; return str;
} }