[Libreoffice-commits] online.git: loolwsd/LOOLSession.cpp

[Tor Lillqvist]

 loolwsd/LOOLSession.cpp |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 0440a908faad6b18764c57d73bafb5420863692d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri May 22 12:40:24 2015 +0100

    For some reason linking the PkgInfo file fails in OS X
    
    No idea. Does not even work from the command line...  But after
    "fixing" this, we run into other weird problems anyway. (Maybe one
    needs to use lower-level (Mach) APIs for esoteric stuff like chroot?)
    So, getting loolwsd to work on OS X seems unexpectedly hard even
    before considering what changes might be needed to LibreOfficeKit. Oh
    well.

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index f3cc1d1..03b7224 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -277,6 +277,12 @@ namespace
 
         assert(fpath[strlen(sourceForLinkOrCopy->c_str())] == '/');
         const char *relativeOldPath = fpath + strlen(sourceForLinkOrCopy->c_str()) + 1;
+
+#ifdef __APPLE__
+        if (strcmp(relativeOldPath, "PkgInfo") == 0)
+            return 0;
+#endif
+
         Path newPath(*destinationForLinkOrCopy, Path(relativeOldPath));
 
         switch (typeflag)