#include "LyXAction.h"
#include "lyxfunc.h"
#include "frontends/Application.h"
+
+#include "support/filename.h"
#include "support/lstrings.h"
#include "support/lyxlib.h"
#endif
#include <fcntl.h>
-using lyx::support::compare;
-using lyx::support::rtrim;
-using lyx::support::split;
-using lyx::support::unlink;
+
+namespace lyx {
+
+using support::compare;
+using support::FileName;
+using support::rtrim;
+using support::split;
+using support::unlink;
using std::endl;
using std::string;
}
-int LyXComm::startPipe(string const & filename, bool write)
+int LyXComm::startPipe(string const & file, bool write)
{
- if (::access(filename.c_str(), F_OK) == 0) {
+ FileName const filename(file);
+ if (::access(filename.toFilesystemEncoding().c_str(), F_OK) == 0) {
lyxerr << "LyXComm: Pipe " << filename << " already exists.\n"
<< "If no other LyX program is active, please delete"
" the pipe by hand and try again." << endl;
return -1;
}
- if (::mkfifo(filename.c_str(), 0600) < 0) {
+ if (::mkfifo(filename.toFilesystemEncoding().c_str(), 0600) < 0) {
lyxerr << "LyXComm: Could not create pipe " << filename << '\n'
<< strerror(errno) << endl;
return -1;
};
- int const fd = ::open(filename.c_str(),
+ int const fd = ::open(filename.toFilesystemEncoding().c_str(),
write ? (O_RDWR) : (O_RDONLY|O_NONBLOCK));
if (fd < 0) {
}
if (!write) {
- theApp->registerSocketCallback(fd,
+ theApp()->registerSocketCallback(fd,
boost::bind(&LyXComm::read_ready, this));
}
return;
if (!write) {
- theApp->unregisterSocketCallback(fd);
+ theApp()->unregisterSocketCallback(fd);
}
if (::close(fd) < 0) {
<< '\n' << strerror(errno) << endl;
}
- if (unlink(filename) < 0) {
+ if (unlink(FileName(filename)) < 0) {
lyxerr << "LyXComm: Could not remove pipe " << filename
<< '\n' << strerror(errno) << endl;
};
serv->func->dispatch(FuncRequest(lyxaction.lookupFunc(cmd), arg));
- string const rval = lyx::to_utf8(serv->func->getMessage());
+ string const rval = to_utf8(serv->func->getMessage());
//modified june 1999 stefano@zool.su.se:
//all commands produce an INFO or ERROR message
string buf = string("NOTIFY:") + s + "\n";
pipes.send(buf);
}
+
+
+} // namespace lyx