#include <unistd.h>
#include <fcntl.h>
#include <cerrno>
-#include FORMS_H_LOCATION
#ifdef __GNUG__
#pragma implementation
return;
if ((outfd = startPipe(outPipeName(), true)) == -1) {
- endPipe(infd, inPipeName());
+ endPipe(infd, inPipeName(), false);
return;
}
return;
}
- endPipe(infd, inPipeName());
- endPipe(outfd, outPipeName());
+ endPipe(infd, inPipeName(), false);
+ endPipe(outfd, outPipeName(), true);
ready = false;
}
}
-void LyXComm::endPipe(int & fd, string const & filename)
+void LyXComm::endPipe(int & fd, string const & filename, bool write)
{
if (fd < 0)
return;
+ if (!write) {
+ lyx_gui::remove_read_callback(fd);
+ }
+
#ifdef __EMX__
APIRET rc;
int errnum;
void LyXComm::emergencyCleanup()
{
if (!pipename.empty()) {
- endPipe(infd, inPipeName());
- endPipe(outfd, outPipeName());
+ endPipe(infd, inPipeName(), false);
+ endPipe(outfd, outPipeName(), true);
}
}
// Receives messages and sends then to client
void LyXComm::read_ready()
{
- if (lyxerr.debugging(Debug::LYXSERVER)) {
- lyxerr << "LyXComm: Receiving from fd " << infd << endl;
- }
+ // nb! make read_buffer_ a class-member for multiple sessions
+ static string read_buffer_;
+ read_buffer_.erase();
- int const CMDBUFLEN = 100;
- char charbuf[CMDBUFLEN];
- string cmd;
-// nb! make lsbuf a class-member for multiple sessions
- static string lsbuf;
+ int const charbuf_size = 100;
+ char charbuf[charbuf_size];
errno = 0;
int status;
// the single = is intended here.
- while ((status = read(infd, charbuf, CMDBUFLEN-1))) {
+ while ((status = ::read(infd, charbuf, charbuf_size - 1))) {
+
if (status > 0) {
- charbuf[status]= '\0'; // turn it into a c string
- lsbuf += strip(charbuf, '\r');
- // commit any commands read
- while (lsbuf.find('\n') != string::npos) {
- // split() grabs the entire string if
- // the delim /wasn't/ found. ?:-P
- lsbuf= split(lsbuf, cmd,'\n');
- lyxerr[Debug::LYXSERVER]
- << "LyXComm: status:" << status
- << ", lsbuf:" << lsbuf
- << ", cmd:" << cmd << endl;
- if (!cmd.empty())
- clientcb(client, cmd);
- //\n or not \n?
- }
- }
- if (errno == EAGAIN) {
- errno = 0;
- return;
- }
- if (errno != 0) {
- lyxerr << "LyXComm: " << strerror(errno) << endl;
- if (!lsbuf.empty())
- {
- lyxerr << "LyxComm: truncated command: "
- << lsbuf << endl;
- lsbuf.erase();
+ charbuf[status] = '\0'; // turn it into a c string
+ read_buffer_ += rtrim(charbuf, "\r");
+
+ } else if (errno != EAGAIN) {
+ if (!read_buffer_.empty()) {
+ lyxerr << "LyXComm: truncated command: "
+ << read_buffer_ << '\n'
+ << "Resetting connection" << endl;
+ read_buffer_.erase();
}
- break; // reset connection
+
+ // reset connection
+ closeConnection();
+ openConnection();
+ break;
+
+ } else {
+ // errno == EAGAIN
+ // Nothing new has arrived, so now's the time
+ // to tell the outside world if there's anything
+ // in the read buffer.
+ break;
}
}
- closeConnection();
- openConnection();
- errno= 0;
+
+ if (!read_buffer_.empty()) {
+ read_buffer_ = rtrim(read_buffer_, "\n");
+ lyxerr[Debug::LYXSERVER]
+ << "LyXComm: Received from fd "
+ << infd << '\n'
+ << '\"' << read_buffer_ << '\"' << endl;
+ clientcb(client, read_buffer_);
+ }
+
+ errno = 0;
}
if (compare(p, "LYXSRV:", 7) == 0) {
server_only = true;
} else if (0 != compare(p, "LYXCMD:", 7)) {
- lyxerr << "LyXServer: Unknown request \"" << p << "\"" << endl;
+ lyxerr << "LyXServer: Unknown request \""
+ << p << '"' << endl;
return;
}
p += 7;
}
} else {
lyxerr <<"LyXServer: Undefined server command "
- << cmd << "." << endl;
+ << cmd << '.' << endl;
}
return;
}
// support currently. (Lgb)
- serv->func->verboseDispatch(cmd + ' ' + arg, false);
+ serv->func->dispatch(cmd + ' ' + arg);
string const rval = serv->func->getMessage();
-
+
//modified june 1999 stefano@zool.su.se:
//all commands produce an INFO or ERROR message
//in the output pipe, even if they do not return
buf = "ERROR:";
else
buf = "INFO:";
- buf += client + ":" + cmd + ":" + rval + "\n";
+ buf += client + ':' + cmd + ':' + rval + '\n';
serv->pipes.send(buf);
// !!! we don't do any error checking -
/* ---F+------------------------------------------------------------------ *\
- Function : LyxNotifyClient
+ Function : LyXNotifyClient
Called by : WorkAreaKeyPress
Purpose : send a notify messge to a client
Parameters: s - string to send