#include "frontends/Application.h"
#include "support/environment.h"
+#include "support/filename.h"
#include "support/lyxlib.h"
#include "support/socktools.h"
// Needed by lyxclient
support::setEnv("LYXSOCKET", address_);
- theApp->registerSocketCallback(
+ theApp()->registerSocketCallback(
fd_,
boost::bind(&LyXServerSocket::serverCallback, this)
);
- lyxerr[Debug::LYXSERVER] << "lyx: New server socket "
+ LYXERR(Debug::LYXSERVER) << "lyx: New server socket "
<< fd_ << ' ' << address_ << endl;
}
LyXServerSocket::~LyXServerSocket()
{
if (fd_ != -1) {
- BOOST_ASSERT (theApp);
- theApp->unregisterSocketCallback(fd_);
+ BOOST_ASSERT (theApp());
+ 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;
+ support::unlink(support::FileName(address_));
+ LYXERR(Debug::LYXSERVER) << "lyx: Server socket quitting" << endl;
}
int const client_fd = support::socktools::accept(fd_);
if (fd_ == -1) {
- lyxerr[Debug::LYXSERVER] << "lyx: Failed to accept new client"
+ LYXERR(Debug::LYXSERVER) << "lyx: Failed to accept new client"
<< endl;
return;
}
// Register the new client.
clients[client_fd] =
shared_ptr<LyXDataSocket>(new LyXDataSocket(client_fd));
- theApp->registerSocketCallback(
+ theApp()->registerSocketCallback(
client_fd,
boost::bind(&LyXServerSocket::dataCallback,
this, client_fd)
LyXDataSocket::LyXDataSocket(int fd)
: fd_(fd), connected_(true)
{
- lyxerr[Debug::LYXSERVER] << "lyx: New data socket " << fd_ << endl;
+ LYXERR(Debug::LYXSERVER) << "lyx: New data socket " << fd_ << endl;
}
lyxerr << "lyx: Data socket " << fd_
<< " IO error on closing: " << strerror(errno);
- theApp->unregisterSocketCallback(fd_);
- lyxerr[Debug::LYXSERVER] << "lyx: Data socket " << fd_ << " quitting."
+ theApp()->unregisterSocketCallback(fd_);
+ LYXERR(Debug::LYXSERVER) << "lyx: Data socket " << fd_ << " quitting."
<< endl;
}
// Error conditions. The buffer must still be
// processed for lines read
if (count == 0) { // EOF -- connection closed
- lyxerr[Debug::LYXSERVER] << "lyx: Data socket " << fd_
+ LYXERR(Debug::LYXSERVER) << "lyx: Data socket " << fd_
<< ": connection closed." << endl;
connected_ = false;
} else if ((count == -1) && (errno != EAGAIN)) { // IO error
// Cut a line from buffer
string::size_type pos = buffer_.find('\n');
if (pos == string::npos) {
- lyxerr[Debug::LYXSERVER] << "lyx: Data socket " << fd_
+ LYXERR(Debug::LYXSERVER) << "lyx: Data socket " << fd_
<< ": line not completed." << endl;
return false; // No complete line stored
}