Make listDir always emit paths within the given directory.

utils/pub/command_lish.dart

 // Copyright (c) 2012, 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.
 
 library command_lish;
 
 import 'dart:io';
 import 'dart:json';
 import 'dart:uri';
 
@@ skipping 96 matching lines @@
   /// The basenames of directories that are automatically excluded from
   /// archives.
   final _BLACKLISTED_DIRECTORIES = const ['packages'];
 
   /// Returns a list of files that should be included in the published package.
   /// If this is a Git repository, this will respect .gitignore; otherwise, it
   /// will return all non-hidden files.
   Future<List<String>> get _filesToPublish {
     var rootDir = entrypoint.root.dir;
 
-    // TODO(rnystrom): listDir() returns real file paths after symlinks are
-    // resolved. This means if libDir contains a symlink, the resulting paths
-    // won't appear to be within it, which confuses relativeTo(). Work around
-    // that here by making sure we have the real path to libDir. Remove this
-    // when #7346 is fixed.
-    rootDir = new File(rootDir).fullPathSync();
-
     return Futures.wait([
       dirExists(join(rootDir, '.git')),
       git.isInstalled
     ]).chain((results) {
       if (results[0] && results[1]) {
         // List all files that aren't gitignored, including those not checked
         // in to Git.
         return git.run(["ls-files", "--cached", "--others",
                         "--exclude-standard"]);
       }
 
       return listDir(rootDir, recursive: true).chain((entries) {
         return Futures.wait(entries.map((entry) {
           return fileExists(entry).transform((isFile) {
             // Skip directories.
             if (!isFile) return null;
 
             // TODO(rnystrom): Making these relative will break archive
             // creation if the cwd is ever *not* the package root directory.
             // Should instead only make these relative right before generating
             // the tree display (which is what really needs them to be).
             // Make it relative to the package root.
-            entry = relativeTo(entry, rootDir);
-
-            // TODO(rnystrom): dir.list() will include paths with resolved
-            // symlinks. In particular, we'll get paths to symlinked files from
-            // "packages" that reach outside of this package. Since the path
-            // has already been resolved, we don't even see "packages" in that
-            // path anymore.
-            // These should not be included in the archive. As a hack, ignore
-            // any file whose relative path is backing out of the root
-            // directory. Should do something cleaner.
-            var parts = path.split(entry);
-            if (!parts.isEmpty && parts[0] == '..') return null;
-
-            return entry;
+            return relativeTo(entry, rootDir);
           });
         }));
       });
     }).transform((files) => files.filter((file) {
       if (file == null || _BLACKLISTED_FILES.contains(basename(file))) {
         return false;
       }
 
       return !splitPath(file).some(_BLACKLISTED_DIRECTORIES.contains);
     }));
@@ skipping 25 matching lines @@
         var s = warnings.length == 1 ? '' : 's';
         message = "Package has ${warnings.length} warning$s. Upload anyway";
       }
 
       return confirm(message).transform((confirmed) {
         if (!confirmed) throw "Package upload canceled.";
       });
     });
   }
 }