Stop manually handling broken symlinks in listDir in pub.

utils/pub/io.dart

 // 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.
 
 /// Helper functionality to make working with IO easier.
 library io;
 
 import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
@@ skipping 126 matching lines @@
 
     // Avoid recursive symlinks.
     var resolvedPath = new File(dir).fullPathSync();
     if (listedDirectories.contains(resolvedPath)) return [];
 
     listedDirectories = new Set<String>.from(listedDirectories);
     listedDirectories.add(resolvedPath);
 
     log.io("Listing directory $dir.");
 
-    var children = [];
-    for (var entity in new Directory(dir).listSync(followLinks: false)) {
-      var entityPath = entity.path;
-      if (!includeHidden && path.basename(entityPath).startsWith('.')) continue;
-
-      // TODO(nweiz): remove this when issue 9832 is fixed.
-      if (entity is Link) {
-        // We treat broken symlinks as files, in that we don't want to recurse
-        // into them.
-        entity = dirExists(entityPath)
-            ? new Directory(entityPath)
-            : new File(entityPath);
+    var children = <String>[];
+    for (var entity in new Directory(dir).listSync()) {
+      if (!includeHidden && path.basename(entity.path).startsWith('.')) {
+        continue;
       }
 
-      if (entity is File) {
-        contents.add(entityPath);
-      } else if (entity is Directory) {
-        contents.add(entityPath);
+      contents.add(entity.path);
+      if (entity is Directory) {
         // TODO(nweiz): don't manually recurse once issue 4794 is fixed.
         // Note that once we remove the manual recursion, we'll need to
         // explicitly filter out files in hidden directories.
         if (recursive) {
-          children.addAll(doList(entityPath, listedDirectories));
+          children.addAll(doList(entity.path, listedDirectories));
         }
       }
     }
 
     log.fine("Listed directory $dir:\n${contents.join('\n')}");
     contents.addAll(children);
     return contents;
   }
 
   return doList(dir, new Set<String>());
@@ skipping 525 matching lines @@
   const PubProcessResult(this.stdout, this.stderr, this.exitCode);
 
   bool get success => exitCode == 0;
 }
 
 /// Gets a [Uri] for [uri], which can either already be one, or be a [String].
 Uri _getUri(uri) {
   if (uri is Uri) return uri;
   return Uri.parse(uri);
 }