[dart:io] Namespaces for file IO

runtime/bin/file_system_watcher_android.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"
 #if defined(HOST_OS_ANDROID)
 
 #include "bin/file_system_watcher.h"
 
 #include <errno.h>        // NOLINT
 #include <sys/inotify.h>  // NOLINT
 
 #include "bin/fdutils.h"
+#include "bin/file.h"
+#include "bin/socket.h"
 #include "platform/signal_blocker.h"
 
 namespace dart {
 namespace bin {
 
 bool FileSystemWatcher::IsSupported() {
   return true;
 }
 
 intptr_t FileSystemWatcher::Init() {
   int id = NO_RETRY_EXPECTED(inotify_init());
   if (id < 0 || !FDUtils::SetCloseOnExec(id)) {
     return -1;
   }
   // Some systems dosn't support setting this as non-blocking. Since watching
   // internals are kept away from the user, we know it's possible to continue,
   // even if setting non-blocking fails.
   FDUtils::SetNonBlocking(id);
   return id;
 }
 
 void FileSystemWatcher::Close(intptr_t id) {
   USE(id);
 }
 
 intptr_t FileSystemWatcher::WatchPath(intptr_t id,
+                                      Namespace* namespc,
                                       const char* path,
                                       int events,
                                       bool recursive) {
   int list_events = IN_DELETE_SELF | IN_MOVE_SELF;
   if ((events & kCreate) != 0) {
     list_events |= IN_CREATE;
   }
   if ((events & kModifyContent) != 0) {
     list_events |= IN_CLOSE_WRITE | IN_ATTRIB;
   }
   if ((events & kDelete) != 0) {
     list_events |= IN_DELETE;
   }
   if ((events & kMove) != 0) {
     list_events |= IN_MOVE;
   }
-  int path_id = NO_RETRY_EXPECTED(inotify_add_watch(id, path, list_events));
+  const char* resolved_path = File::GetCanonicalPath(namespc, path);
+  path = resolved_path != NULL ? resolved_path : path;
+  int path_id = NO_RETRY_EXPECTED(inotify_add_watch(
+      id, resolved_path, list_events));
   if (path_id < 0) {
     return -1;
   }
   return path_id;
 }
 
 void FileSystemWatcher::UnwatchPath(intptr_t id, intptr_t path_id) {
   VOID_NO_RETRY_EXPECTED(inotify_rm_watch(id, path_id));
 }
 
@@ skipping 65 matching lines @@
     offset += kEventSize + e->len;
   }
   ASSERT(offset == bytes);
   return events;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(HOST_OS_ANDROID)