[NaCl SDK] nacl_io: Allows subtree of html5fs to be mounted.

native_client_sdk/src/libraries/nacl_io/path.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "nacl_io/path.h"
 
 #include <stdio.h>
 #include <string.h>
 #include <string>
 
@@ skipping 26 matching lines @@
 size_t Path::Size() const {
   return paths_.size();
 }
 
 bool Path::Top() const {
   return (paths_.size() == 0) || (paths_.size() == 1 && paths_[0] == "/");
 }
 
 Path& Path::Append(const std::string& path) {
   StringArray_t paths = Split(path);
+  if (paths.size() == 0)

[binji, 2014/06/09 20:54:29]

I prefer paths.empty() for this, but it looks like paths.size() is used
elsewhere

[Sam Clegg, 2014/06/10 17:20:59]

Done.

+    return *this;
 
   for (size_t index = 0; index < paths.size(); index++) {
     // Skip ROOT
     if (paths_.size() && index == 0 && paths[0] == "/")
       continue;
     paths_.push_back(paths[index]);
   }
 
   paths_ = Normalize(paths_);
   return *this;
 }
 
 Path& Path::Prepend(const std::string& path) {
   StringArray_t paths = Split(path);
+  if (paths.size() == 0)
+    return *this;
 
   for (size_t index = 0; index < paths_.size(); index++) {
     // Skip ROOT
     if (index == 0 && paths_[0] == "/")
       continue;
-    paths.push_back(paths[index]);
+    paths.push_back(paths_[index]);

[binji, 2014/06/09 20:54:29]

why? If needed, be consistent with same in Path::Append

[Sam Clegg, 2014/06/10 17:20:59]

This is simply a bug.

Append is pushing all the paths_ onto path... Prepend is pushing paths_ onto
paths.

The bug here is that paths was being pushed onto itself.

Guess we should have a test.

[binji, 2014/06/10 18:00:58]

I see.

   }
+
   paths_ = Normalize(paths);
   return *this;
 }
 
 Path& Path::Set(const std::string& path) {
   StringArray_t paths = Split(path);
   paths_ = Normalize(paths);
   return *this;
 }
 
@@ skipping 125 matching lines @@
 Path& Path::operator=(const Path& p) {
   paths_ = p.paths_;
   return *this;
 }
 
 Path& Path::operator=(const std::string& p) {
   return Set(p);
 }
 
 }  // namespace nacl_io