X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxserver.C;h=d7044b146ff524976a148014c40cc83271d52fb3;hb=dad1fc66e44a4dad94eb1e9ffd5736bf8f59ae6d;hp=db90e4619032e6d726c2810092531afce1c5deb2;hpb=98324cb046087c6e976146f2e9240920532d7eb7;p=lyx.git

diff --git a/src/lyxserver.C b/src/lyxserver.C
index db90e46190..d7044b146f 100644
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -41,11 +41,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <cerrno>
-#include FORMS_H_LOCATION
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "lyxserver.h"
 #include "lyx_main.h"
@@ -99,7 +94,7 @@ void LyXComm::openConnection()
 		return;
 
 	if ((outfd = startPipe(outPipeName(), true)) == -1) {
-		endPipe(infd, inPipeName());
+		endPipe(infd, inPipeName(), false);
 		return;
 	}
 
@@ -132,8 +127,8 @@ void LyXComm::closeConnection()
 		return;
 	}
 
-	endPipe(infd, inPipeName());
-	endPipe(outfd, outPipeName());
+	endPipe(infd, inPipeName(), false);
+	endPipe(outfd, outPipeName(), true);
 
 	ready = false;
 }
@@ -207,11 +202,15 @@ int LyXComm::startPipe(string const & filename, bool write)
 }
 
 
-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;
@@ -245,8 +244,8 @@ void LyXComm::endPipe(int & fd, string const & filename)
 void LyXComm::emergencyCleanup()
 {
 	if (!pipename.empty()) {
-		endPipe(infd, inPipeName());
-		endPipe(outfd, outPipeName());
+		endPipe(infd, inPipeName(), false);
+		endPipe(outfd, outPipeName(), true);
 	}
 }
 
@@ -254,31 +253,30 @@ void LyXComm::emergencyCleanup()
 // 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');
+			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);
@@ -291,18 +289,20 @@ void LyXComm::read_ready()
 		}
 		if (errno != 0) {
 			lyxerr << "LyXComm: " << strerror(errno) << endl;
-			if (!lsbuf.empty())
-			{
-				lyxerr << "LyxComm: truncated command: "
-				       << lsbuf << endl;
-				lsbuf.erase();
+			if (!read_buffer_.empty()) {
+				lyxerr << "LyXComm: truncated command: "
+				       << 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;
 }
 
 
@@ -382,7 +382,8 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
 		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;
@@ -458,7 +459,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
 				}
 			} else {
 				lyxerr <<"LyXServer: Undefined server command "
-				       << cmd << "." << endl;
+				       << cmd << '.' << endl;
 			}
 			return;
 		}
@@ -474,7 +475,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
 
 			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
@@ -484,7 +485,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
 				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 -
@@ -500,7 +501,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
 
 
 /* ---F+------------------------------------------------------------------ *\
-   Function  : LyxNotifyClient
+   Function  : LyXNotifyClient
    Called by : WorkAreaKeyPress
    Purpose   : send a notify messge to a client
    Parameters: s - string to send