From 58a7e9938fe526009ee7f159cc0d15a61bd4a046 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 20 Mar 2014 17:35:04 +0100 Subject: [PATCH] PY-10377 (allow non-journaled local FS to be watched) --- bin/mac/fsnotifier | Bin 13924 -> 13924 bytes native/fsNotifier/mac/fsnotifier.c | 4 +--- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/bin/mac/fsnotifier b/bin/mac/fsnotifier index 7fdef8c56590cd72282395ea67183aed8a78e414..e2524e76d1bfcc1357127de6bcac59a23df7d030 100755 GIT binary patch delta 2319 zcmZvedu-EH6vuzR?$@%8v5q|fTUwwHP#$9A*pNZMdd|J=s^TBt=5v4N zanHH0Em9w;Z@;L%9{75txoUx;Tu>CHD)7i<&RnP{TUABLWM!($T)PMeOtq{DMh!43 zhfxFjUUg-4!e|YQI_+$+aoT04Vc0NzO?E7!FZkju-~0298nRm(oM6udDaI^CF|%pL z8r8+T#&w7f^;q;q>PrNro4+WclC9e-zQ?S z_&T<);EehQn_9R?eazMt&Ne6$SwrEj(pj*M)ICZA^-w>}qm40riBm6kYWhZJCa;@- zO~iH0$!h?8BmhvBU&nR`rsb^F#aO&=1-UGhWJq#;{)$m>zMpq;fiDWr@ z*^J_1^(@o77-ymGb80VLT{0U_dKvy$ zT7v&EH}$TEU|4NRhOw$Uy2^jolAVS6$&k!F1P27ouodJq_r|0Lb)R0|Yw_3PTm<%R z2wgPM7r&88G6+{7mH9;K;{YWCE)ue|1w`qCu+7vHN{5T1_kr}5ccpcY@Dx$rmK9+GF41GcC@UIB+eJmU zU~gg1y~&ccN!S0I@RamS-t$7?H~?Ly%WWO6LM(i8*^bD#C#k<{TMDdxk|~^+L|>nim#_%K`D$?UemS+8L(d?mku zNU;@HIWz<-*WDbf#JStqCffxs{B4^L&v|r3Jdpq{K`xcN1bL3+WysSczk-}2c@?rj zayjzDKSiE3$oC{yAm5f;iF{M?MqqFBnjBQ2;fmz#$QLBPjeJUS4e|-ewaCXL*CT%{ zxdC~<vPp6W^5X}h z`;*AO304$VZU0cMVn5lPOm)2A#eXmgKn~D+&@xats1mdtR0}!)It*$9b%0KTE`qv2 z1E3IS1QY{}fi!rTazR$mT+kBGDo_Qe3WSgHnX_M&01x6oyQ!n3f*e!ud?NUjN F>2I(aA^89R delta 2315 zcmZXWe@vBC7{|{G_aY#A3FJovUSuzurXm`diliCGuy{+2ilgMTTPuZ=dUeo#6WP6V+-A_v7&|U=FVMrb)!2+F1fCroY)PcG8lE+#d2%bWj$srX8zuz`(u0Fd~R7MFWfYD(Y=*AtS5trHIa~6 zBFkEe`bJ(jfe=Q$Er-2mU~A7sGdkjS-AsaoBwa2MO{pb0Auua3E!v*2xGla< z&DL&9l3qq}Y^}A2XFG8q;>ISO9h8Mv!|NAUB@En*yvzXQgmVg&r^W z&cY-@%%aQp0A2KVd0$x5%ja+yF&g63=XSj;YSMG;sc35W+@1k&4hPS=gLpKYbLm?OxI5O)M|lQAa01ygQ}LE$hM*#|@ax^OrgiKYQk z9ijpFh4=!n6Ah_Xo)v2{vUdrvW>j)2G4gzLMFUp2J}?{bUzu^!2urPlg*Dr&2W<9c z^yXl{Rkj8WNaQMR#Pg13tWXMbOnrlMy`~oplmFn?m%;**7xFGAF zbP697vX&Tv|CLxGwq@oyyXEevp>K#zz!D@oQA~q2_kA#|rxSPzH!f)X{H4NtlH3gU z4}NTI*Z;TN(*GK4X2v+D;}{i`ZqgD-Y;1^{_nK2L6dPBu-e=^WPG!N3GpqY;?)UL1 zxE6+2Il#2!?WmJcPDdk-PekWNpht@7nC+Oy41AQs@s6>X-R3p?P+6dC{Pem=!ur19r9Dyun!fl_9B2spz%HAsEwZw=&tHYN-0*SF3vg3-QwUy%A|0PuMknN7;z4$9+&I2rH^jB<^;#E9 zUT@@v>>evm%759S!{X&u~L^KSKksLDC-tXl$4xqm|_9EQJYg~%%v z7a>2Zcop(|#cPpM6t72)Q(TJt;BV7U8S)>B%aQLY-i-XC;tJ%OPBo~)L9gO>kS{6T zfqY7FE%FJ)b;zG7Za_YwxDolF;seP06n}(VqxcZ=R>jTcVH?$;4HwoZb|DuiK8Bp9 zxC1#|aVK)3;^WAVCe7@-kSBq~9{WLUoA|}9i*?p`q2(@i;y)M3plr}WP!VW7s2o%U zss%NI4uM>tPS8nEH|Q#85Ht!J2T4!}MBpV#0%d}9P$6h7s0>sA!v8-`pF6t(NSw=E VYHfx&?ed*myUnxNa;dO3?msN4A!Gmm diff --git a/native/fsNotifier/mac/fsnotifier.c b/native/fsNotifier/mac/fsnotifier.c index 3bd0dd19155c..0a4a6c8e1846 100644 --- a/native/fsNotifier/mac/fsnotifier.c +++ b/native/fsNotifier/mac/fsnotifier.c @@ -75,8 +75,6 @@ static void * EventProcessingThread(void *data) { return NULL; } -#define FS_FLAGS (MNT_LOCAL|MNT_JOURNALED) - static void PrintMountedFileSystems(CFArrayRef roots) { int fsCount = getfsstat(NULL, 0, MNT_WAIT); if (fsCount == -1) return; @@ -88,7 +86,7 @@ static void PrintMountedFileSystems(CFArrayRef roots) { CFMutableArrayRef mounts = CFArrayCreateMutable(NULL, 0, NULL); for (int i = 0; i < fsCount; i++) { - if ((fs[i].f_flags & FS_FLAGS) != FS_FLAGS) { + if ((fs[i].f_flags & MNT_LOCAL) != MNT_LOCAL) { char *mount = fs[i].f_mntonname; int mountLen = strlen(mount);