#include <cctype>
#include <utility>
+#include <fstream>
+
+#include "Lsstream.h"
#ifdef __GNUG__
#pragma implementation "filetools.h"
using std::make_pair;
using std::pair;
using std::endl;
+using std::ifstream;
+
+#if 0
+using std::getenv;
+using std::isalpha;
+using std::isalnum;
+using std::popen;
+#endif
extern string system_lyxdir;
extern string build_lyxdir;
// Substitutes spaces with underscores in filename (and path)
-string MakeLatexName(string const & file)
+string const MakeLatexName(string const & file)
{
string name = OnlyFilename(file);
- string path = OnlyPath(file);
+ string const path = OnlyPath(file);
for (string::size_type i = 0; i < name.length(); ++i) {
name[i] &= 0x7f; // set 8th bit to 0
};
// ok so we scan through the string twice, but who cares.
- string keep("abcdefghijklmnopqrstuvwxyz"
+ string const keep("abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"@!\"'()*+,-./0123456789:;<=>?[]`|");
return AddName(path, name);
}
+
// Substitutes spaces with underscores in filename (and path)
-string QuoteName(string const & name)
+string const QuoteName(string const & name)
{
-#ifdef WITH_WARNINGS
-#warning Add proper emx support here!
-#endif
+ // CHECK Add proper emx support here!
#ifndef __EMX__
- return '\'' + name + '\'';
+ return "\'" + name + "\'";
#else
return name;
#endif
}
-/// Returns an unique name to be used as a temporary file.
-string TmpFileName(string const & dir, string const & mask)
+// Returns an unique name to be used as a temporary file.
+string const TmpFileName(string const & dir, string const & mask)
{// With all these temporary variables, it should be safe enough :-) (JMarc)
string tmpdir;
if (dir.empty())
tmpdir = system_tempdir;
else
tmpdir = dir;
- string tmpfl = AddName(tmpdir, mask);
+ string tmpfl(AddName(tmpdir, mask));
// find a uniq postfix for the filename...
// using the pid, and...
// -1: error- couldn't find out
int IsDirWriteable (string const & path)
{
- string tmpfl = TmpFileName(path);
+ string const tmpfl(TmpFileName(path));
if (tmpfl.empty()) {
WriteFSAlert(_("LyX Internal Error!"),
// If path entry begins with $$LyX/, use system_lyxdir
// 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 FileOpenSearch (string const & path, string const & name,
+ string const & ext)
{
string real_file, path_element;
bool notfound = true;
// Returns the real name of file name in directory path, with optional
// extension ext.
-string FileSearch(string const & path, string const & name,
- string const & ext)
+string const FileSearch(string const & path, string const & name,
+ string const & ext)
{
// if `name' is an absolute path, we ignore the setting of `path'
// Expand Environmentvariables in 'name'
- string tmpname = ReplaceEnvironmentPath(name);
+ string const tmpname = ReplaceEnvironmentPath(name);
string fullname = MakeAbsPath(tmpname, path);
// search first without extension, then with it.
// 1) user_lyxdir
// 2) build_lyxdir (if not empty)
// 3) system_lyxdir
-string LibFileSearch(string const & dir, string const & name,
- string const & ext)
+string const LibFileSearch(string const & dir, string const & name,
+ string const & ext)
{
string fullname = FileSearch(AddPath(user_lyxdir, dir),
name, ext);
}
-string i18nLibFileSearch(string const & dir, string const & name,
- string const & ext)
+string const
+i18nLibFileSearch(string const & dir, string const & name,
+ string const & ext)
{
- string lang = token(string(GetEnv("LANG")), '_', 0);
+ string const lang = token(string(GetEnv("LANG")), '_', 0);
if (lang.empty() || lang == "C")
return LibFileSearch(dir, name, ext);
else {
- string tmp = LibFileSearch(dir, lang + '_' + name,
- ext);
+ string const tmp = LibFileSearch(dir, lang + '_' + name,
+ ext);
if (!tmp.empty())
return tmp;
else
}
-string GetEnv(string const & envname)
+string const GetEnv(string const & envname)
{
// f.ex. what about error checking?
char const * const ch = getenv(envname.c_str());
- string envstr = !ch ? "" : ch;
+ string const envstr = !ch ? "" : ch;
return envstr;
}
-string GetEnvPath(string const & name)
+string const GetEnvPath(string const & name)
{
#ifndef __EMX__
- string pathlist = subst(GetEnv(name), ':', ';');
+ string const pathlist = subst(GetEnv(name), ':', ';');
#else
- string pathlist = subst(GetEnv(name), '\\', '/');
+ string const pathlist = subst(GetEnv(name), '\\', '/');
#endif
return strip(pathlist, ';');
}
bool PutEnv(string const & envstr)
{
-#ifdef WITH_WARNINGS
-#warning Look at and fix this.
-#endif
+ // CHECK Look at and fix this.
// f.ex. what about error checking?
+
#if HAVE_PUTENV
// this leaks, but what can we do about it?
// Is doing a getenv() and a free() of the older value
char * leaker = new char[envstr.length() + 1];
envstr.copy(leaker, envstr.length());
leaker[envstr.length()] = '\0';
- int retval = lyx::putenv(leaker);
+ int const 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
#else
#ifdef HAVE_SETENV
string varname;
- string str = envstr.split(varname,'=');
- int retval = setenv(varname.c_str(), str.c_str(), true);
+ string const str = envstr.split(varname,'=');
+ int const retval = ::setenv(varname.c_str(), str.c_str(), true);
+#else
+ // No environment setting function. Can this happen?
+ int const retval = 1; //return an error condition.
#endif
#endif
return retval == 0;
// 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>) {
+ // directory_iterator dit(path);
+ // directory_iterator dend;
+ // if (dit == dend) {
// WriteFSAlert(_("Error! Cannot open directory:"), path);
// return -1;
// }
- // for (; dit != <someend>; ++dit) {
- // if ((*dit) == 2." || (*dit) == "..")
+ // for (; dit != dend; ++dit) {
+ // string filename(*dit);
+ // if (filename == "." || filename == "..")
// continue;
- // string unlinkpath = AddName(path, temp);
- // if (remove(unlinkpath.c_str()))
+ // string unlinkpath(AddName(path, filename));
+ // if (lyx::unlink(unlinkpath))
// WriteFSAlert(_("Error! Could not remove file:"),
// unlinkpath);
// }
// return 0;
- DIR * dir = opendir(path.c_str());
+ DIR * dir = ::opendir(path.c_str());
if (!dir) {
WriteFSAlert (_("Error! Cannot open directory:"), path);
return -1;
}
struct dirent * de;
+ int return_value = 0;
while ((de = readdir(dir))) {
- string temp = de->d_name;
+ string const temp = de->d_name;
if (temp == "." || temp == "..")
continue;
- string unlinkpath = AddName (path, temp);
+ string const unlinkpath = AddName (path, temp);
lyxerr.debug() << "Deleting file: " << unlinkpath << endl;
- if (remove(unlinkpath.c_str()))
+ bool deleted = true;
+ if (FileInfo(unlinkpath).isDir())
+ deleted = (DeleteAllFilesInDir(unlinkpath) == 0);
+ deleted &= (lyx::unlink(unlinkpath) == 0);
+ if (!deleted) {
WriteFSAlert (_("Error! Could not remove file:"),
unlinkpath);
+ return_value = -1;
+ }
}
closedir(dir);
- return 0;
+ return return_value;
}
static
-string CreateTmpDir (string const & tempdir, string const & mask)
+string const CreateTmpDir(string const & tempdir, string const & mask)
{
- string tmpfl = TmpFileName(tempdir, mask);
+ string const tmpfl(TmpFileName(tempdir, mask));
- if ((tmpfl.empty()) || lyx::mkdir (tmpfl.c_str(), 0777)) {
+ if ((tmpfl.empty()) || lyx::mkdir(tmpfl, 0777)) {
WriteFSAlert(_("Error! Couldn't create temporary directory:"),
tempdir);
return string();
static
-int DestroyTmpDir (string const & tmpdir, bool Allfiles)
+int DestroyTmpDir(string const & tmpdir, bool Allfiles)
{
#ifdef __EMX__
Path p(user_lyxdir);
#endif
if (Allfiles && DeleteAllFilesInDir(tmpdir)) return -1;
- if (rmdir(tmpdir.c_str())) {
+ if (lyx::rmdir(tmpdir)) {
WriteFSAlert(_("Error! Couldn't delete temporary directory:"),
tmpdir);
return -1;
}
-string CreateBufferTmpDir (string const & pathfor)
+string const CreateBufferTmpDir(string const & pathfor)
{
return CreateTmpDir(pathfor, "lyx_bufrtmp");
}
-int DestroyBufferTmpDir (string const & tmpdir)
+int DestroyBufferTmpDir(string const & tmpdir)
{
return DestroyTmpDir(tmpdir, true);
}
-string CreateLyXTmpDir (string const & deflt)
+string const CreateLyXTmpDir(string const & deflt)
{
if ((!deflt.empty()) && (deflt != "/tmp")) {
- if (lyx::mkdir(deflt.c_str(), 0777)) {
+ if (lyx::mkdir(deflt, 0777)) {
#ifdef __EMX__
Path p(user_lyxdir);
#endif
- string t = CreateTmpDir (deflt.c_str(), "lyx_tmp");
+ string const t(CreateTmpDir(deflt, "lyx_tmp"));
return t;
} else
return deflt;
#ifdef __EMX__
Path p(user_lyxdir);
#endif
- string t = CreateTmpDir ("/tmp", "lyx_tmp");
+ string const t(CreateTmpDir("/tmp", "lyx_tmp"));
return t;
}
}
// Creates directory. Returns true if succesfull
bool createDirectory(string const & path, int permission)
{
- string temp = strip(CleanupPath(path), '/');
+ string temp(strip(CleanupPath(path), '/'));
if (temp.empty()) {
WriteAlert(_("Internal error!"),
return false;
}
- if (lyx::mkdir(temp.c_str(), permission)) {
+ if (lyx::mkdir(temp, permission)) {
WriteFSAlert (_("Error! Couldn't create directory:"), temp);
return false;
}
// Returns current working directory
-string GetCWD ()
+string const GetCWD ()
{
int n = 256; // Assume path is less than 256 chars
char * err;
char * tbuf = new char[n];
// Safe. Hopefully all getcwds behave this way!
- while (((err = lyx::getcwd (tbuf, n)) == 0) && (errno == ERANGE)) {
+ while (((err = lyx::getcwd(tbuf, n)) == 0) && (errno == ERANGE)) {
// Buffer too small, double the buffersize and try again
delete[] tbuf;
n = 2 * n;
// Strip filename from path name
-string OnlyPath(string const & Filename)
+string const OnlyPath(string const & Filename)
{
// If empty filename, return empty
if (Filename.empty()) return Filename;
// 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 MakeAbsPath(string const & RelPath, string const & BasePath)
+string const MakeAbsPath(string const & RelPath, string const & BasePath)
{
// checks for already absolute path
if (AbsolutePath(RelPath))
#ifdef __EMX__
- if(RelPath[0]!= '/' && RelPath[0]!= '\\')
+ if (RelPath[0]!= '/' && RelPath[0]!= '\\')
#endif
return RelPath;
// Copies given paths
- string TempRel = CleanupPath(RelPath);
+ string TempRel(CleanupPath(RelPath));
string TempBase;
TempBase.erase(TempBase.length() - 2);
// processes relative path
- string RTemp = TempRel;
+ string RTemp(TempRel);
string Temp;
while (!RTemp.empty()) {
if (Temp == ".") continue;
if (Temp == "..") {
// Remove one level of TempBase
- int i = TempBase.length() - 2;
+ string::difference_type i = TempBase.length() - 2;
#ifndef __EMX__
if (i < 0) i = 0;
while (i > 0 && TempBase[i] != '/') --i;
// Correctly append filename to the pathname.
// If pathname is '.', then don't use pathname.
// Chops any path of filename.
-string AddName(string const & path, string const & fname)
+string const AddName(string const & path, string const & fname)
{
// Get basename
- string basename = OnlyFilename(fname);
+ string const basename(OnlyFilename(fname));
string buf;
// Strips path from filename
-string OnlyFilename(string const & fname)
+string const OnlyFilename(string const & fname)
{
if (fname.empty())
return fname;
// Create absolute path. If impossible, don't do anything
// Supports ./ and ~/. Later we can add support for ~logname/. (Asger)
-string ExpandPath(string const & path)
+string const ExpandPath(string const & path)
{
// checks for already absolute path
- string RTemp = ReplaceEnvironmentPath(path);
+ string RTemp(ReplaceEnvironmentPath(path));
if (AbsolutePath(RTemp))
return RTemp;
string Temp;
- string copy(RTemp);
+ string const copy(RTemp);
// Split by next /
- RTemp= split(RTemp, Temp, '/');
+ RTemp = split(RTemp, Temp, '/');
if (Temp == ".") {
return GetCWD() + '/' + RTemp;
// Normalize a path
// Constracts path/../path
// Can't handle "../../" or "/../" (Asger)
-string NormalizePath(string const & path)
+string const NormalizePath(string const & path)
{
string TempBase;
string RTemp;
TempBase = "./";
} else if (Temp == "..") {
// Remove one level of TempBase
- int i = TempBase.length() - 2;
+ string::difference_type i = TempBase.length() - 2;
while (i > 0 && TempBase[i] != '/')
--i;
if (i >= 0 && TempBase[i] == '/')
return TempBase;
}
-string CleanupPath(string const & path)
+
+string const CleanupPath(string const & path)
{
#ifdef __EMX__ /* SMiyata: This should fix searchpath bug. */
string temppath = subst(path, '\\', '/');
}
+string const GetFileContents(string const & fname)
+{
+ FileInfo finfo(fname);
+ if (finfo.exist()) {
+ ifstream ifs(fname.c_str());
+ std::ostringstream ofs;
+ if (ifs && ofs) {
+ ofs << ifs.rdbuf();
+ ifs.close();
+ return ofs.str().c_str();
+ }
+ }
+ lyxerr << "LyX was not able to read file '" << fname << "'" << endl;
+ return string();
+}
+
+
//
// Search ${...} as Variable-Name inside the string and replace it with
// the denoted environmentvariable
// variable := '$' '{' [A-Za-z_]{[A-Za-z_0-9]*} '}'
//
-string ReplaceEnvironmentPath(string const & path)
+string const ReplaceEnvironmentPath(string const & path)
{
//
// CompareChar: Environmentvariables starts with this character
if (!regexMatch(copy1, RegExp)) {
// No EndChar inside. So we are finished
result1 += CompareString + result0;
- result0.clear();
+ result0.erase();
continue;
}
continue;
}
- string env = GetEnv(res1_contents+1);
+ string env(GetEnv(res1_contents + 1));
if (!env.empty()) {
// Congratulations. Environmentvariable found
result1 += env;
// Make relative path out of two absolute paths
-string MakeRelPath(string const & abspath0, string const & basepath0)
+string const MakeRelPath(string const & abspath0, string const & basepath0)
// Makes relative path out of absolute path. If it is deeper than basepath,
// it's easy. If basepath and abspath share something (they are all deeper
// than some directory), it'll be rendered using ..'s. If they are completely
if (abspath.empty())
return "<unknown_path>";
- const int abslen = abspath.length();
- const int baselen = basepath.length();
+ string::size_type const abslen = abspath.length();
+ string::size_type const baselen = basepath.length();
// Find first different character
- int i = 0;
+ string::size_type i = 0;
while (i < abslen && i < baselen && abspath[i] == basepath[i]) ++i;
// Go back to last /
// Count how many dirs there are in basepath above match
// and append as many '..''s into relpath
string buf;
- int j = i;
+ string::size_type j = i;
while (j < baselen) {
if (basepath[j] == '/') {
if (j + 1 == baselen) break;
// Append sub-directory(ies) to a path in an intelligent way
-string AddPath(string const & path, string const & path_2)
+string const AddPath(string const & path, string const & path_2)
{
string buf;
- string path2 = CleanupPath(path_2);
+ string const path2 = CleanupPath(path_2);
if (!path.empty() && path != "." && path != "./") {
buf = CleanupPath(path);
}
if (!path2.empty()){
- int p2start = path2.find_first_not_of('/');
+ string::size_type p2start = path2.find_first_not_of('/');
- int p2end = path2.find_last_not_of('/');
+ string::size_type p2end = path2.find_last_not_of('/');
string tmp = path2.substr(p2start, p2end - p2start + 1);
buf += tmp + '/';
Strips path off if no_path == true.
If no extension on oldname, just appends.
*/
-string ChangeExtension(string const & oldname, string const & extension,
- bool no_path)
+string const
+ChangeExtension(string const & oldname, string const & extension)
{
- string::size_type last_slash = oldname.rfind('/');
+ string::size_type const last_slash = 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] != '.')
- ext= '.' + extension;
+ ext= "." + extension;
else
ext = extension;
- string ret_str;
- if (no_path && last_slash != string::npos) {
- ++last_slash; // step it
- ret_str = oldname.substr(last_slash,
- last_dot - last_slash) + ext;
- } else
- ret_str = oldname.substr(0, last_dot) + ext;
- return CleanupPath(ret_str);
+
+ return CleanupPath(oldname.substr(0, last_dot) + ext);
+}
+
+
+/// Return the extension of the file (not including the .)
+string const GetExtension(string const & name)
+{
+ string::size_type const last_slash = name.rfind('/');
+ string::size_type const last_dot = name.rfind('.');
+ if (last_dot != string::npos &&
+ (last_slash == string::npos || last_dot > last_slash))
+ return name.substr(last_dot + 1,
+ name.length() - (last_dot + 1));
+ else
+ return string();
}
// Creates a nice compact path for displaying
-string MakeDisplayPath (string const & path, unsigned int threshold)
+string const
+MakeDisplayPath (string const & path, unsigned int threshold)
{
- const int l1 = path.length();
+ string::size_type const l1 = path.length();
// First, we try a relative path compared to home
- string home = GetEnvPath("HOME");
+ string const home(GetEnvPath("HOME"));
string relhome = MakeRelPath(path, home);
- unsigned int l2 = relhome.length();
+ string::size_type l2 = relhome.length();
string prefix;
{
char LinkBuffer[512];
// Should be PATH_MAX but that needs autconf support
- int nRead = readlink(File.c_str(), LinkBuffer, sizeof(LinkBuffer)-1);
+ int const nRead = ::readlink(File.c_str(),
+ LinkBuffer, sizeof(LinkBuffer) - 1);
if (nRead <= 0)
return false;
LinkBuffer[nRead] = 0;
typedef pair<int, string> cmdret;
static
-cmdret do_popen(string const & cmd)
+cmdret const 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
- FILE * inf = popen(cmd.c_str(), "r");
+ FILE * inf = ::popen(cmd.c_str(), "r");
string ret;
int c = fgetc(inf);
while (c != EOF) {
}
-string findtexfile(string const & fil, string const & /*format*/)
+string 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
// 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;
+ string const kpsecmd = "kpsewhich " + fil;
- cmdret c = do_popen(kpsecmd);
+ cmdret const c = do_popen(kpsecmd);
lyxerr[Debug::LATEX] << "kpse status = " << c.first << "\n"
<< "kpse result = `" << strip(c.second, '\n')
<< "'" << endl;
return c.first != -1 ? strip(c.second, '\n') : string();
}
+
+
+void removeAutosaveFile(string const & filename)
+{
+ string a = OnlyPath(filename);
+ a += '#';
+ a += OnlyFilename(filename);
+ a += '#';
+ FileInfo fileinfo(a);
+ if (fileinfo.exist()) {
+ if (lyx::unlink(a) != 0) {
+ WriteFSAlert(_("Could not delete auto-save file!"), a);
+ }
+ }
+}
projects / lyx.git / blobdiff