}
-string const quoteName(string const & name)
+string const quoteName(string const & name, quote_style style)
{
- return (os::shell() == os::UNIX) ?
- '\'' + name + '\'':
- '"' + name + '"';
+ switch(style) {
+ case quote_shell:
+ // This does not work for filenames containing " (windows)
+ // or ' (all other OSes). This can't be changed easily, since
+ // we would need to adapt the command line parser in
+ // Forkedcall::generateChild. Therefore we don't pass user
+ // filenames to child processes if possible. We store them in
+ // a python script instead, where we don't have these
+ // limitations.
+ return (os::shell() == os::UNIX) ?
+ '\'' + name + '\'':
+ '"' + name + '"';
+ case quote_python:
+ return "\"" + subst(subst(name, "\\", "\\\\"), "\"", "\\\"")
+ + "\"";
+ }
+ // shut up stupid compiler
+ return string();
}
-// Is a file readable ?
-bool isFileReadable(string const & path)
+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(string const & path)
+bool isDirWriteable(FileName const & path)
{
lyxerr[Debug::FILES] << "isDirWriteable: " << path << endl;
- string const tmpfl = tempName(path, "lyxwritetest");
+ FileName const tmpfl(tempName(path, "lyxwritetest"));
if (tmpfl.empty())
return false;
}
+#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.
// If path entry begins with $$LyX/, use system_lyxdir
// If path entry begins with $$User/, use user_lyxdir
// Example: "$$User/doc;$$LyX/doc"
-string const fileOpenSearch(string const & path, string const & name,
+FileName const fileOpenSearch(string const & path, string const & name,
string const & ext)
{
- string real_file;
+ FileName real_file;
string path_element;
bool notfound = true;
string tmppath = split(path, path_element, ';');
}
return real_file;
}
+#endif
/// Returns a vector of all files in directory dir having extension ext.
-vector<string> const dirList(string const & dir, string const & ext)
+vector<FileName> const dirList(FileName const & dir, string const & ext)
{
// EXCEPTIONS FIXME. Rewrite needed when we turn on exceptions. (Lgb)
- vector<string> dirlist;
+ vector<FileName> dirlist;
- if (!(fs::exists(dir) && fs::is_directory(dir))) {
+ 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;
extension += '.';
extension += ext;
- fs::directory_iterator dit(dir);
+ 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(fil);
- }
+ 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.
-string const fileSearch(string const & path, string const & name,
- string const & ext)
+FileName const fileSearch(string const & path, string const & name,
+ string const & ext, search_mode mode)
{
// if `name' is an absolute path, we ignore the setting of `path'
// Expand Environmentvariables in 'name'
string const tmpname = replaceEnvironmentPath(name);
- string fullname = makeAbsPath(tmpname, path);
+ FileName fullname(makeAbsPath(tmpname, path));
// search first without extension, then with it.
if (isFileReadable(fullname))
return fullname;
if (ext.empty())
- return string();
- // Is it not more reasonable to use ChangeExtension()? (SMiyata)
- fullname += '.';
- fullname += ext;
- return isFileReadable(fullname) ? fullname : string();
+ // We are done.
+ return mode == allow_unreadable ? 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)
+ return fullname;
+ return FileName();
}
// 1) user_lyxdir
// 2) build_lyxdir (if not empty)
// 3) system_lyxdir
-string const libFileSearch(string const & dir, string const & name,
+FileName const libFileSearch(string const & dir, string const & name,
string const & ext)
{
- string fullname = fileSearch(addPath(package().user_support(), dir),
+ FileName fullname = fileSearch(addPath(package().user_support(), dir),
name, ext);
if (!fullname.empty())
return fullname;
}
-string const i18nLibFileSearch(string const & dir, string const & name,
+FileName const i18nLibFileSearch(string const & dir, string const & name,
string const & ext)
{
// the following comments are from intl/dcigettext.c. We try
string l;
lang = split(lang, l, ':');
while (!l.empty() && l != "C" && l != "POSIX") {
- string const tmp = libFileSearch(dir,
+ FileName const tmp = libFileSearch(dir,
token(l, '_', 0) + '_' + name,
ext);
if (!tmp.empty())
}
-string const libScriptSearch(string const & command_in)
+string const libScriptSearch(string const & command_in, quote_style style)
{
static string const token_scriptpath = "$$s/";
(command.size() - start_script) : pos2 - start_script;
// Does this script file exist?
- string const script =
- libFileSearch(".", command.substr(start_script, size_script));
+ string const script =
+ libFileSearch(".", command.substr(start_script, size_script)).absFilename();
if (script.empty()) {
// Replace "$$s/" with ""
} else {
// Replace "$$s/foo/some_script" with "<path to>/some_script".
string::size_type const size_replace = size_script + 4;
- command.replace(pos1, size_replace, quoteName(script));
+ command.replace(pos1, size_replace, quoteName(script, style));
}
return command;
namespace {
-string const createTmpDir(string const & tempdir, string const & mask)
+FileName const createTmpDir(FileName const & tempdir, string const & mask)
{
lyxerr[Debug::FILES]
<< "createTmpDir: tempdir=`" << tempdir << "'\n"
<< "createTmpDir: mask=`" << mask << '\'' << endl;
- string const tmpfl = tempName(tempdir, mask);
+ 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
if (tmpfl.empty() || mkdir(tmpfl, 0700)) {
lyxerr << "LyX could not create the temporary directory '"
<< tmpfl << "'" << endl;
- return string();
+ return FileName();
}
- return makeAbsPath(tmpfl);
+ return tmpfl;
}
} // namespace anon
-bool destroyDir(string const & tmpdir)
+bool destroyDir(FileName const & tmpdir)
{
- return fs::remove_all(tmpdir) > 0;
+ 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;
+ }
}
package().temp_dir() + "/lyx_tmpbuf" +
convert<string>(count++);
- if (mkdir(tmpfl, 0777)) {
+ if (mkdir(FileName(tmpfl), 0777)) {
lyxerr << "LyX could not create the temporary directory '"
<< tmpfl << "'" << endl;
return string();
}
-string const createLyXTmpDir(string const & deflt)
+FileName const createLyXTmpDir(FileName const & deflt)
{
- if (!deflt.empty() && deflt != "/tmp") {
+ if (!deflt.empty() && deflt.absFilename() != "/tmp") {
if (mkdir(deflt, 0777)) {
if (isDirWriteable(deflt)) {
// deflt could not be created because it
return createTmpDir(deflt, "lyx_tmpdir");
} else {
// some other error occured.
- return createTmpDir("/tmp", "lyx_tmpdir");
+ return createTmpDir(FileName("/tmp"), "lyx_tmpdir");
}
} else
return deflt;
} else {
- return createTmpDir("/tmp", "lyx_tmpdir");
+ return createTmpDir(FileName("/tmp"), "lyx_tmpdir");
}
}
{
string temp = rtrim(os::internal_path(path), "/");
BOOST_ASSERT(!temp.empty());
- return mkdir(temp, permission) == 0;
+ return mkdir(FileName(temp), permission) == 0;
}
// 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.
-string const makeAbsPath(string const & relPath, string const & basePath)
+FileName const makeAbsPath(string const & relPath, string const & basePath)
{
// checks for already absolute path
if (os::is_absolute_path(relPath))
- return relPath;
+ return FileName(relPath);
// Copies given paths
string tempRel = os::internal_path(relPath);
if (os::is_absolute_path(basePath))
tempBase = basePath;
else
- tempBase = addPath(getcwd(), basePath);
+ tempBase = addPath(getcwd().absFilename(), basePath);
// Handle /./ at the end of the path
while (suffixIs(tempBase, "/./"))
}
// returns absolute path
- return os::internal_path(tempBase);
+ return FileName(os::internal_path(tempBase));
}
rTemp = split(rTemp, temp, '/');
if (temp == ".")
- return getcwd() + '/' + rTemp;
+ return getcwd().absFilename() + '/' + rTemp;
if (temp == "~")
return package().home_dir() + '/' + rTemp;
if (temp == "..")
- return makeAbsPath(copy);
+ return makeAbsPath(copy).absFilename();
// Don't know how to handle this
return copy;
}
-string const getFileContents(string const & fname)
+string const getFileContents(FileName const & fname)
{
- if (fs::exists(fname)) {
- ifstream ifs(fname.c_str());
+ string const encodedname = fname.toFilesystemEncoding();
+ if (fs::exists(encodedname)) {
+ ifstream ifs(encodedname.c_str());
ostringstream ofs;
if (ifs && ofs) {
ofs << ifs.rdbuf();
}
-/*
- Change extension of oldname to extension.
- Strips path off if no_path == true.
- If no extension on oldname, just appends.
- */
string const changeExtension(string const & oldname, string const & extension)
{
string::size_type const last_slash = oldname.rfind('/');
}
+string const addExtension(string const & name, string const & extension)
+{
+ if (!extension.empty() && extension[0] != '.')
+ return name + '.' + extension;
+ return name + extension;
+}
+
+
/// Return the extension of the file (not including the .)
string const getExtension(string const & name)
{
// ZIP PK... http://www.halyava.ru/document/ind_arch.htm
// Z \037\235 UNIX compress
-string const getFormatFromContents(string const & filename)
+string const getFormatFromContents(FileName const & filename)
{
// paranoia check
if (filename.empty() || !isFileReadable(filename))
return string();
- ifstream ifs(filename.c_str());
+ ifstream ifs(filename.toFilesystemEncoding().c_str());
if (!ifs)
// Couldn't open file...
return string();
/// check for zipped file
-bool zippedFile(string const & name)
+bool zippedFile(FileName const & name)
{
string const type = getFormatFromContents(name);
if (contains("gzip zip compress", type) && !type.empty())
}
-string const unzipFile(string const & zipped_file, string const & unzipped_file)
+FileName const unzipFile(FileName const & zipped_file, string const & unzipped_file)
{
- string const tempfile = unzipped_file.empty() ?
- unzippedFileName(zipped_file) : unzipped_file;
+ FileName const tempfile = FileName(unzipped_file.empty() ?
+ unzippedFileName(zipped_file.toFilesystemEncoding()) :
+ unzipped_file);
// Run gunzip
- string const command = "gunzip -c " + zipped_file + " > " + tempfile;
+ string const command = "gunzip -c " +
+ zipped_file.toFilesystemEncoding() + " > " +
+ tempfile.toFilesystemEncoding();
Systemcall one;
one.startscript(Systemcall::Wait, command);
// test that command was executed successfully (anon)
str = subst(str, home, "~");
if (str.length() <= threshold)
- return lyx::from_utf8(os::external_path(str));
+ return from_utf8(os::external_path(str));
string const prefix = ".../";
string temp;
str = head + "..." + tail;
}
- return lyx::from_utf8(os::external_path(prefix + str));
+ return from_utf8(os::external_path(prefix + str));
}
return false;
linkbuffer[nRead] = '\0'; // terminator
if (resolve)
- link = makeAbsPath(linkbuffer, onlyPath(file));
+ link = makeAbsPath(linkbuffer, onlyPath(file)).absFilename();
else
link = linkbuffer;
return true;
}
-string const findtexfile(string const & fil, string const & /*format*/)
+FileName const findtexfile(string const & fil, string const & /*format*/)
{
/* There is no problem to extend this function too use other
methods to look for files. It could be setup to look
// If the file can be found directly, we just return a
// absolute path version of it.
- if (fs::exists(fil))
- return makeAbsPath(fil);
+ FileName const absfile(makeAbsPath(fil));
+ if (fs::exists(absfile.toFilesystemEncoding()))
+ return absfile;
// No we try to find it using kpsewhich.
// It seems from the kpsewhich manual page that it is safe to use
cmd_ret const c = runCommand(kpsecmd);
lyxerr[Debug::LATEX] << "kpse status = " << c.first << '\n'
- << "kpse result = `" << rtrim(c.second, "\n")
+ << "kpse result = `" << rtrim(c.second, "\n\r")
<< '\'' << endl;
if (c.first != -1)
- return os::internal_path(rtrim(c.second, "\n\r"));
+ return FileName(os::internal_path(rtrim(to_utf8(from_filesystem8bit(c.second)),
+ "\n\r")));
else
- return string();
+ return FileName();
}
a += '#';
a += onlyFilename(filename);
a += '#';
- if (fs::exists(a))
- unlink(a);
+ FileName const autosave(a);
+ if (fs::exists(autosave.toFilesystemEncoding()))
+ unlink(autosave);
}
-void readBB_lyxerrMessage(string const & file, bool & zipped,
+void readBB_lyxerrMessage(FileName const & file, bool & zipped,
string const & message)
{
lyxerr[Debug::GRAPHICS] << "[readBB_from_PSFile] "
}
-string const readBB_from_PSFile(string const & file)
+string const readBB_from_PSFile(FileName const & file)
{
// in a (e)ps-file it's an entry like %%BoundingBox:23 45 321 345
// It seems that every command in the header has an own line,
// %%BoundingBox: (atend)
// In this case we must check the end.
bool zipped = zippedFile(file);
- string const file_ = zipped ? unzipFile(file) : file;
+ FileName const file_ = zipped ? unzipFile(file) : file;
string const format = getFormatFromContents(file_);
if (format != "eps" && format != "ps") {
static boost::regex bbox_re(
"^%%BoundingBox:\\s*([[:digit:]]+)\\s+([[:digit:]]+)\\s+([[:digit:]]+)\\s+([[:digit:]]+)");
- std::ifstream is(file_.c_str());
+ std::ifstream is(file_.toFilesystemEncoding().c_str());
while (is) {
string s;
getline(is,s);
}
-int compare_timestamps(string const & file1, string const & file2)
+int compare_timestamps(FileName const & filename1, FileName const & filename2)
{
- BOOST_ASSERT(absolutePath(file1));
- BOOST_ASSERT(absolutePath(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),
projects / lyx.git / blobdiff