#include <fcntl.h>
#include <cerrno>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "lyxserver.h"
#include "lyx_main.h"
#include "debug.h"
if (!write) {
lyx_gui::remove_read_callback(fd);
}
-
+
#ifdef __EMX__
APIRET rc;
int errnum;
// 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))) {
- int rerrno = errno;
-
+ while ((status = ::read(infd, charbuf, charbuf_size - 1))) {
+
if (status > 0) {
- charbuf[status]= '\0'; // turn it into a c string
- lsbuf += rtrim(charbuf, "\r");
+ charbuf[status] = '\0'; // turn it into a c string
+ read_buffer_ += rtrim(charbuf, "\r");
// commit any commands read
- while (lsbuf.find('\n') != string::npos) {
+ while (read_buffer_.find('\n') != string::npos) {
// split() grabs the entire string if
// the delim /wasn't/ found. ?:-P
- lsbuf= split(lsbuf, cmd,'\n');
+ string cmd;
+ read_buffer_= split(read_buffer_, cmd,'\n');
lyxerr[Debug::LYXSERVER]
<< "LyXComm: status:" << status
- << ", lsbuf:" << lsbuf
+ << ", read_buffer_:" << read_buffer_
<< ", cmd:" << cmd << endl;
if (!cmd.empty())
clientcb(client, cmd);
//\n or not \n?
}
}
- if (rerrno == EAGAIN) {
+ if (errno == EAGAIN) {
errno = 0;
return;
}
- if (rerrno != 0) {
- lyxerr << "LyXComm: " << strerror(rerrno) << endl;
- if (!lsbuf.empty()) {
+ if (errno != 0) {
+ lyxerr << "LyXComm: " << strerror(errno) << endl;
+ if (!read_buffer_.empty()) {
lyxerr << "LyXComm: truncated command: "
- << lsbuf << endl;
- lsbuf.erase();
+ << read_buffer_ << endl;
+ read_buffer_.erase();
}
break; // reset connection
}
}
+
+ // The connection gets reset in errno != EAGAIN
+ // Why does it need to be reset if errno == 0?
closeConnection();
openConnection();
- errno= 0;
+ 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;
}
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 -