X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxserver.C;h=16243172a912cfba662b4ca926cc649531eb6cdf;hb=ae348f8af96100a154b3792d27732d621d44ec89;hp=43fb0628c94ea543da678c6d050c7015f3744e0a;hpb=835a0d91867e2cdd457930a9e64b9a1bfca39b23;p=lyx.git

diff --git a/src/lyxserver.C b/src/lyxserver.C
index 43fb0628c9..16243172a9 100644
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -51,18 +51,10 @@
 #include <boost/bind.hpp>
 
 #include <cerrno>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#ifdef __EMX__
-#include <cstdlib>
-#include <io.h>
-#define OS2EMX_PLAIN_CHAR
-#define INCL_DOSNMPIPES
-#define INCL_DOSERRORS
-#include <os2.h>
-#include "support/os2_errortable.h"
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
 #endif
+#include <fcntl.h>
 
 using lyx::support::compare;
 using lyx::support::rtrim;
@@ -73,13 +65,39 @@ using std::endl;
 using std::string;
 
 
-// provide an empty mkfifo() if we do not have one. This disables the
-// lyxserver.
-#ifndef HAVE_MKFIFO
-int mkfifo(char const * __path, mode_t __mode) {
-	return 0;
+#if !defined (HAVE_MKFIFO)
+// We provide a stub class that disables the lyxserver.
+
+void LyXComm::openConnection()
+{}
+
+
+void LyXComm::closeConnection()
+{}
+
+
+int LyXComm::startPipe(string const & filename, bool write)
+{
+	return -1;
 }
-#endif
+
+
+void LyXComm::endPipe(int & fd, string const & filename, bool write)
+{}
+
+
+void LyXComm::emergencyCleanup()
+{}
+
+void LyXComm::read_ready()
+{}
+
+
+void LyXComm::send(string const & msg)
+{}
+
+
+#else // defined (HAVE_MKFIFO)
 
 
 void LyXComm::openConnection()
@@ -147,42 +165,6 @@ void LyXComm::closeConnection()
 
 int LyXComm::startPipe(string const & filename, bool write)
 {
-	int fd;
-
-#ifdef __EMX__
-	HPIPE os2fd;
-	APIRET rc;
-	int errnum;
-	// Try create one instance of named pipe with the mode O_RDONLY|O_NONBLOCK.
-	// The current emx implementation of access() won't work with pipes.
-	rc = DosCreateNPipe(filename.c_str(), &os2fd, NP_ACCESS_INBOUND,
-		NP_NOWAIT|0x01, 0600, 0600, 0);
-	if (rc == ERROR_PIPE_BUSY) {
-		lyxerr << "LyXComm: Pipe " << filename << " already exists.\n"
-		       << "If no other LyX program is active, please delete"
-			" the pipe by hand and try again." << endl;
-		pipename.erase();
-		return -1;
-	}
-
-	if (rc != NO_ERROR) {
-		errnum = TranslateOS2Error(rc);
-		lyxerr <<"LyXComm: Could not create pipe " << filename
-		       << strerror(errnum) << endl;
-		return -1;
-	};
-	// Listen to it.
-	rc = DosConnectNPipe(os2fd);
-	if (rc != NO_ERROR && rc != ERROR_PIPE_NOT_CONNECTED) {
-		errnum = TranslateOS2Error(rc);
-		lyxerr <<"LyXComm: Could not create pipe " << filename
-		       << strerror(errnum) << endl;
-		return -1;
-	};
-	// Imported handles can be used both with OS/2 APIs and emx
-	// library functions.
-	fd = _imphandle(os2fd);
-#else
 	if (::access(filename.c_str(), F_OK) == 0) {
 		lyxerr << "LyXComm: Pipe " << filename << " already exists.\n"
 		       << "If no other LyX program is active, please delete"
@@ -196,8 +178,8 @@ int LyXComm::startPipe(string const & filename, bool write)
 		       << strerror(errno) << endl;
 		return -1;
 	};
-	fd = ::open(filename.c_str(), write ? (O_RDWR) : (O_RDONLY|O_NONBLOCK));
-#endif
+	int const fd = ::open(filename.c_str(),
+			      write ? (O_RDWR) : (O_RDONLY|O_NONBLOCK));
 
 	if (fd < 0) {
 		lyxerr << "LyXComm: Could not open pipe " << filename << '\n'
@@ -223,31 +205,15 @@ void LyXComm::endPipe(int & fd, string const & filename, bool write)
 		lyx_gui::unregister_socket_callback(fd);
 	}
 
-#ifdef __EMX__
-	APIRET rc;
-	int errnum;
-
-	rc = DosDisConnectNPipe(fd);
-	if (rc != NO_ERROR) {
-		errnum = TranslateOS2Error(rc);
-		lyxerr << "LyXComm: Could not disconnect pipe " << filename
-		       << '\n' << strerror(errnum) << endl;
-		return;
-	}
-#endif
-
 	if (::close(fd) < 0) {
 		lyxerr << "LyXComm: Could not close pipe " << filename
 		       << '\n' << strerror(errno) << endl;
 	}
 
-// OS/2 pipes are deleted automatically
-#ifndef __EMX__
 	if (unlink(filename) < 0) {
 		lyxerr << "LyXComm: Could not remove pipe " << filename
 		       << '\n' << strerror(errno) << endl;
 	};
-#endif
 
 	fd = -1;
 }
@@ -342,16 +308,20 @@ void LyXComm::send(string const & msg)
 		closeConnection();
 		openConnection();
 	}
-#ifdef __EMX__
-	APIRET rc;
-	int errnum;
-	rc = DosResetBuffer(outfd);	// To avoid synchronization problems.
-	if (rc != NO_ERROR) {
-		errnum = TranslateOS2Error(rc);
-		lyxerr << "LyXComm: Message could not be flushed: " << msg
-		       << '\n' << strerror(errnum) << endl;
-	}
-#endif
+}
+
+#endif // defined (HAVE_MKFIFO)
+
+
+string const LyXComm::inPipeName() const
+{
+	return pipename + string(".in");
+}
+
+
+string const LyXComm::outPipeName() const
+{
+	return pipename + string(".out");
 }