Don't set the Write Op for attribute notifications

closes #4

diff --git a/fsnotify_bsd.go b/fsnotify_bsd.go
index 8dd51e96278813c63c5bb76e98e87f7cc1629cf6..dcb14da56c26288f1864b1a814bf3e6ff1e76897 100644 (file)
--- a/fsnotify_bsd.go
+++ b/fsnotify_bsd.go
@@ -32,7 +32,7 @@ func newEvent(name string, mask uint32, create bool) Event {
        if mask&syscall.NOTE_DELETE == syscall.NOTE_DELETE {
                e.Op |= Remove
        }
-       if mask&syscall.NOTE_WRITE == syscall.NOTE_WRITE || mask&syscall.NOTE_ATTRIB == syscall.NOTE_ATTRIB {
+       if mask&syscall.NOTE_WRITE == syscall.NOTE_WRITE {
                e.Op |= Write
        }
        if mask&syscall.NOTE_RENAME == syscall.NOTE_RENAME {

diff --git a/fsnotify_linux.go b/fsnotify_linux.go
index 5e0d0f969a8ac4e64c7305f1b55a0b806db62451..e6ccb486dd9cc8c7ff5a0ef759b07021e2dc3598 100644 (file)
--- a/fsnotify_linux.go
+++ b/fsnotify_linux.go
@@ -28,7 +28,7 @@ func newEvent(name string, mask uint32) Event {
        if mask&syscall.IN_DELETE_SELF == syscall.IN_DELETE_SELF || mask&syscall.IN_DELETE == syscall.IN_DELETE {
                e.Op |= Remove
        }
-       if mask&syscall.IN_MODIFY == syscall.IN_MODIFY || mask&syscall.IN_ATTRIB == syscall.IN_ATTRIB {
+       if mask&syscall.IN_MODIFY == syscall.IN_MODIFY {
                e.Op |= Write
        }
        if mask&syscall.IN_MOVE_SELF == syscall.IN_MOVE_SELF || mask&syscall.IN_MOVED_FROM == syscall.IN_MOVED_FROM {

diff --git a/fsnotify_test.go b/fsnotify_test.go
index b4240f3ad85df155b401062a45d6f0746917daea..6436561b4f9e35f643b413b7869ffc78108c8c2a 100644 (file)
--- a/fsnotify_test.go
+++ b/fsnotify_test.go
@@ -916,8 +916,8 @@ func TestFsnotifyAttrib(t *testing.T) {
        // We expect this event to be received almost immediately, but let's wait 500 ms to be sure
        // Creating/writing a file changes also the mtime, so IsAttrib should be set to true here
        time.Sleep(500 * time.Millisecond)
-       if modifyReceived.value() == 0 {
-               t.Fatal("fsnotify modify events have not received after 500 ms")
+       if modifyReceived.value() != 0 {
+               t.Fatal("received an unexpected modify event when creating a test file")
        }
        if attribReceived.value() == 0 {
                t.Fatal("fsnotify attribute events have not received after 500 ms")

diff --git a/fsnotify_windows.go b/fsnotify_windows.go
index 0d559c8b29eb67b51636275c2abb4cd2b91e3250..b2d3771ebd46a644dd00c21bce4b86c2c3b4ff11 100644 (file)
--- a/fsnotify_windows.go
+++ b/fsnotify_windows.go
@@ -47,7 +47,7 @@ func newEvent(name string, mask uint32) Event {
        if mask&sys_FS_DELETE == sys_FS_DELETE || mask&sys_FS_DELETE_SELF == sys_FS_DELETE_SELF {
                e.Op |= Remove
        }
-       if mask&sys_FS_MODIFY == sys_FS_MODIFY || mask&sys_FS_ATTRIB == sys_FS_ATTRIB {
+       if mask&sys_FS_MODIFY == sys_FS_MODIFY {
                e.Op |= Write
        }
        if mask&sys_FS_MOVE == sys_FS_MOVE || mask&sys_FS_MOVE_SELF == sys_FS_MOVE_SELF || mask&sys_FS_MOVED_FROM == sys_FS_MOVED_FROM || mask&sys_FS_MOVED_TO == sys_FS_MOVED_TO {