From 5ec97cf37b22c3373694d6219bd78357dda6b8fc Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 9 Jun 2014 22:00:38 +0400
Subject: [PATCH] IDEA-81568 (ignore FS events from /private unless asked
 explicitly)

---
 bin/mac/fsnotifier                            | Bin 13924 -> 13984 bytes
 native/fsNotifier/mac/fsnotifier.c            |  26 +++++++++++++-----
 .../openapi/vfs/impl/local/FileWatcher.java   |   2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/bin/mac/fsnotifier b/bin/mac/fsnotifier
index e2524e76d1bfcc1357127de6bcac59a23df7d030..d69157acdb19d6b7d460218ffb8a58b04c4235e8 100755
GIT binary patch
delta 3051
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

delta 2772
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

diff --git a/native/fsNotifier/mac/fsnotifier.c b/native/fsNotifier/mac/fsnotifier.c
index 0a4a6c8e1846..1f774c40c489 100644
--- a/native/fsNotifier/mac/fsnotifier.c
+++ b/native/fsNotifier/mac/fsnotifier.c
@@ -18,7 +18,11 @@
 #include <pthread.h>
 #include <sys/mount.h>
 
+#define PRIVATE_DIR "/private/"
+#define PRIVATE_LEN 9
+
 static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
+static bool report_private = true;
 
 static void reportEvent(char *event, char *path) {
     int len = 0;
@@ -32,15 +36,15 @@ static void reportEvent(char *event, char *path) {
     }
 
     pthread_mutex_lock(&lock);
-
-    fputs(event, stdout);
-    fputc('\n', stdout);
-    if (path != NULL) {
-        fwrite(path, len, 1, stdout);
+    if (report_private || strncasecmp(path, PRIVATE_DIR, PRIVATE_LEN) != 0) {
+        fputs(event, stdout);
         fputc('\n', stdout);
+        if (path != NULL) {
+            fwrite(path, len, 1, stdout);
+            fputc('\n', stdout);
+        }
+        fflush(stdout);
     }
-
-    fflush(stdout);
     pthread_mutex_unlock(&lock);
 }
 
@@ -128,14 +132,22 @@ static char command[2048];
 
 static void ParseRoots() {
     CFMutableArrayRef roots = CFArrayCreateMutable(NULL, 0, NULL);
+    bool has_private_root = false;
 
     while (TRUE) {
         fscanf(stdin, "%s", command);
         if (strcmp(command, "#") == 0 || feof(stdin)) break;
         char* path = command[0] == '|' ? command + 1 : command;
         CFArrayAppendValue(roots, strdup(path));
+        if (strcmp(path, "/") == 0 || strncasecmp(path, PRIVATE_DIR, PRIVATE_LEN) == 0) {
+            has_private_root = true;
+        }
     }
 
+    pthread_mutex_lock(&lock);
+    report_private = has_private_root;
+    pthread_mutex_unlock(&lock);
+
     PrintMountedFileSystems(roots);
 
     for (int i = 0; i < CFArrayGetCount(roots); i++) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java
index d955c496deb3..f7346548124a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java
@@ -217,7 +217,7 @@ public class FileWatcher {
 
   private static boolean isUpToDate(File executable) {
     long length = SystemInfo.isWindows ? 71208 :
-                  SystemInfo.isMac ? 13924 :
+                  SystemInfo.isMac ? 13984 :
                   SystemInfo.isLinux ? SystemInfo.isAMD64 ? 29155 : 22791 :
                   -1;
     return length < 0 || length == executable.length();