#include <config.h>
#include <cctype>
+
#include <utility>
using std::make_pair;
using std::pair;
#ifdef WITH_WARNINGS
#warning Add proper emx support here!
#endif
- string qname = name;
- while (qname.find("'") != string::npos)
- LSubstring(qname, "'") = "\\'";
- return '\'' + qname + '\'';
+#ifndef __EMX__
+ return '\'' + name + '\'';
+#else
+ return name;
+#endif
}
// -1 error (doesn't exist, no access, anything else)
int IsFileWriteable (string const & path)
{
- FilePtr fp(path, FilePtr::update);
- if (!fp()) {
- if ((errno == EACCES) || (errno == EROFS)) {
- fp.reopen(path, FilePtr::read);
- if (fp()) {
- return 0;
- }
- }
- return -1;
- }
- return 1;
+ FileInfo fi(path);
+ if (fi.access(FileInfo::wperm|FileInfo::rperm)) // read-write
+ return 1;
+ if (fi.readable()) // read-only
+ return 0;
+ return -1; // everything else.
}
_("Could not test if directory is writeable"));
return -1;
} else {
- FilePtr fp(tmpfl, FilePtr::truncate);
- if (!fp()) {
- if (errno == EACCES) {
- return 0;
- } else {
- WriteFSAlert(_("LyX Internal Error!"),
- _("Cannot open directory test file"));
- return -1;
- }
- }
- }
- if (remove(tmpfl.c_str())) {
- WriteFSAlert(_("LyX Internal Error!"),
- _("Created test file but cannot remove it?"));
- return -1;
+ FileInfo fi(path);
+ if (fi.writable()) return 1;
+ return 0;
}
- return 1;
}
// If path entry begins with $$User/, use user_lyxdir
// Example: "$$User/doc;$$LyX/doc"
string FileOpenSearch (string const & path, string const & name,
- string const & ext)
+ string const & ext)
{
string real_file, path_element;
bool notfound = true;
path_element = subst(path_element, "$$User", user_lyxdir);
real_file = FileSearch(path_element, name, ext);
-
+
if (real_file.empty()) {
- do {
- tmppath = split(tmppath, path_element, ';');
- } while(!tmppath.empty() && path_element.empty());
+ do {
+ tmppath = split(tmppath, path_element, ';');
+ } while(!tmppath.empty() && path_element.empty());
} else {
- notfound = false;
+ notfound = false;
}
}
#ifdef __EMX__
name, ext);
if (!fullname.empty())
return fullname;
-
+
if (!build_lyxdir.empty())
fullname = FileSearch(AddPath(build_lyxdir, dir),
name, ext);
if (!fullname.empty())
return fullname;
-
+
return FileSearch(AddPath(system_lyxdir, dir), name, ext);
}
string const & ext)
{
string lang = token(string(GetEnv("LANG")), '_', 0);
-
+
if (lang.empty() || lang == "C")
return LibFileSearch(dir, name, ext);
else {
string tmp = LibFileSearch(dir, lang + '_' + name,
- ext);
+ ext);
if (!tmp.empty())
return tmp;
else
// this leaks, but what can we do about it?
// Is doing a getenv() and a free() of the older value
// a good idea? (JMarc)
- int retval = putenv((new string(envstr))->c_str());
+ // Actually we don't have to leak...calling putenv like this
+ // should be enough: ... and this is obviously not enough if putenv
+ // does not make a copy of the string. It is also not very wise to
+ // put a string on the free store. If we have to leak we should do it
+ // like this:
+ char * leaker = new char[envstr.length() + 1];
+ envstr.copy(leaker, envstr.length());
+ leaker[envstr.length()] = '\0';
+ int retval = lyx::putenv(leaker);
+
+ // If putenv does not make a copy of the char const * this
+ // is very dangerous. OTOH if it does take a copy this is the
+ // best solution.
+ // The only implementation of putenv that I have seen does not
+ // allocate memory. _And_ after testing the putenv in glibc it
+ // seems that we need to make a copy of the string contents.
+ // I will enable the above.
+ //int retval = lyx::putenv(envstr.c_str());
#else
#ifdef HAVE_SETENV
string varname;
static
int DeleteAllFilesInDir (string const & path)
{
+ // I have decided that we will be using parts from the boost
+ // library. Check out http://www.boost.org/
+ // For directory access we will then use the directory_iterator.
+ // Then the code will be something like:
+ // directory_iterator dit(path.c_str());
+ // if (<some way to detect failure>) {
+ // WriteFSAlert(_("Error! Cannot open directory:"), path);
+ // return -1;
+ // }
+ // for (; dit != <someend>; ++dit) {
+ // if ((*dit) == 2." || (*dit) == "..")
+ // continue;
+ // string unlinkpath = AddName(path, temp);
+ // if (remove(unlinkpath.c_str()))
+ // WriteFSAlert(_("Error! Could not remove file:"),
+ // unlinkpath);
+ // }
+ // return 0;
DIR * dir = opendir(path.c_str());
if (!dir) {
WriteFSAlert (_("Error! Cannot open directory:"), path);
{
string tmpfl = TmpFileName(tempdir, mask);
- if ((tmpfl.empty()) || mkdir (tmpfl.c_str(), 0777)) {
+ if ((tmpfl.empty()) || lyx::mkdir (tmpfl.c_str(), 0777)) {
WriteFSAlert(_("Error! Couldn't create temporary directory:"),
tempdir);
return string();
string CreateLyXTmpDir (string const & deflt)
{
if ((!deflt.empty()) && (deflt != "/tmp")) {
- if (mkdir(deflt.c_str(), 0777)) {
+ if (lyx::mkdir(deflt.c_str(), 0777)) {
#ifdef __EMX__
Path p(user_lyxdir);
#endif
return false;
}
- if (mkdir(temp.c_str(), permission)) {
+ if (lyx::mkdir(temp.c_str(), permission)) {
WriteFSAlert (_("Error! Couldn't create directory:"), temp);
return false;
}
int j = i;
while (j < baselen) {
if (basepath[j] == '/') {
- if (j+1 == baselen) break;
+ if (j + 1 == baselen) break;
buf += "../";
}
++j;
bool no_path)
{
string::size_type last_slash = oldname.rfind('/');
- string::size_type last_dot;
- if (last_slash != string::npos)
- last_dot = oldname.find('.', last_slash);
- else
- last_dot = oldname.rfind('.');
-
+ string::size_type last_dot = oldname.rfind('.');
+ if (last_dot < last_slash && last_slash != string::npos)
+ last_dot = string::npos;
+
string ext;
// Make sure the extension starts with a dot
if (!extension.empty() && extension[0] != '.')
typedef pair<int, string> cmdret;
-static cmdret do_popen(string const & cmd)
+static
+cmdret do_popen(string const & cmd)
{
// One question is if we should use popen or
// create our own popen based on fork, exec, pipe
// of course the best would be to have a
// pstream (process stream), with the
- // variants ipstream, opstream and
+ // variants ipstream, opstream
FILE * inf = popen(cmd.c_str(), "r");
string ret;
int c = fgetc(inf);
}
-string findtexfile(string const & fil, string const & format)
+string 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
Lgb
*/
- // If fil is a file with absolute path we just return it
- if (AbsolutePath(fil)) return fil;
-
- // Check in the current dir.
- if (FileInfo(OnlyFilename(fil)).exist())
- return OnlyFilename(fil);
-
+ // If the file can be found directly, we just return a
+ // absolute path version of it.
+ if (FileInfo(fil).exist())
+ return MakeAbsPath(fil);
+
// No we try to find it using kpsewhich.
- string kpsecmd = "kpsewhich --format= " + format + " " + OnlyFilename(fil);
+ // 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
+ // from the name given, by looking for a known extension. If no
+ // known extension is found, the search path for TeX source files
+ // is used."
+ // However, we want to take advantage of the format sine almost all
+ // the different formats has environment variables that can be used
+ // to controll which paths to search. f.ex. bib looks in
+ // BIBINPUTS and TEXBIB. Small list follows:
+ // bib - BIBINPUTS, TEXBIB
+ // bst - BSTINPUTS
+ // graphic/figure - TEXPICTS, TEXINPUTS
+ // ist - TEXINDEXSTYLE, INDEXSTYLE
+ // pk - PROGRAMFONTS, PKFONTS, TEXPKS, GLYPHFONTS, TEXFONTS
+ // tex - TEXINPUTS
+ // tfm - TFMFONTS, TEXFONTS
+ // This means that to use kpsewhich in the best possible way we
+ // should help it by setting additional path in the approp. envir.var.
+ string kpsecmd = "kpsewhich " + fil;
+
cmdret c = do_popen(kpsecmd);
lyxerr[Debug::LATEX] << "kpse status = " << c.first << "\n"
projects / lyx.git / blobdiff