Point fix, earlier forgotten

[lyx.git] / src / lyxserver.C

diff --git a/src/lyxserver.C b/src/lyxserver.C
index 35d9829e6bc6016d73473c070302966598139ab5..ce70c08217ae46b5447f7e31f10f8c29fd24d13d 100644 (file)
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -1,12 +1,15 @@
-/* This file is part of
- * ======================================================
- *
- *           LyX, The Document Processor
+/**
+ * \file lyxserver.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author John Levon
  *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 /**
   Docu   : To use the lyxserver define the name of the pipe in your
@@ -41,11 +44,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"
@@ -65,6 +63,9 @@
 #include "support/os2_errortable.h"
 #endif
 
+
+using namespace lyx::support;
+
 using std::endl;
 
 // provide an empty mkfifo() if we do not have one. This disables the
@@ -195,7 +196,7 @@ int LyXComm::startPipe(string const & filename, bool write)
        if (fd < 0) {
                lyxerr << "LyXComm: Could not open pipe " << filename << '\n'
                       << strerror(errno) << endl;
-               lyx::unlink(filename);
+               unlink(filename);
                return -1;
        }
 
@@ -215,7 +216,7 @@ void LyXComm::endPipe(int & fd, string const & filename, bool write)
        if (!write) {
                lyx_gui::remove_read_callback(fd);
        }
- 
+
 #ifdef __EMX__
        APIRET rc;
        int errnum;
@@ -236,7 +237,7 @@ void LyXComm::endPipe(int & fd, string const & filename, bool write)
 
 // OS/2 pipes are deleted automatically
 #ifndef __EMX__
-       if (lyx::unlink(filename) < 0) {
+       if (unlink(filename) < 0) {
                lyxerr << "LyXComm: Could not remove pipe " << filename
                       << '\n' << strerror(errno) << endl;
        };
@@ -258,56 +259,56 @@ 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))) {
-               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()) {
-                               lyxerr << "LyxComm: truncated command: "
-                                      << lsbuf << endl;
-                               lsbuf.erase();
+               if (errno != 0) {
+                       lyxerr << "LyXComm: " << strerror(errno) << endl;
+                       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;
 }
 
 
@@ -387,7 +388,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;
@@ -463,7 +465,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
                                }
                        } else {
                                lyxerr <<"LyXServer: Undefined server command "
-                                      << cmd << "." << endl;
+                                      << cmd << '.' << endl;
                        }
                        return;
                }
@@ -489,7 +491,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 -
@@ -505,7 +507,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