MSVC compilation fix.

[lyx.git] / src / lyxsocket.C

diff --git a/src/lyxsocket.C b/src/lyxsocket.C
index 17c33165244964c46d53125c97468475ce69a6e2..1a260706913b0d47bf869fb30710b343751df150 100644 (file)
--- a/src/lyxsocket.C
+++ b/src/lyxsocket.C
@@ -12,6 +12,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
+#include <config.h>
+
 #include "lyxsocket.h"
 
 #include "debug.h"
@@ -19,8 +21,9 @@
 #include "LyXAction.h"
 #include "lyxfunc.h"
 
-#include "frontends/lyx_gui.h"
+#include "frontends/Application.h"
 
+#include "support/environment.h"
 #include "support/lyxlib.h"
 #include "support/socktools.h"
 
@@ -28,6 +31,13 @@
 
 #include <cerrno>
 
+
+namespace lyx {
+
+#if defined (_WIN32)
+# include <io.h>
+#endif
+
 using boost::shared_ptr;
 
 using std::auto_ptr;
@@ -40,7 +50,7 @@ using std::string;
 // that can connect at the same time.
 LyXServerSocket::LyXServerSocket(LyXFunc * f, string const & addr)
        : func(f),
-         fd_(lyx::support::socktools::listen(addr, 3)),
+         fd_(support::socktools::listen(addr, 3)),
          address_(addr)
 {
        if (fd_ == -1) {
@@ -50,11 +60,11 @@ LyXServerSocket::LyXServerSocket(LyXFunc * f, string const & addr)
 
        // These env vars are used by DVI inverse search
        // Needed by xdvi
-       lyx::support::putenv("XEDITOR", "lyxclient -g %f %l");
+       support::setEnv("XEDITOR", "lyxclient -g %f %l");
        // Needed by lyxclient
-       lyx::support::putenv("LYXSOCKET", address_);
+       support::setEnv("LYXSOCKET", address_);
 
-       lyx_gui::register_socket_callback(
+       theApp->registerSocketCallback(
                fd_,
                boost::bind(&LyXServerSocket::serverCallback, this)
                );
@@ -67,9 +77,13 @@ LyXServerSocket::LyXServerSocket(LyXFunc * f, string const & addr)
 // Close the socket and remove the address of the filesystem.
 LyXServerSocket::~LyXServerSocket()
 {
-       lyx_gui::unregister_socket_callback(fd_);
-       ::close(fd_);
-       lyx::support::unlink(address_);
+       if (fd_ != -1) {
+               theApp->unregisterSocketCallback(fd_);
+               if (close(fd_) != 0)
+                       lyxerr << "lyx: Server socket " << fd_
+                              << " IO error on closing: " << strerror(errno);
+       }
+       support::unlink(address_);
        lyxerr[Debug::LYXSERVER] << "lyx: Server socket quitting" << endl;
 }
 
@@ -84,7 +98,7 @@ string const & LyXServerSocket::address() const
 // is OK and if the number of clients does not exceed MAX_CLIENTS
 void LyXServerSocket::serverCallback()
 {
-       int const client_fd = lyx::support::socktools::accept(fd_);
+       int const client_fd = support::socktools::accept(fd_);
 
        if (fd_ == -1) {
                lyxerr[Debug::LYXSERVER] << "lyx: Failed to accept new client"
@@ -100,7 +114,7 @@ void LyXServerSocket::serverCallback()
        // Register the new client.
        clients[client_fd] =
                shared_ptr<LyXDataSocket>(new LyXDataSocket(client_fd));
-       lyx_gui::register_socket_callback(
+       theApp->registerSocketCallback(
                client_fd,
                boost::bind(&LyXServerSocket::dataCallback,
                            this, client_fd)
@@ -129,7 +143,7 @@ void LyXServerSocket::dataCallback(int fd)
                if (key == "LYXCMD") {
                        string const cmd = line.substr(pos + 1);
                        func->dispatch(lyxaction.lookupFunc(cmd));
-                       string const rval = func->getMessage();
+                       string const rval = to_utf8(func->getMessage());
                        if (func->errorStat()) {
                                client->writeln("ERROR:" + cmd + ':' + rval);
                        } else {
@@ -155,8 +169,8 @@ void LyXServerSocket::writeln(string const & line)
 {
        string const linen(line + '\n');
        int const size = linen.size();
-       int const written = ::write(fd_, linen.c_str(), size);
-       if (written < size) { // Allways mean end of connection.
+       int const written = write(fd_, linen.c_str(), size);
+       if (written < size) { // Always mean end of connection.
                if ((written == -1) && (errno == EPIPE)) {
                        // The program will also receive a SIGPIPE
                        // that must be caught
@@ -194,9 +208,11 @@ LyXDataSocket::LyXDataSocket(int fd)
 
 LyXDataSocket::~LyXDataSocket()
 {
-       ::close(fd_);
+       if (close(fd_) != 0)
+               lyxerr << "lyx: Data socket " << fd_
+                      << " IO error on closing: " << strerror(errno);
 
-       lyx_gui::unregister_socket_callback(fd_);
+       theApp->unregisterSocketCallback(fd_);
        lyxerr[Debug::LYXSERVER] << "lyx: Data socket " << fd_ << " quitting."
                                 << endl;
 }
@@ -212,11 +228,11 @@ bool LyXDataSocket::connected() const
 bool LyXDataSocket::readln(string & line)
 {
        int const charbuf_size = 100;
-        char charbuf[charbuf_size]; // buffer for the ::read() system call
+       char charbuf[charbuf_size]; // buffer for the ::read() system call
        int count;
 
        // read and store characters in buffer
-       while ((count = ::read(fd_, charbuf, charbuf_size - 1)) > 0) {
+       while ((count = read(fd_, charbuf, charbuf_size - 1)) > 0) {
                buffer_.append(charbuf, charbuf + count);
        }
 
@@ -250,8 +266,8 @@ void LyXDataSocket::writeln(string const & line)
 {
        string const linen(line + '\n');
        int const size = linen.size();
-       int const written = ::write(fd_, linen.c_str(), size);
-       if (written < size) { // Allways mean end of connection.
+       int const written = write(fd_, linen.c_str(), size);
+       if (written < size) { // Always mean end of connection.
                if ((written == -1) && (errno == EPIPE)) {
                        // The program will also receive a SIGPIPE
                        // that must be catched
@@ -267,3 +283,6 @@ void LyXDataSocket::writeln(string const & line)
                connected_ = false;
        }
 }
+
+
+} // namespace lyx