partial framebox support

[lyx.git] / src / lyxserver.C

diff --git a/src/lyxserver.C b/src/lyxserver.C
index 9f64d8f9be005c9af5a405c00dec14e1371cea67..0c4e152e1e20969c82cf649911afa26deb132db7 100644 (file)
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -41,7 +41,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <cerrno>
-#include FORMS_H_LOCATION
 
 #ifdef __GNUG__
 #pragma implementation
@@ -271,7 +270,9 @@ void LyXComm::read_ready()
        errno = 0;
        int status;
        // the single = is intended here.
-       while ((status = read(infd, charbuf, CMDBUFLEN-1))) {
+       while ((status = read(infd, charbuf, CMDBUFLEN - 1))) {
+               int rerrno = errno;
+ 
                if (status > 0) {
                        charbuf[status]= '\0'; // turn it into a c string
                        lsbuf += rtrim(charbuf, "\r");
@@ -289,15 +290,14 @@ void LyXComm::read_ready()
                                        //\n or not \n?
                        }
                }
-               if (errno == EAGAIN) {
+               if (rerrno == EAGAIN) {
                        errno = 0;
                        return;
                }
-               if (errno != 0) {
-                       lyxerr << "LyXComm: " << strerror(errno) << endl;
-                       if (!lsbuf.empty())
-                       {
-                               lyxerr << "LyxComm: truncated command: "
+               if (rerrno != 0) {
+                       lyxerr << "LyXComm: " << strerror(rerrno) << endl;
+                       if (!lsbuf.empty()) {
+                               lyxerr << "LyXComm: truncated command: "
                                       << lsbuf << endl;
                                lsbuf.erase();
                        }
@@ -504,7 +504,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