Make paths in source comments relative to CWD

Author: mgreter

src/file.cpp

@@ -218,7 +218,7 @@ namespace Sass {
     // create an absolute path by resolving relative paths with cwd
     std::string rel2abs(const std::string& path, const std::string& base, const std::string& cwd)
     {
-      return make_canonical_path(join_paths(join_paths(cwd, base), path));
+      return make_canonical_path(join_paths(join_paths(cwd + "/", base + "/"), path));
     }
 
     // create a path that is relative to the given base directory

src/output.cpp

@@ -129,7 +129,8 @@ namespace Sass {
     if (opt.source_comments) {
       std::stringstream ss;
       append_indentation();
-      ss << "/* line " << r->pstate().line + 1 << ", " << r->pstate().path << " */";
+      std::string path(File::abs2rel(r->pstate().path));
+      ss << "/* line " << r->pstate().line + 1 << ", " << path << " */";
       append_string(ss.str());
       append_optional_linefeed();
     }