Martchus
/
passwordfile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use workaround for GCC Bug 66145

This commit is contained in:
Martchus 2016-06-14 22:56:41 +02:00
parent c92fdf2256
commit 5ffe22a3a9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
io/passwordfile.cpp
View File

@ -3,6 +3,8 @@
#include "./parsingexception.h" #include "./parsingexception.h"
#include "./entry.h" #include "./entry.h"
#include <c++utilities/io/catchiofailure.h>
#include <openssl/conf.h> #include <openssl/conf.h>
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/evp.h> #include <openssl/evp.h>
@ -81,12 +83,12 @@ void PasswordFile::open(bool readOnly)
{ {
close(); close();
if(m_path.empty()) { if(m_path.empty()) {
throw ios_base::failure("Unable to open file because path is emtpy."); throwIoFailure("Unable to open file because path is emtpy.");
} }
m_file.open(m_path, readOnly ? ios_base::in | ios_base::binary : ios_base::in | ios_base::out | ios_base::binary); m_file.open(m_path, readOnly ? ios_base::in | ios_base::binary : ios_base::in | ios_base::out | ios_base::binary);
m_file.seekg(0, ios_base::end); m_file.seekg(0, ios_base::end);
if(m_file.tellg() == 0) { if(m_file.tellg() == 0) {
throw ios_base::failure("File is empty."); throwIoFailure("File is empty.");
} else { } else {
m_file.seekg(0); m_file.seekg(0);
} }
@ -110,7 +112,7 @@ void PasswordFile::create()
{ {
close(); close();
if(m_path.empty()) { if(m_path.empty()) {
throw ios_base::failure("Unable to create file because path is empty."); throwIoFailure("Unable to create file because path is empty.");
} }
m_file.open(m_path, fstream::out | fstream::trunc | fstream::binary); m_file.open(m_path, fstream::out | fstream::trunc | fstream::binary);
} }