anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 14:30:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Detect if file is actually a directory in support/lyxsum.cpp, fix bug 3622

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18449 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng 2007-05-22 00:27:56 +00:00
parent 0c64c056a5
commit 2d90c65500
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/support/lyxsum.cpp
View File

@ -17,12 +17,14 @@
#include "support/FileName.h"
#include <boost/crc.hpp>
#include <boost/filesystem/operations.hpp>
#include <algorithm>
using std::endl;
using std::string;
namespace fs = boost::filesystem;
// OK, this is ugly, but it is the only workaround I found to compile
// with gcc (any version) on a system which uses a non-GNU toolchain.
@ -126,8 +128,13 @@ unsigned long sum(FileName const & file)
LYXERR(Debug::FILES) << "lyx::sum() using istreambuf_iterator (fast)"
<< endl;
ifstream ifs(file.toFilesystemEncoding().c_str());
if (!ifs) return 0;
string filename = file.toFilesystemEncoding();
// a directory may be passed here so we need to test it. (bug 3622)
if (fs::is_directory(filename))
return 0;
ifstream ifs(filename.c_str());
if (!ifs)
return 0;
istreambuf_iterator<char> beg(ifs);
istreambuf_iterator<char> end;
@ -145,8 +152,13 @@ unsigned long sum(FileName const & file)
<< "lyx::sum() using istream_iterator (slow as a snail)"
<< endl;
ifstream ifs(file.toFilesystemEncoding().c_str());
if (!ifs) return 0;
string filename = file.toFilesystemEncoding();
// a directory may be passed here so we need to test it. (bug 3622)
if (fs::is_directory(filename))
return 0;
ifstream ifs(filename.c_str());
if (!ifs)
return 0;
ifs.unsetf(ios::skipws);
istream_iterator<char> beg(ifs);