* \author Ivan Schreter
* \author Dirk Niggemann
* \author Asger Alstrup
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
* \author Jean-Marc Lasgouttes
* \author Angus Leeming
* \author John Levon
- * \author Herbert Voß
+ * \author Herbert Voß
*
* Full author contact details are available in file CREDITS.
*
#include <config.h>
-#include "support/convert.h"
-#include "support/environment.h"
#include "support/filetools.h"
-#include "support/fs_extras.h"
+
+#include "support/debug.h"
+#include "support/environment.h"
+#include "support/gettext.h"
#include "support/lstrings.h"
-#include "support/lyxlib.h"
#include "support/os.h"
#include "support/Package.h"
#include "support/Path.h"
#include "support/Systemcall.h"
+#include "support/qstring_helpers.h"
-// FIXME Interface violation
-#include "gettext.h"
-#include "debug.h"
+#include <QDir>
-#include <boost/assert.hpp>
-#include <boost/filesystem/operations.hpp>
+#include "support/lassert.h"
#include <boost/regex.hpp>
#include <fcntl.h>
#include <fstream>
#include <sstream>
-using std::endl;
-using std::getline;
-using std::make_pair;
-using std::string;
-using std::ifstream;
-using std::ostringstream;
-using std::vector;
-using std::pair;
+using namespace std;
-namespace fs = boost::filesystem;
+#define USE_QPROCESS
namespace lyx {
namespace support {
bool isValidLaTeXFilename(string const & filename)
{
string const invalid_chars("#$%{}()[]\"^");
- if (filename.find_first_of(invalid_chars) != string::npos)
- return false;
- else
- return true;
+ return filename.find_first_of(invalid_chars) == string::npos;
}
// Substitutes spaces with underscores in filename (and path)
-string const makeLatexName(string const & file)
+FileName const makeLatexName(FileName const & file)
{
- string name = onlyFilename(file);
- string const path = onlyPath(file);
+ string name = file.onlyFileName();
+ string const path = file.onlyPath().absFilename() + "/";
// ok so we scan through the string twice, but who cares.
+ // FIXME: in Unicode time this will break for sure! There is
+ // a non-latin world out there...
string const keep = "abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"@!'()*+,-./0123456789:;<=>?[]`|";
while ((pos = name.find_first_not_of(keep, pos)) != string::npos)
name[pos++] = '_';
- return addName(path, name);
+ FileName latex_name(path + name);
+ latex_name.changeExtension(".tex");
+ return latex_name;
}
// filenames to child processes if possible. We store them in
// a python script instead, where we don't have these
// limitations.
+#ifndef USE_QPROCESS
return (os::shell() == os::UNIX) ?
'\'' + name + '\'':
'"' + name + '"';
+#else
+ return '"' + name + '"';
+#endif
case quote_python:
return "\"" + subst(subst(name, "\\", "\\\\"), "\"", "\\\"")
+ "\"";
}
-bool isFileReadable(FileName const & filename)
-{
- std::string const path = filename.toFilesystemEncoding();
- return fs::exists(path) && !fs::is_directory(path) && fs::is_readable(path);
-}
-
-
-//returns true: dir writeable
-// false: not writeable
-bool isDirWriteable(FileName const & path)
-{
- LYXERR(Debug::FILES) << "isDirWriteable: " << path << endl;
-
- FileName const tmpfl(tempName(path, "lyxwritetest"));
-
- if (tmpfl.empty())
- return false;
-
- unlink(tmpfl);
- return true;
-}
-
-
#if 0
// Uses a string of paths separated by ";"s to find a file to open.
// Can't cope with pathnames with a ';' in them. Returns full path to file.
#endif
-/// Returns a vector of all files in directory dir having extension ext.
-vector<FileName> const dirList(FileName const & dir, string const & ext)
-{
- // EXCEPTIONS FIXME. Rewrite needed when we turn on exceptions. (Lgb)
- vector<FileName> dirlist;
-
- string const encoded_dir = dir.toFilesystemEncoding();
- if (!(fs::exists(encoded_dir) && fs::is_directory(encoded_dir))) {
- LYXERR(Debug::FILES)
- << "Directory \"" << dir
- << "\" does not exist to DirList." << endl;
- return dirlist;
- }
-
- string extension;
- if (!ext.empty() && ext[0] != '.')
- extension += '.';
- extension += ext;
-
- fs::directory_iterator dit(encoded_dir);
- fs::directory_iterator end;
- for (; dit != end; ++dit) {
- string const & fil = dit->leaf();
- if (suffixIs(fil, extension))
- dirlist.push_back(FileName::fromFilesystemEncoding(
- encoded_dir + '/' + fil));
- }
- return dirlist;
-}
-
-
// Returns the real name of file name in directory path, with optional
// extension ext.
FileName const fileSearch(string const & path, string const & name,
string const tmpname = replaceEnvironmentPath(name);
FileName fullname(makeAbsPath(tmpname, path));
// search first without extension, then with it.
- if (isFileReadable(fullname))
+ if (fullname.isReadableFile())
return fullname;
if (ext.empty())
// We are done.
- return mode == allow_unreadable ? fullname : FileName();
+ return mode == may_not_exist ? fullname : FileName();
// Only add the extension if it is not already the extension of
// fullname.
if (getExtension(fullname.absFilename()) != ext)
fullname = FileName(addExtension(fullname.absFilename(), ext));
- if (isFileReadable(fullname) || mode == allow_unreadable)
+ if (fullname.isReadableFile() || mode == may_not_exist)
return fullname;
return FileName();
}
variable. But we don't use the value if the currently
selected locale is the C locale. This is a GNU extension.
- Otherwise, w use a trick to guess what gettext has done:
+ Otherwise, w use a trick to guess what support/gettext.has done:
each po file is able to tell us its name. (JMarc)
*/
}
-namespace {
-
-FileName const createTmpDir(FileName const & tempdir, string const & mask)
+static FileName createTmpDir(FileName const & tempdir, string const & mask)
{
- LYXERR(Debug::FILES)
- << "createTmpDir: tempdir=`" << tempdir << "'\n"
- << "createTmpDir: mask=`" << mask << '\'' << endl;
-
- FileName const tmpfl(tempName(tempdir, mask));
- // lyx::tempName actually creates a file to make sure that it
- // stays unique. So we have to delete it before we can create
- // a dir with the same name. Note also that we are not thread
- // safe because of the gap between unlink and mkdir. (Lgb)
- unlink(tmpfl);
-
- if (tmpfl.empty() || mkdir(tmpfl, 0700)) {
- lyxerr << "LyX could not create the temporary directory '"
- << tmpfl << "'" << endl;
- return FileName();
- }
-
- return tmpfl;
-}
-
-} // namespace anon
+ LYXERR(Debug::FILES, "createTmpDir: tempdir=`" << tempdir << "'\n"
+ << "createTmpDir: mask=`" << mask << '\'');
+ FileName const tmpfl = FileName::tempName(tempdir, mask);
-bool destroyDir(FileName const & tmpdir)
-{
- try {
- return fs::remove_all(tmpdir.toFilesystemEncoding()) > 0;
- } catch (fs::filesystem_error const & fe){
- lyxerr << "Could not delete " << tmpdir << ". (" << fe.what() << ")" << std::endl;
- return false;
+ if (tmpfl.empty() || !tmpfl.createDirectory(0700)) {
+ LYXERR0("LyX could not create temporary directory in " << tempdir
+ << "'");
+ return FileName();
}
-}
-
-string const createBufferTmpDir()
-{
- static int count;
- // We are in our own directory. Why bother to mangle name?
- // In fact I wrote this code to circumvent a problematic behaviour
- // (bug?) of EMX mkstemp().
- string const tmpfl =
- package().temp_dir().absFilename() + "/lyx_tmpbuf" +
- convert<string>(count++);
-
- if (mkdir(FileName(tmpfl), 0777)) {
- lyxerr << "LyX could not create the temporary directory '"
- << tmpfl << "'" << endl;
- return string();
- }
return tmpfl;
}
FileName const createLyXTmpDir(FileName const & deflt)
{
- if (!deflt.empty() && deflt.absFilename() != "/tmp") {
- if (mkdir(deflt, 0777)) {
- if (isDirWriteable(deflt)) {
- // deflt could not be created because it
- // did exist already, so let's create our own
- // dir inside deflt.
- return createTmpDir(deflt, "lyx_tmpdir");
- } else {
- // some other error occured.
- return createTmpDir(FileName("/tmp"), "lyx_tmpdir");
- }
- } else
- return deflt;
- } else {
- return createTmpDir(FileName("/tmp"), "lyx_tmpdir");
- }
-}
+ if (deflt.empty() || deflt == package().system_temp_dir())
+ return createTmpDir(package().system_temp_dir(), "lyx_tmpdir");
+ if (deflt.createDirectory(0777))
+ return deflt;
-bool createDirectory(FileName const & path, int permission)
-{
- BOOST_ASSERT(!path.empty());
- return mkdir(path, permission) == 0;
+ if (deflt.isDirWritable()) {
+ // deflt could not be created because it
+ // did exist already, so let's create our own
+ // dir inside deflt.
+ return createTmpDir(deflt, "lyx_tmpdir");
+ } else {
+ // some other error occured.
+ return createTmpDir(package().system_temp_dir(), "lyx_tmpdir");
+ }
}
return filename;
// Find last / or start of filename
- string::size_type j = filename.rfind('/');
+ size_t j = filename.rfind('/');
return j == string::npos ? "./" : filename.substr(0, j + 1);
}
// Convert relative path into absolute path based on a basepath.
// If relpath is absolute, just use that.
// If basepath is empty, use CWD as base.
+// Note that basePath can be a relative path, in the sense that it may
+// not begin with "/" (e.g.), but it should NOT contain such constructs
+// as "/../".
+// FIXME It might be nice if the code didn't simply assume that.
FileName const makeAbsPath(string const & relPath, string const & basePath)
{
// checks for already absolute path
- if (os::is_absolute_path(relPath))
+ if (FileName::isAbsolute(relPath))
return FileName(relPath);
// Copies given paths
string tempBase;
- if (os::is_absolute_path(basePath))
+ if (FileName::isAbsolute(basePath))
tempBase = basePath;
else
- tempBase = addPath(getcwd().absFilename(), basePath);
+ tempBase = addPath(FileName::getcwd().absFilename(), basePath);
// Handle /./ at the end of the path
while (suffixIs(tempBase, "/./"))
string rTemp = tempRel;
string temp;
+ // Check for a leading "~"
+ // Split by first /
+ rTemp = split(rTemp, temp, '/');
+ if (temp == "~") {
+ tempBase = package().home_dir().absFilename();
+ tempRel = rTemp;
+ }
+
+ rTemp = tempRel;
while (!rTemp.empty()) {
// Split by next /
rTemp = split(rTemp, temp, '/');
if (temp == ".") continue;
if (temp == "..") {
// Remove one level of TempBase
- string::difference_type i = tempBase.length() - 2;
- if (i < 0)
- i = 0;
+ if (tempBase.length() <= 1) {
+ //this is supposed to be an absolute path, so...
+ tempBase = "/";
+ continue;
+ }
+ //erase a trailing slash if there is one
+ if (suffixIs(tempBase, "/"))
+ tempBase.erase(tempBase.length() - 1, string::npos);
+
+ string::size_type i = tempBase.length() - 1;
while (i > 0 && tempBase[i] != '/')
--i;
if (i > 0)
tempBase.erase(i, string::npos);
else
- tempBase += '/';
+ tempBase = '/';
} else if (temp.empty() && !rTemp.empty()) {
tempBase = os::current_root() + rTemp;
rTemp.erase();
}
// returns absolute path
- return FileName(os::internal_path(tempBase));
+ return FileName(tempBase);
}
}
-/// Returns true is path is absolute
-bool absolutePath(string const & path)
-{
- return os::is_absolute_path(path);
-}
-
-
// Create absolute path. If impossible, don't do anything
// Supports ./ and ~/. Later we can add support for ~logname/. (Asger)
string const expandPath(string const & path)
{
// checks for already absolute path
string rTemp = replaceEnvironmentPath(path);
- if (os::is_absolute_path(rTemp))
+ if (FileName::isAbsolute(rTemp))
return rTemp;
string temp;
rTemp = split(rTemp, temp, '/');
if (temp == ".")
- return getcwd().absFilename() + '/' + rTemp;
+ return FileName::getcwd().absFilename() + '/' + rTemp;
if (temp == "~")
return package().home_dir().absFilename() + '/' + rTemp;
}
-// Normalize a path. Constracts path/../path
-// Can't handle "../../" or "/../" (Asger)
-// Also converts paths like /foo//bar ==> /foo/bar
-string const normalizePath(string const & path)
-{
- // Normalize paths like /foo//bar ==> /foo/bar
- static boost::regex regex("/{2,}");
- string const tmppath = boost::regex_merge(path, regex, "/");
-
- fs::path const npath = fs::path(tmppath, fs::no_check).normalize();
-
- if (!npath.is_complete())
- return "./" + npath.string() + '/';
-
- return npath.string() + '/';
-}
-
-
-string const getFileContents(FileName const & fname)
-{
- string const encodedname = fname.toFilesystemEncoding();
- if (fs::exists(encodedname)) {
- ifstream ifs(encodedname.c_str());
- ostringstream ofs;
- if (ifs && ofs) {
- ofs << ifs.rdbuf();
- ifs.close();
- return ofs.str();
- }
- }
- lyxerr << "LyX was not able to read file '" << fname << '\'' << endl;
- return string();
-}
-
-
// Search the string for ${VAR} and $VAR and replace VAR using getenv.
string const replaceEnvironmentPath(string const & path)
{
static boost::regex envvar_br_re("(.*)" + envvar_br + "(.*)");
static boost::regex envvar_re("(.*)" + envvar + "(.*)");
boost::smatch what;
-
- string result = path;
+ string result;
+ string remaining = path;
while (1) {
- regex_match(result, what, envvar_br_re);
+ regex_match(remaining, what, envvar_br_re);
if (!what[0].matched) {
- regex_match(result, what, envvar_re);
- if (!what[0].matched)
+ regex_match(remaining, what, envvar_re);
+ if (!what[0].matched) {
+ result += remaining;
break;
+ }
}
- result = what.str(1) + getEnv(what.str(2)) + what.str(3);
+ string env_var = getEnv(what.str(2));
+ if (!env_var.empty())
+ result += what.str(1) + env_var;
+ else
+ result += what.str(1) + "$" + what.str(2);
+ remaining = what.str(3);
}
return result;
}
}
-// 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
-
-string const getFormatFromContents(FileName const & filename)
-{
- // paranoia check
- if (filename.empty() || !isFileReadable(filename))
- return string();
-
- ifstream ifs(filename.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!"
- << endl;
- 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";
- }
-
- if (!format.empty()) {
- LYXERR(Debug::GRAPHICS)
- << "Recognised Fileformat: " << format << endl;
- return format;
- }
-
- LYXERR(Debug::GRAPHICS)
- << "filetools(getFormatFromContents)\n"
- << "\tCouldn't find a known format!\n";
- return string();
-}
-
-
-/// check for zipped file
-bool zippedFile(FileName const & name)
-{
- string const type = getFormatFromContents(name);
- if (contains("gzip zip compress", type) && !type.empty())
- return true;
- return false;
-}
-
-
string const unzippedFileName(string const & zipped_file)
{
string const ext = getExtension(zipped_file);
if (ext == "gz" || ext == "z" || ext == "Z")
return changeExtension(zipped_file, string());
- return "unzipped_" + zipped_file;
+ return onlyPath(zipped_file) + "unzipped_" + onlyFilename(zipped_file);
}
// If the file can be found directly, we just return a
// absolute path version of it.
FileName const absfile(makeAbsPath(fil));
- if (fs::exists(absfile.toFilesystemEncoding()))
+ if (absfile.exists())
return absfile;
- // No we try to find it using kpsewhich.
+ // Now we try to find it using kpsewhich.
// It seems from the kpsewhich manual page that it is safe to use
// kpsewhich without --format: "When the --format option is not
// given, the search path used when looking for a file is inferred
cmd_ret const c = runCommand(kpsecmd);
- LYXERR(Debug::LATEX) << "kpse status = " << c.first << '\n'
- << "kpse result = `" << rtrim(c.second, "\n\r")
- << '\'' << endl;
+ LYXERR(Debug::LATEX, "kpse status = " << c.first << '\n'
+ << "kpse result = `" << rtrim(c.second, "\n\r") << '\'');
if (c.first != -1)
- return FileName(os::internal_path(rtrim(to_utf8(from_filesystem8bit(c.second)),
- "\n\r")));
+ return FileName(rtrim(to_utf8(from_filesystem8bit(c.second)), "\n\r"));
else
return FileName();
}
-void removeAutosaveFile(string const & filename)
-{
- string a = onlyPath(filename);
- a += '#';
- a += onlyFilename(filename);
- a += '#';
- FileName const autosave(a);
- if (fs::exists(autosave.toFilesystemEncoding()))
- unlink(autosave);
-}
-
-
void readBB_lyxerrMessage(FileName const & file, bool & zipped,
string const & message)
{
- LYXERR(Debug::GRAPHICS) << "[readBB_from_PSFile] "
- << message << std::endl;
+ LYXERR(Debug::GRAPHICS, "[readBB_from_PSFile] " << message);
// FIXME: Why is this func deleting a file? (Lgb)
if (zipped)
- unlink(file);
+ file.removeFile();
}
// end of the file. Than we have in the header:
// %%BoundingBox: (atend)
// In this case we must check the end.
- bool zipped = zippedFile(file);
+ bool zipped = file.isZippedFile();
FileName const file_ = zipped ? unzipFile(file) : file;
- string const format = getFormatFromContents(file_);
+ string const format = file_.guessFormatFromContents();
if (format != "eps" && format != "ps") {
readBB_lyxerrMessage(file_, zipped,"no(e)ps-format");
static boost::regex bbox_re(
"^%%BoundingBox:\\s*([[:digit:]]+)\\s+([[:digit:]]+)\\s+([[:digit:]]+)\\s+([[:digit:]]+)");
- std::ifstream is(file_.toFilesystemEncoding().c_str());
+ ifstream is(file_.toFilesystemEncoding().c_str());
while (is) {
string s;
getline(is,s);
}
-int compare_timestamps(FileName const & filename1, FileName const & filename2)
+int compare_timestamps(FileName const & file1, FileName const & file2)
{
// If the original is newer than the copy, then copy the original
// to the new directory.
- string const file1 = filename1.toFilesystemEncoding();
- string const file2 = filename2.toFilesystemEncoding();
int cmp = 0;
- if (fs::exists(file1) && fs::exists(file2)) {
- double const tmp = difftime(fs::last_write_time(file1),
- fs::last_write_time(file2));
+ if (file1.exists() && file2.exists()) {
+ double const tmp = difftime(file1.lastModified(), file2.lastModified());
if (tmp != 0)
cmp = tmp > 0 ? 1 : -1;
- } else if (fs::exists(file1)) {
+ } else if (file1.exists()) {
cmp = 1;
- } else if (fs::exists(file2)) {
+ } else if (file2.exists()) {
cmp = -1;
}
return cmp;
}
+
} //namespace support
} // namespace lyx
projects / lyx.git / blobdiff