anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes to lyxserver from John

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3012 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2001-11-12 17:43:21 +00:00
parent c12d116ce7
commit 5843696fe9
3 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2001-11-12 John Levon <moz@compsoc.man.ac.uk>
* lyxserver.h:
* lyxserver.C: fix it. and small cleanup.
2001-11-07 John Levon <moz@compsoc.man.ac.uk> 2001-11-07 John Levon <moz@compsoc.man.ac.uk>
* BufferView_pimpl.C: use inline helpers * BufferView_pimpl.C: use inline helpers

27
src/lyxserver.C
View File

@ -110,16 +110,16 @@ void LyXComm::openConnection()
if (pipename.empty()) return; if (pipename.empty()) return;
if ((infd = startPipe(pipename + ".in")) == -1) if ((infd = startPipe(inPipeName(), false)) == -1)
return; return;
if ((outfd = startPipe(pipename + ".out")) == -1) { if ((outfd = startPipe(outPipeName(), true)) == -1) {
endPipe(infd, pipename + ".in"); endPipe(infd, inPipeName());
return; return;
} }
if (fcntl(outfd, F_SETFL, O_NONBLOCK) < 0) { if (fcntl(outfd, F_SETFL, O_NONBLOCK) < 0) {
lyxerr << "LyXComm: Could not set flags on pipe " << pipename << ".out" lyxerr << "LyXComm: Could not set flags on pipe " << outPipeName()
<< '\n' << strerror(errno) << endl; << '\n' << strerror(errno) << endl;
return; return;
} }
@ -144,13 +144,13 @@ void LyXComm::closeConnection()
return; return;
} }
endPipe(infd, pipename + ".in"); endPipe(infd, inPipeName());
endPipe(outfd, pipename + ".out"); endPipe(outfd, outPipeName());
ready = false; ready = false;
} }
int LyXComm::startPipe(string const & filename) int LyXComm::startPipe(string const & filename, bool write)
{ {
int fd; int fd;
@ -201,7 +201,7 @@ int LyXComm::startPipe(string const & filename)
<< strerror(errno) << endl; << strerror(errno) << endl;
return -1; return -1;
}; };
fd = ::open(filename.c_str(), O_RDONLY|O_NONBLOCK); fd = ::open(filename.c_str(), write ? (O_RDWR) : (O_RDONLY|O_NONBLOCK));
#endif #endif
if (fd < 0) { if (fd < 0) {
@ -210,7 +210,10 @@ int LyXComm::startPipe(string const & filename)
lyx::unlink(filename); lyx::unlink(filename);
return -1; return -1;
} }
fl_add_io_callback(fd, FL_READ, C_LyXComm_callback, this);
if (!write)
fl_add_io_callback(fd, FL_READ, C_LyXComm_callback, this);
return fd; return fd;
} }
@ -252,8 +255,8 @@ void LyXComm::endPipe(int & fd, string const & filename)
void LyXComm::emergencyCleanup() void LyXComm::emergencyCleanup()
{ {
endPipe(infd, pipename + ".in"); endPipe(infd, inPipeName());
endPipe(outfd, pipename + ".out"); endPipe(outfd, outPipeName());
} }
@ -399,7 +402,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
if (compare(p, "LYXSRV:", 7) == 0) { if (compare(p, "LYXSRV:", 7) == 0) {
server_only = true; server_only = true;
} else if (0 != compare(p, "LYXCMD:", 7)) { } else if (0 != compare(p, "LYXCMD:", 7)) {
lyxerr << "LyXServer: Unknown request" << endl; lyxerr << "LyXServer: Unknown request \"" << p << "\"" << endl;
return; return;
} }
p += 7; p += 7;

12
src/lyxserver.h
View File

@ -59,6 +59,16 @@ public:
static void callback(int fd, void *v); static void callback(int fd, void *v);
private: private:
/// the filename of the in pipe
string const inPipeName() {
return pipename + ".in";
}
/// the filename of the out pipe
string const outPipeName() {
return pipename + ".out";
}
/// Open pipes /// Open pipes
void openConnection(); void openConnection();
@ -66,7 +76,7 @@ private:
void closeConnection(); void closeConnection();
/// start a pipe /// start a pipe
int startPipe(string const &); int startPipe(string const &, bool);
/// finish a pipe /// finish a pipe
void endPipe(int &, string const &); void endPipe(int &, string const &);