// FIXME Interface violation
#include "gettext.h"
#include "debug.h"
-//#include "format.h"
#include <boost/assert.hpp>
#include <boost/regex.hpp>
string tmppath = split(path, path_element, ';');
while (notfound && !path_element.empty()) {
- path_element = os::slashify_path(path_element);
+ path_element = os::internal_path(path_element);
if (!suffixIs(path_element, '/'))
path_element+= '/';
path_element = subst(path_element, "$$LyX", system_lyxdir());
#ifndef __EMX__
string const pathlist = subst(GetEnv(name), ':', ';');
#else
- string const pathlist = os::slashify_path(GetEnv(name));
+ string const pathlist = os::internal_path(GetEnv(name));
#endif
return rtrim(pathlist, ";");
}
// 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 = os::getTmpDir() + "/lyx_tmpbuf" + tostr(count++);
+ string const tmpfl = os::getTmpDir() + "/lyx_tmpbuf" + convert<string>(count++);
if (mkdir(tmpfl, 0777)) {
lyxerr << "LyX could not create the temporary directory '"
<< tmpfl << "'" << endl;
bool createDirectory(string const & path, int permission)
{
- string temp(rtrim(os::slashify_path(path), "/"));
+ string temp(rtrim(os::internal_path(path), "/"));
BOOST_ASSERT(!temp.empty());
return RelPath;
// Copies given paths
- string TempRel(os::slashify_path(RelPath));
+ string TempRel(os::internal_path(RelPath));
// Since TempRel is NOT absolute, we can safely replace "//" with "/"
TempRel = subst(TempRel, "//", "/");
}
// returns absolute path
- return os::slashify_path(TempBase);
+ return os::internal_path(TempBase);
}
string buf;
if (path != "." && path != "./" && !path.empty()) {
- buf = os::slashify_path(path);
+ buf = os::internal_path(path);
if (!suffixIs(path, '/'))
buf += '/';
}
return getcwd() + '/' + RTemp;
}
if (Temp == "~") {
- return GetEnvPath("HOME") + '/' + RTemp;
+ return os::homepath() + '/' + RTemp;
}
if (Temp == "..") {
return MakeAbsPath(copy);
string const AddPath(string const & path, string const & path_2)
{
string buf;
- string const path2 = os::slashify_path(path_2);
+ string const path2 = os::internal_path(path_2);
if (!path.empty() && path != "." && path != "./") {
- buf = os::slashify_path(path);
+ buf = os::internal_path(path);
if (path[path.length() - 1] != '/')
buf += '/';
}
else
ext = extension;
- return os::slashify_path(oldname.substr(0, last_dot) + ext);
+ return os::internal_path(oldname.substr(0, last_dot) + ext);
}
}
-#if 0
-namespace {
-
-class FormatExtensionsEqual : public std::unary_function<Format, bool> {
-public:
- FormatExtensionsEqual(string const & extension)
- : extension_(extension) {}
- bool operator()(Format const & f) const
- {
- return f.extension() == extension_;
- }
-private:
- string extension_;
-};
-
-} // namespace anon
-#endif
-
-
// the different filetypes and what they contain in one of the first lines
// (dots are any characters). (Herbert 20020131)
// AGR Grace...
// ZIP PK... http://www.halyava.ru/document/ind_arch.htm
// Z \037\235 UNIX compress
-/// return the "extension" which belongs to the contents.
-/// for no knowing contents return the extension. Without
-/// an extension and unknown contents we return "user"
string const getFormatFromContents(string const & filename)
{
// paranoia check
return format;
}
- string const ext(GetExtension(filename));
lyxerr[Debug::GRAPHICS]
<< "filetools(getFormatFromContents)\n"
<< "\tCouldn't find a known format!\n";
-#if 0
- // This just cannot be here. It is a blatant violation of interfaces.
- // Nothing in support should have any knowledge of internal structures
- // in the rest of lyx. This case needs to be explictly checked for
- // in the places where this function is called. Also it makes the
- // function name a lie. (Lgb)
- if (!ext.empty()) {
- // this is ambigous if two formats have the same extension,
- // but better than nothing
- Formats::const_iterator cit =
- find_if(formats.begin(), formats.end(),
- FormatExtensionsEqual(ext));
- if (cit != formats.end()) {
- lyxerr[Debug::GRAPHICS]
- << "\twill guess format from file extension: "
- << ext << " -> " << cit->name() << endl;
- return cit->name();
- }
- }
-#endif
- lyxerr[Debug::GRAPHICS]
- << "\twill use a \"user\" defined format" << endl;
- return "user";
+ return string();
}
{
string str = path;
- string const home(GetEnvPath("HOME"));
+ string const home(os::homepath());
// replace /home/blah with ~/
if (prefixIs(str, home))
bool LyXReadLink(string const & file, string & link, bool resolve)
{
+#ifdef HAVE_READLINK
char linkbuffer[512];
// Should be PATH_MAX but that needs autconf support
int const nRead = ::readlink(file.c_str(),
else
link = linkbuffer;
return true;
+#else
+ return false;
+#endif
}