X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=538f75d48e66d3606c853471ec50ddccc96ec69e;hb=dba4f28b6269c0ebd7a4e70a82ca10cf6c4a6ff8;hp=5040739eac69fbae361e77aca6c9ef95d39a5d66;hpb=12d1cb20766b1efa3df15f8c745eb912ee4604a7;p=lyx.git

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 5040739eac..538f75d48e 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -65,6 +65,15 @@ using ::boost::scoped_ptr;
 
 namespace lyx {
 
+// Dummy LyXRC support
+struct LyXRC {
+	string icon_set;
+} lyxrc;
+
+// Keep the linker happy on Windows
+void lyx_exit(int)
+{}
+
 namespace support {
 
 string itoa(unsigned int i)
@@ -97,7 +106,7 @@ FileNameList lyxSockets(string const & dir, string const & pid)
 	for (; it != end; ++it) {
 		if (!it->isDirectory())
 			continue;
-		string const tmpdir = it->absFilename();
+		string const tmpdir = it->absFileName();
 		if (!contains(tmpdir, "lyx_tmpdir" + pid))
 			continue;
 
@@ -140,7 +149,7 @@ int connect(FileName const & name)
 	if (::connect(fd,
 		      reinterpret_cast<struct sockaddr *>(&addr),
 		      sizeof(addr)) == -1) {
-		cerr << "lyxclient: Could not connect to socket " << name.absFilename()
+		cerr << "lyxclient: Could not connect to socket " << name.absFileName()
 		     << ": " << strerror(errno) << endl;
 		::close(fd);
 		return -1;
@@ -569,14 +578,14 @@ int main(int argc, char * argv[])
 			if (server->connected())
 				break;
 			lyxerr << "lyxclient: " << "Could not connect to "
-			     << addr->absFilename() << endl;
+			     << addr->absFileName() << endl;
 		}
 		if (addr == end) {
 			lyxerr << "lyxclient: No suitable server found."
 			       << endl;
 			return EXIT_FAILURE;
 		}
-		cerr << "lyxclient: " << "Connected to " << addr->absFilename() << endl;
+		cerr << "lyxclient: " << "Connected to " << addr->absFileName() << endl;
 	}
 
 	int const serverfd = server->fd();
@@ -624,6 +633,8 @@ int main(int argc, char * argv[])
 		if (iowatch.isset(0)) {
 			string command;
 			getline(cin, command);
+			if (command.empty())
+				continue;
 			if (command == "BYE:") {
 				server->writeln("BYE:");
 				saidbye = true;