X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FFileName.cpp;h=32a5862fdb6568bc91cd22670ce6e4b1c0780445;hb=b198a36a363bb6a084407d476942d68ef5fb5e86;hp=2a1815ec5b03a8468d3cbcd3c9db6de49994dc48;hpb=501349b4aedfaf65064a37de2144d73489435d5b;p=lyx.git diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp index 2a1815ec5b..32a5862fdb 100644 --- a/src/support/FileName.cpp +++ b/src/support/FileName.cpp @@ -13,12 +13,11 @@ #include "support/FileName.h" #include "support/FileNameList.h" -#include "support/convert.h" #include "support/debug.h" #include "support/filetools.h" #include "support/lassert.h" #include "support/lstrings.h" -#include "support/qstring_helpers.h" +#include "support/mutex.h" #include "support/os.h" #include "support/Package.h" #include "support/qstring_helpers.h" @@ -29,10 +28,13 @@ #include #include #include -#include +#include -#include -#include +#ifdef _WIN32 +#include +#endif + +#include "support/checksum.h" #include #include @@ -60,19 +62,6 @@ #include #include -#if defined(HAVE_MKSTEMP) && ! defined(HAVE_DECL_MKSTEMP) -extern "C" int mkstemp(char *); -#endif - -#if !defined(HAVE_MKSTEMP) && defined(HAVE_MKTEMP) -# ifdef HAVE_IO_H -# include -# endif -# ifdef HAVE_PROCESS_H -# include -# endif -#endif - // Three implementations of checksum(), depending on having mmap support or not. #if defined(HAVE_MMAP) && defined(HAVE_MUNMAP) #define SUM_WITH_MMAP @@ -80,15 +69,7 @@ extern "C" int mkstemp(char *); #endif // SUM_WITH_MMAP using namespace std; - -// 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. -// The problem is that gcc uses a weak symbol for a particular -// instantiation and that the system linker usually does not -// understand those weak symbols (seen on HP-UX, tru64, AIX and -// others). Thus we force an explicit instanciation of this particular -// template (JMarc) -template struct boost::detail::crc_table_t<32, 0x04C11DB7, true>; +using namespace lyx::support; namespace lyx { namespace support { @@ -103,26 +84,18 @@ struct FileName::Private { Private() {} - Private(string const & abs_filename) : fi(toqstr(abs_filename)) + explicit Private(string const & abs_filename) + : fi(toqstr(handleTildeName(abs_filename))) { name = fromqstr(fi.absoluteFilePath()); - fi.setCaching(fi.exists() ? true : false); + fi.setCaching(fi.exists()); } /// - inline void refresh() + inline void refresh() { -// There seems to be a bug in Qt >= 4.2.0, at least, that causes problems with -// QFileInfo::refresh() on *nix. So we recreate the object in that case. -// FIXME: When Trolltech fixes the bug, we will have to replace 0x999999 below -// with the actual working minimum version. -#if defined(_WIN32) || (QT_VERSION >= 0x999999) fi.refresh(); -#else - fi = QFileInfo(fi.absoluteFilePath()); -#endif } - static bool isFilesystemEqual(QString const & lhs, QString const & rhs) { @@ -130,6 +103,21 @@ struct FileName::Private Qt::CaseSensitive : Qt::CaseInsensitive) == 0; } + static + string const handleTildeName(string const & name) + { + string resname; + if ( name == "~" ) + resname = Package::get_home_dir().absFileName(); + else if ( prefixIs(name, "~/")) + resname = Package::get_home_dir().absFileName() + name.substr(1); + else if ( prefixIs(name, "~:s/")) + resname = package().system_support().absFileName() + name.substr(3); + else + resname = name; + return resname; + } + /// The absolute file name in UTF-8 encoding. std::string name; /// @@ -152,7 +140,7 @@ FileName::FileName(string const & abs_filename) : d(abs_filename.empty() ? new Private : new Private(abs_filename)) { //LYXERR(Debug::FILES, "FileName(" << abs_filename << ')'); - LASSERT(empty() || isAbsolute(d->name), /**/); + LATTEST(empty() || isAbsolute(d->name)); } @@ -193,12 +181,12 @@ bool FileName::empty() const bool FileName::isAbsolute(string const & name) { - QFileInfo fi(toqstr(name)); + QFileInfo fi(toqstr(Private::handleTildeName(name))); return fi.isAbsolute(); } -string FileName::absFilename() const +string FileName::absFileName() const { return d->name; } @@ -206,16 +194,16 @@ string FileName::absFilename() const string FileName::realPath() const { - return os::real_path(toFilesystemEncoding()); + return os::real_path(absFileName()); } void FileName::set(string const & name) { - d->fi.setFile(toqstr(name)); + d->fi.setFile(toqstr(Private::handleTildeName(name))); d->name = fromqstr(d->fi.absoluteFilePath()); //LYXERR(Debug::FILES, "FileName::set(" << name << ')'); - LASSERT(empty() || isAbsolute(d->name), /**/); + LATTEST(empty() || isAbsolute(d->name)); } @@ -227,7 +215,7 @@ void FileName::set(FileName const & rhs, string const & suffix) d->fi.setFile(QDir(rhs.d->fi.absoluteFilePath()), toqstr(suffix)); d->name = fromqstr(d->fi.absoluteFilePath()); //LYXERR(Debug::FILES, "FileName::set(" << d->name << ')'); - LASSERT(empty() || isAbsolute(d->name), /**/); + LATTEST(empty() || isAbsolute(d->name)); } @@ -238,9 +226,26 @@ void FileName::erase() } -bool FileName::copyTo(FileName const & name) const +bool FileName::copyTo(FileName const & name, bool keepsymlink) const { - LYXERR(Debug::FILES, "Copying " << name); + FileNameSet visited; + return copyTo(name, keepsymlink, visited); +} + + +bool FileName::copyTo(FileName const & name, bool keepsymlink, + FileName::FileNameSet & visited) const +{ + LYXERR(Debug::FILES, "Copying " << name << " keep symlink: " << keepsymlink); + if (keepsymlink && name.isSymLink()) { + visited.insert(*this); + FileName const target(fromqstr(name.d->fi.symLinkTarget())); + if (visited.find(target) != visited.end()) { + LYXERR(Debug::FILES, "Found circular symlink: " << target); + return false; + } + return copyTo(target, true); + } QFile::remove(name.d->fi.absoluteFilePath()); bool success = QFile::copy(d->fi.absoluteFilePath(), name.d->fi.absoluteFilePath()); if (!success) @@ -252,7 +257,9 @@ bool FileName::copyTo(FileName const & name) const bool FileName::renameTo(FileName const & name) const { + LYXERR(Debug::FILES, "Renaming " << name << " as " << *this); bool success = QFile::rename(d->fi.absoluteFilePath(), name.d->fi.absoluteFilePath()); + d->refresh(); if (!success) LYXERR0("Could not rename file " << *this << " to " << name); return success; @@ -261,10 +268,26 @@ bool FileName::renameTo(FileName const & name) const bool FileName::moveTo(FileName const & name) const { + LYXERR(Debug::FILES, "Moving " << *this << " to " << name); +#ifdef _WIN32 + // there's a locking problem on Windows sometimes, so + // we will keep trying for five seconds, in the hope + // that clears. + name.refresh(); + if (name.exists()) { + bool removed = name.removeFile(); + int tries = 1; + while (!removed && tries < 6) { + QThread::sleep(1); + removed = name.removeFile(); + tries++; + } + } +#else QFile::remove(name.d->fi.absoluteFilePath()); +#endif - bool success = QFile::rename(d->fi.absoluteFilePath(), - name.d->fi.absoluteFilePath()); + bool const success = renameTo(name); if (!success) LYXERR0("Could not move file " << *this << " to " << name); return success; @@ -279,20 +302,39 @@ bool FileName::changePermission(unsigned long int mode) const << mode << "."); return false; } +#else + // squash warning + (void) mode; #endif return true; } +bool FileName::clonePermissions(FileName const & source) +{ + QFile fin(toqstr(source.absFileName())); + QFile f(toqstr(absFileName())); + + return f.setPermissions(fin.permissions()); +} string FileName::toFilesystemEncoding() const { - // FIXME: This doesn't work on Windows for non ascii file names with Qt < 4.4. - // Provided that Windows package uses Qt4.4, this isn't a problem. + // This doesn't work on Windows for non ascii file names. QByteArray const encoded = QFile::encodeName(d->fi.absoluteFilePath()); return string(encoded.begin(), encoded.end()); } +string FileName::toSafeFilesystemEncoding(os::file_access how) const +{ + // This will work on Windows for non ascii file names. + QString const safe_path = + toqstr(os::safe_internal_path(absFileName(), how)); + QByteArray const encoded = QFile::encodeName(safe_path); + return string(encoded.begin(), encoded.end()); +} + + FileName FileName::fromFilesystemEncoding(string const & name) { QByteArray const encoded(name.c_str(), name.length()); @@ -312,6 +354,9 @@ bool FileName::isSymLink() const } +//QFileInfo caching info might fool this test if file was changed meanwhile. +//refresh() helps, but we don't want to put it blindly here, because it might +//trigger slowdown on networked file systems. bool FileName::isFileEmpty() const { LASSERT(!empty(), return true); @@ -373,6 +418,19 @@ FileName FileName::onlyPath() const } +FileName FileName::parentPath() const +{ + FileName path; + // return empty path for parent of root dir + // parent of empty path is empty too + if (empty() || d->fi.isRoot()) + return path; + path.d->fi.setFile(d->fi.path()); + path.d->name = fromqstr(path.d->fi.absoluteFilePath()); + return path; +} + + bool FileName::isReadableFile() const { return !empty() && d->fi.isFile() && d->fi.isReadable(); @@ -434,34 +492,6 @@ FileNameList FileName::dirList(string const & ext) const } -static string createTempFile(QString const & mask) -{ - QTemporaryFile qt_tmp(mask); - if (qt_tmp.open()) { - string const temp_file = fromqstr(qt_tmp.fileName()); - LYXERR(Debug::FILES, "Temporary file `" << temp_file << "' created."); - return temp_file; - } - LYXERR(Debug::FILES, "Unable to create temporary file with following template: " - << qt_tmp.fileTemplate()); - return string(); -} - - -FileName FileName::tempName(FileName const & temp_dir, string const & mask) -{ - QFileInfo tmp_fi(QDir(temp_dir.d->fi.absoluteFilePath()), toqstr(mask)); - LYXERR(Debug::FILES, "Temporary file in " << tmp_fi.absoluteFilePath()); - return FileName(createTempFile(tmp_fi.absoluteFilePath())); -} - - -FileName FileName::tempName(string const & mask) -{ - return tempName(package().temp_dir(), mask); -} - - FileName FileName::getcwd() { // return makeAbsPath("."); would create an infinite loop @@ -476,13 +506,24 @@ FileName FileName::tempPath() } +void FileName::refresh() const +{ + d->refresh(); +} + + time_t FileName::lastModified() const { // QFileInfo caches information about the file. So, in case this file has // been touched between the object creation and now, we refresh the file // information. d->refresh(); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) + return d->fi.lastModified().toSecsSinceEpoch(); +#else return d->fi.lastModified().toTime_t(); +#endif + } @@ -492,47 +533,61 @@ bool FileName::chdir() const } -unsigned long FileName::checksum() const +bool FileName::link(FileName const & name) const { - unsigned long result = 0; + return QFile::link(toqstr(absFileName()), toqstr(name.absFileName())); +} + +unsigned long checksum_ifstream_fallback(char const * file) +{ + //LYXERR(Debug::FILES, "lyx::sum() using istreambuf_iterator (fast)"); + ifstream ifs(file, ios_base::in | ios_base::binary); + if (!ifs) + return 0; + return support::checksum(ifs); +} + + +unsigned long FileName::checksum() const +{ if (!exists()) { - //LYXERR0("File \"" << absFilename() << "\" does not exist!"); - return result; + //LYXERR0("File \"" << absFileName() << "\" does not exist!"); + return 0; } // a directory may be passed here so we need to test it. (bug 3622) if (isDirectory()) { - LYXERR0('"' << absFilename() << "\" is a directory!"); - return result; + LYXERR0('"' << absFileName() << "\" is a directory!"); + return 0; } // This is used in the debug output at the end of the method. - static QTime t; + static QElapsedTimer t; if (lyxerr.debugging(Debug::FILES)) t.restart(); + unsigned long result = 0; + #if QT_VERSION >= 0x999999 // First version of checksum uses Qt4.4 mmap support. // FIXME: This code is not ready with Qt4.4.2, - // see http://bugzilla.lyx.org/show_bug.cgi?id=5293 + // see http://www.lyx.org/trac/ticket/5293 // FIXME: should we check if the MapExtension extension is supported? - // see QAbstractFileEngine::supportsExtension() and + // see QAbstractFileEngine::supportsExtension() and // QAbstractFileEngine::MapExtension) QFile qf(fi.filePath()); if (!qf.open(QIODevice::ReadOnly)) - return result; + return 0; qint64 size = fi.size(); uchar * ubeg = qf.map(0, size); uchar * uend = ubeg + size; - boost::crc_32_type ucrc; - ucrc.process_block(ubeg, uend); + result = support::checksum(ubeg, uend); qf.unmap(ubeg); qf.close(); - result = ucrc.checksum(); #else // QT_VERSION - string const encoded = toFilesystemEncoding(); + string const encoded = toSafeFilesystemEncoding(); char const * file = encoded.c_str(); #ifdef SUM_WITH_MMAP @@ -540,46 +595,37 @@ unsigned long FileName::checksum() const int fd = open(file, O_RDONLY); if (!fd) - return result; + return 0; struct stat info; - fstat(fd, &info); + if (fstat(fd, &info)){ + // fstat fails on samba shares (bug 5891) + close(fd); + return checksum_ifstream_fallback(file); + } void * mm = mmap(0, info.st_size, PROT_READ, MAP_PRIVATE, fd, 0); // Some platforms have the wrong type for MAP_FAILED (compaq cxx). if (mm == reinterpret_cast(MAP_FAILED)) { close(fd); - return result; + return 0; } - char * beg = static_cast(mm); - char * end = beg + info.st_size; + unsigned char * beg = static_cast(mm); + unsigned char * end = beg + info.st_size; - boost::crc_32_type crc; - crc.process_block(beg, end); - result = crc.checksum(); + result = support::checksum(beg, end); munmap(mm, info.st_size); close(fd); #else // no SUM_WITH_MMAP - - //LYXERR(Debug::FILES, "lyx::sum() using istreambuf_iterator (fast)"); - ifstream ifs(file, ios_base::in | ios_base::binary); - if (!ifs) - return result; - - istreambuf_iterator beg(ifs); - istreambuf_iterator end; - boost::crc_32_type crc; - crc = for_each(beg, end, crc); - result = crc.checksum(); - + result = checksum_ifstream_fallback(file); #endif // SUM_WITH_MMAP #endif // QT_VERSION - LYXERR(Debug::FILES, "Checksumming \"" << absFilename() << "\" " + LYXERR(Debug::FILES, "Checksumming \"" << absFileName() << "\" " << result << " lasted " << t.elapsed() << " ms."); return result; } @@ -607,12 +653,12 @@ static bool rmdir(QFileInfo const & fi) continue; bool removed; if (list.at(i).isDir()) { - LYXERR(Debug::FILES, "Removing dir " + LYXERR(Debug::FILES, "Removing dir " << fromqstr(list.at(i).absoluteFilePath())); removed = rmdir(list.at(i)); } else { - LYXERR(Debug::FILES, "Removing file " + LYXERR(Debug::FILES, "Removing file " << fromqstr(list.at(i).absoluteFilePath())); removed = dir.remove(list.at(i).fileName()); } @@ -621,7 +667,7 @@ static bool rmdir(QFileInfo const & fi) LYXERR0("Could not delete " << fromqstr(list.at(i).absoluteFilePath())); } - } + } QDir parent = fi.absolutePath(); success &= parent.rmdir(fi.fileName()); return success; @@ -639,30 +685,31 @@ bool FileName::destroyDirectory() const // Only used in non Win32 platforms +#ifndef Q_OS_WIN32 static int mymkdir(char const * pathname, unsigned long int mode) { // FIXME: why don't we have mode_t in lyx::mkdir prototype ?? -#if HAVE_MKDIR -# if MKDIR_TAKES_ONE_ARG +# if HAVE_MKDIR +# if MKDIR_TAKES_ONE_ARG // MinGW32 return ::mkdir(pathname); // FIXME: "Permissions of created directories are ignored on this system." -# else +# else // POSIX return ::mkdir(pathname, mode_t(mode)); -# endif -#elif defined(_WIN32) +# endif +# elif defined(_WIN32) // plain Windows 32 return CreateDirectory(pathname, 0) != 0 ? 0 : -1; // FIXME: "Permissions of created directories are ignored on this system." -#elif HAVE__MKDIR +# elif HAVE__MKDIR return ::_mkdir(pathname); // FIXME: "Permissions of created directories are ignored on this system." -#else +# else # error "Don't know how to create a directory on this system." -#endif - +# endif } +#endif bool FileName::createDirectory(int permission) const @@ -670,6 +717,7 @@ bool FileName::createDirectory(int permission) const LASSERT(!empty(), return false); #ifdef Q_OS_WIN32 // FIXME: "Permissions of created directories are ignored on this system." + (void) permission; return createPath(); #else return mymkdir(toFilesystemEncoding().c_str(), permission) == 0; @@ -700,14 +748,14 @@ docstring const FileName::absoluteFilePath() const docstring FileName::displayName(int threshold) const { - return makeDisplayPath(absFilename(), threshold); + return makeDisplayPath(absFileName(), threshold); } docstring FileName::fileContents(string const & encoding) const { if (!isReadableFile()) { - LYXERR0("File '" << *this << "' is not redable!"); + LYXERR0("File '" << *this << "' is not readable!"); return docstring(); } @@ -730,7 +778,7 @@ docstring FileName::fileContents(string const & encoding) const if (encoding.empty() || encoding == "UTF-8") s = QString::fromUtf8(contents.data()); else if (encoding == "ascii") - s = QString::fromAscii(contents.data()); + s = QString::fromLatin1(contents.data()); else if (encoding == "local8bit") s = QString::fromLocal8Bit(contents.data()); else if (encoding == "latin1") @@ -743,7 +791,7 @@ docstring FileName::fileContents(string const & encoding) const void FileName::changeExtension(string const & extension) { // FIXME: use Qt native methods... - string const oldname = absFilename(); + string const oldname = absFileName(); string::size_type const last_slash = oldname.rfind('/'); string::size_type last_dot = oldname.rfind('.'); if (last_dot < last_slash && last_slash != string::npos) @@ -760,189 +808,16 @@ void FileName::changeExtension(string const & extension) } -string FileName::guessFormatFromContents() const -{ - // the different filetypes and what they contain in one of the first lines - // (dots are any characters). (Herbert 20020131) - // AGR Grace... - // BMP BM... - // EPS %!PS-Adobe-3.0 EPSF... - // FIG #FIG... - // FITS ...BITPIX... - // GIF GIF... - // JPG JFIF - // PDF %PDF-... - // PNG .PNG... - // PBM P1... or P4 (B/W) - // PGM P2... or P5 (Grayscale) - // PPM P3... or P6 (color) - // PS %!PS-Adobe-2.0 or 1.0, no "EPSF"! - // SGI \001\332... (decimal 474) - // TGIF %TGIF... - // TIFF II... or MM... - // XBM ..._bits[]... - // XPM /* XPM */ sometimes missing (f.ex. tgif-export) - // ...static char *... - // XWD \000\000\000\151 (0x00006900) decimal 105 - // - // GZIP \037\213 http://www.ietf.org/rfc/rfc1952.txt - // ZIP PK... http://www.halyava.ru/document/ind_arch.htm - // Z \037\235 UNIX compress - - // paranoia check - if (empty() || !isReadableFile()) - return string(); - - ifstream ifs(toFilesystemEncoding().c_str()); - if (!ifs) - // Couldn't open file... - return string(); - - // gnuzip - static string const gzipStamp = "\037\213"; - - // PKZIP - static string const zipStamp = "PK"; - - // compress - static string const compressStamp = "\037\235"; - - // Maximum strings to read - int const max_count = 50; - int count = 0; - - string str; - string format; - bool firstLine = true; - while ((count++ < max_count) && format.empty()) { - if (ifs.eof()) { - LYXERR(Debug::GRAPHICS, "filetools(getFormatFromContents)\n" - << "\tFile type not recognised before EOF!"); - break; - } - - getline(ifs, str); - string const stamp = str.substr(0, 2); - if (firstLine && str.size() >= 2) { - // at first we check for a zipped file, because this - // information is saved in the first bytes of the file! - // also some graphic formats which save the information - // in the first line, too. - if (prefixIs(str, gzipStamp)) { - format = "gzip"; - - } else if (stamp == zipStamp) { - format = "zip"; - - } else if (stamp == compressStamp) { - format = "compress"; - - // the graphics part - } else if (stamp == "BM") { - format = "bmp"; - - } else if (stamp == "\001\332") { - format = "sgi"; - - // PBM family - // Don't need to use str.at(0), str.at(1) because - // we already know that str.size() >= 2 - } else if (str[0] == 'P') { - switch (str[1]) { - case '1': - case '4': - format = "pbm"; - break; - case '2': - case '5': - format = "pgm"; - break; - case '3': - case '6': - format = "ppm"; - } - break; - - } else if ((stamp == "II") || (stamp == "MM")) { - format = "tiff"; - - } else if (prefixIs(str,"%TGIF")) { - format = "tgif"; - - } else if (prefixIs(str,"#FIG")) { - format = "fig"; - - } else if (prefixIs(str,"GIF")) { - format = "gif"; - - } else if (str.size() > 3) { - int const c = ((str[0] << 24) & (str[1] << 16) & - (str[2] << 8) & str[3]); - if (c == 105) { - format = "xwd"; - } - } - - firstLine = false; - } - - if (!format.empty()) - break; - else if (contains(str,"EPSF")) - // dummy, if we have wrong file description like - // %!PS-Adobe-2.0EPSF" - format = "eps"; - - else if (contains(str, "Grace")) - format = "agr"; - - else if (contains(str, "JFIF")) - format = "jpg"; - - else if (contains(str, "%PDF")) - format = "pdf"; - - else if (contains(str, "PNG")) - format = "png"; - - else if (contains(str, "%!PS-Adobe")) { - // eps or ps - ifs >> str; - if (contains(str,"EPSF")) - format = "eps"; - else - format = "ps"; - } - - else if (contains(str, "_bits[]")) - format = "xbm"; - - else if (contains(str, "XPM") || contains(str, "static char *")) - format = "xpm"; - - else if (contains(str, "BITPIX")) - format = "fits"; - } - - // Dia knows also compressed form - if ((format == "gzip") && (!compare_ascii_no_case(extension(), "dia"))) - format="dia"; - - if (!format.empty()) { - LYXERR(Debug::GRAPHICS, "Recognised Fileformat: " << format); - return format; - } - - LYXERR(Debug::GRAPHICS, "filetools(getFormatFromContents)\n" - << "\tCouldn't find a known format!"); - return string(); -} - - -bool FileName::isZippedFile() const +void FileName::ensureExtension(string const & extension) { - string const type = guessFormatFromContents(); - return contains("gzip zip compress", type) && !type.empty(); + string ext; + // Make sure the extension starts with a dot + if (!extension.empty() && extension[0] != '.') + ext= '.' + extension; + else + ext = extension; + if (!suffixIs(ascii_lowercase(absFileName()), ext)) + set(absFileName() + ext); } @@ -966,8 +841,8 @@ bool equivalent(FileName const & l, FileName const & r) // * Long and short file names that refer to the same file on Windows are // treated as if they referred to different files. // This is supposed to be fixed for Qt5. - FileName const lhs(os::internal_path(l.absFilename())); - FileName const rhs(os::internal_path(r.absFilename())); + FileName const lhs(os::internal_path(l.absFileName())); + FileName const rhs(os::internal_path(r.absFileName())); if (lhs.empty()) // QFileInfo::operator==() returns false if the two QFileInfo are empty. @@ -1002,9 +877,9 @@ bool equivalent(FileName const & l, FileName const & r) bool operator==(FileName const & lhs, FileName const & rhs) { return os::isFilesystemCaseSensitive() - ? lhs.absFilename() == rhs.absFilename() - : !QString::compare(toqstr(lhs.absFilename()), - toqstr(rhs.absFilename()), Qt::CaseInsensitive); + ? lhs.absFileName() == rhs.absFileName() + : !QString::compare(toqstr(lhs.absFileName()), + toqstr(rhs.absFileName()), Qt::CaseInsensitive); } @@ -1016,19 +891,19 @@ bool operator!=(FileName const & lhs, FileName const & rhs) bool operator<(FileName const & lhs, FileName const & rhs) { - return lhs.absFilename() < rhs.absFilename(); + return lhs.absFileName() < rhs.absFileName(); } bool operator>(FileName const & lhs, FileName const & rhs) { - return lhs.absFilename() > rhs.absFilename(); + return lhs.absFileName() > rhs.absFileName(); } ostream & operator<<(ostream & os, FileName const & filename) { - return os << filename.absFilename(); + return os << filename.absFileName(); } @@ -1045,12 +920,12 @@ DocFileName::DocFileName() DocFileName::DocFileName(string const & abs_filename, bool save_abs) - : FileName(abs_filename), save_abs_path_(save_abs), zipped_valid_(false) + : FileName(abs_filename), save_abs_path_(save_abs) {} DocFileName::DocFileName(FileName const & abs_filename, bool save_abs) - : FileName(abs_filename), save_abs_path_(save_abs), zipped_valid_(false) + : FileName(abs_filename), save_abs_path_(save_abs) {} @@ -1060,68 +935,70 @@ void DocFileName::set(string const & name, string const & buffer_path) if (save_abs_path_) FileName::set(name); else - FileName::set(makeAbsPath(name, buffer_path).absFilename()); - zipped_valid_ = false; + FileName::set(makeAbsPath(name, buffer_path).absFileName()); } void DocFileName::erase() { FileName::erase(); - zipped_valid_ = false; } -string DocFileName::relFilename(string const & path) const +string DocFileName::relFileName(string const & path) const { // FIXME UNICODE return to_utf8(relPath(path)); } -string DocFileName::outputFilename(string const & path) const +string DocFileName::outputFileName(string const & path) const { - return save_abs_path_ ? absFilename() : relFilename(path); + return save_abs_path_ ? absFileName() : relFileName(path); } -string DocFileName::mangledFilename(string const & dir) const +string DocFileName::mangledFileName(string const & dir) const { + return mangledFileName(dir, true, false); +} + +string DocFileName::mangledFileName(string const & dir, bool use_counter, bool encrypt_path) const +{ + // Concurrent access to these variables is possible. + // We need to make sure that every DocFileName instance for a given // filename returns the same mangled name. typedef map MangledMap; static MangledMap mangledNames; - MangledMap::const_iterator const it = mangledNames.find(absFilename()); + static Mutex mangledMutex; + // this locks both access to mangledNames and counter below + Mutex::Locker lock(&mangledMutex); + MangledMap::const_iterator const it = mangledNames.find(absFileName()); if (it != mangledNames.end()) return (*it).second; - string const name = absFilename(); - // Now the real work - string mname = os::internal_path(name); - // Remove the extension. - mname = support::changeExtension(name, string()); + string const name = absFileName(); + // Now the real work. Remove the extension. + string mname = support::changeExtension(name, string()); + + if (encrypt_path) + mname = "export_" + onlyFileName() + "_" + toHexHash(mname); + // The mangled name must be a valid LaTeX name. - // The list of characters to keep is probably over-restrictive, - // but it is not really a problem. - // Apart from non-ASCII characters, at least the following characters - // are forbidden: '/', '.', ' ', and ':'. - // On windows it is not possible to create files with '<', '>' or '?' - // in the name. - static string const keep = "abcdefghijklmnopqrstuvwxyz" - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "+,-0123456789;="; - string::size_type pos = 0; - while ((pos = mname.find_first_not_of(keep, pos)) != string::npos) - mname[pos++] = '_'; + mname = sanitizeFileName(mname); // Add the extension back on mname = support::changeExtension(mname, getExtension(name)); // Prepend a counter to the filename. This is necessary to make // the mangled name unique. static int counter = 0; - ostringstream s; - s << counter++ << mname; - mname = s.str(); + + if (use_counter) { + ostringstream s; + s << counter++ << mname; + mname = s.str(); + } // MiKTeX's YAP (version 2.4.1803) crashes if the file name // is longer than about 160 characters. MiKTeX's pdflatex @@ -1142,24 +1019,14 @@ string DocFileName::mangledFilename(string const & dir) const } } - mangledNames[absFilename()] = mname; + mangledNames[absFileName()] = mname; return mname; } -bool DocFileName::isZipped() const -{ - if (!zipped_valid_) { - zipped_ = isZippedFile(); - zipped_valid_ = true; - } - return zipped_; -} - - -string DocFileName::unzippedFilename() const +string DocFileName::unzippedFileName() const { - return unzippedFileName(absFilename()); + return support::unzippedFileName(absFileName()); }