X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxserver.C;h=d258cb5474e5621c99c32672b106137bedb602c0;hb=69bee02a8901793b34ac5ca6d07e93910cef4005;hp=d7044b146ff524976a148014c40cc83271d52fb3;hpb=99d1627a471b92f403598d03dfc861ddc3c11be0;p=lyx.git

diff --git a/src/lyxserver.C b/src/lyxserver.C
index d7044b146f..d258cb5474 100644
--- 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
@@ -36,20 +39,19 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <cerrno>
-
 #include "lyxserver.h"
-#include "lyx_main.h"
 #include "debug.h"
+#include "funcrequest.h"
+#include "LyXAction.h"
 #include "lyxfunc.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "frontends/lyx_gui.h"
 
+#include <cerrno>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 #ifdef __EMX__
 #include <cstdlib>
 #include <io.h>
@@ -60,7 +62,14 @@
 #include "support/os2_errortable.h"
 #endif
 
+using lyx::support::compare;
+using lyx::support::rtrim;
+using lyx::support::split;
+using lyx::support::unlink;
+
 using std::endl;
+using std::string;
+
 
 // provide an empty mkfifo() if we do not have one. This disables the
 // lyxserver.
@@ -133,6 +142,7 @@ void LyXComm::closeConnection()
 	ready = false;
 }
 
+
 int LyXComm::startPipe(string const & filename, bool write)
 {
 	int fd;
@@ -190,7 +200,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;
 	}
 
@@ -231,7 +241,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;
 	};
@@ -473,7 +483,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
 			// support currently. (Lgb)
 
 
-			serv->func->dispatch(cmd + ' ' + arg);
+			serv->func->dispatch(FuncRequest(lyxaction.lookupFunc(cmd), arg));
 			string const rval = serv->func->getMessage();
 
 			//modified june 1999 stefano@zool.su.se: