-// -*- C++ -*-
/* This file is part of
* ======================================================
*
* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#include <config.h>
-#include <cstring>
+//#include <cstring>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#endif
#include "lyxserver.h"
-#include "lyxfunc.h"
#include "lyx_main.h"
#include "debug.h"
#include "LyXAction.h"
+#include "lyxfunc.h"
#include "support/lstrings.h"
#include "support/lyxlib.h"
// provide an empty mkfifo() if we do not have one. This disables the
// lyxserver.
#ifndef HAVE_MKFIFO
-int mkfifo( char *__path, mode_t __mode ) {
- return 0;
+int mkfifo(char const * __path, mode_t __mode) {
+ return 0;
}
#endif
return;
}
- if(infd > -1) {
+ if (infd > -1) {
fl_remove_io_callback(infd, FL_READ, C_LyXComm_callback);
string tmp = pipename + ".in";
};
#endif
}
- if(outfd > -1) {
+ if (outfd > -1) {
string tmp = pipename + ".out";
#ifdef __EMX__
rc = DosDisConnectNPipe(outfd);
// the single = is intended here.
while((status = read(fd, charbuf, CMDBUFLEN-1)))
{// break and return in loop
- if(status > 0) // got something
+ if (status > 0) // got something
{
charbuf[status]= '\0'; // turn it into a c string
lsbuf += strip(charbuf, '\r');
<< "LyXComm: status:" << status
<< ", lsbuf:" << lsbuf
<< ", cmd:" << cmd << endl;
- if(!cmd.empty())
+ if (!cmd.empty())
c->clientcb(c->client, cmd);
//\n or not \n?
}
}
- if(errno == EAGAIN)
+ if (errno == EAGAIN)
{ // EAGAIN is not really an error , it means we're
// only reading too fast for the writing process on
// the other end of the pipe.
errno = 0;
return; // up to libforms select-loop (*crunch*)
}
- if(errno != 0 )
+ if (errno != 0 )
{
lyxerr << "LyXComm: " << strerror(errno) << endl;
- if(!lsbuf.empty())
+ if (!lsbuf.empty())
{
lyxerr << "LyxComm: truncated command: "
<< lsbuf << endl;
while(*p) {
// --- 1. check 'header' ---
- if (strncmp(p, "LYXSRV:", 7) == 0) {
+ if (compare(p, "LYXSRV:", 7) == 0) {
server_only = true;
- } else if(0!= strncmp(p, "LYXCMD:", 7)) {
+ } else if (0 != compare(p, "LYXCMD:", 7)) {
lyxerr << "LyXServer: Unknown request" << endl;
return;
}
string client;
while(*p && *p != ':')
client += char(*p++);
- if(*p == ':') ++p;
- if(!*p) return;
+ if (*p == ':') ++p;
+ if (!*p) return;
// --- 3. get function name ---
string cmd;
// --- 4. parse the argument ---
string arg;
- if(!server_only && *p == ':' && *(++p)) {
+ if (!server_only && *p == ':' && *(++p)) {
while(*p && *p != '\n')
arg += char(*p++);
- if(*p) ++p;
+ if (*p) ++p;
}
lyxerr[Debug::LYXSERVER]
// we are listening.
if (cmd == "hello") {
// One more client
- if(serv->numclients == MAX_CLIENTS){ //paranoid check
+ if (serv->numclients == MAX_CLIENTS){ //paranoid check
lyxerr[Debug::LYXSERVER]
<< "LyXServer: too many clients..."
<< endl;
string rval, buf;
if (action>= 0) {
- rval = serv->func->Dispatch(action, arg);
+ rval = serv->func->dispatch(action, arg);
} else {
rval = "Unknown command";
}