rp needs to know about --no-realpath as well.

dzhu · Oct 6, 2016 · 40e865f · 40e865f
1 parent e60169a
commit 40e865f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/ClangIndexer.cpp b/src/ClangIndexer.cpp
@@ -122,6 +122,10 @@ bool ClangIndexer::exec(const String &data)
     deserializer >> mDebugLocations;
     deserializer >> blockedFiles;
 
+    if (sServerOpts & Server::NoRealPath) {
+        Path::setRealPathEnabled(false);
+    }
+
 #if 0
     while (true) {
         FILE *f = fopen((String("/tmp/stop_") + mSourceFile.fileName()).constData(), "r+");

diff --git a/src/Server.h b/src/Server.h
@@ -80,7 +80,8 @@ class Server
         NoFileManager = (1ull << 26),
         ValidateFileMaps = (1ull << 27),
         CompletionLogs = (1ull << 28),
-        AllowWErrorAndWFatalErrors = (1ull << 29)
+        AllowWErrorAndWFatalErrors = (1ull << 29),
+        NoRealPath = (1ull << 30)
     };
     struct Options {
         Options()

diff --git a/src/rdm.cpp b/src/rdm.cpp
@@ -764,6 +764,7 @@ int main(int argc, char** argv)
             break; }
         case NoRealPath: {
             Path::setRealPathEnabled(false);
+            serverOpts.options |= Server::NoRealPath;
             break; }
         }