Minor bug fixes.

c++/src/capnp/compiler/capnpc-c++.c++

@@ -21,8 +21,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// This program is a code generator plugin for capnpc which writes the schema back to stdout in
-// roughly capnpc format.
+// This program is a code generator plugin for `capnp compile` which generates C++ code.
 
 #include <capnp/schema.capnp.h>
 #include "../serialize.h"

c++/src/capnp/compiler/capnpc-capnp.c++

@@ -21,8 +21,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// This program is a code generator plugin for capnpc which writes the schema back to stdout in
-// roughly capnpc format.
+// This program is a code generator plugin for `capnp compile` which writes the schema back to
+// stdout in roughly capnpc format.
 
 #include <capnp/schema.capnp.h>
 #include "../serialize.h"

c++/src/capnp/compiler/module-loader.c++

@@ -171,7 +171,9 @@ static char* canonicalizePath(char* path) {
 kj::String canonicalizePath(kj::StringPtr path) {
   KJ_STACK_ARRAY(char, result, path.size() + 1, 128, 512);
   strcpy(result.begin(), path.begin());
-  char* end = canonicalizePath(result.begin());
+
+  char* start = path.startsWith("/") ? result.begin() + 1 : result.begin();
+  char* end = canonicalizePath(start);
   return kj::heapString(result.slice(0, end - result.begin()));
 }