Catching a top-level 'file not found' error.

Aaron Leung · Aaron Leung · commit a84b181a6e59 · 2012-11-30T17:06:53.000-08:00
diff --git a/document.cpp b/document.cpp
@@ -65,8 +65,9 @@ namespace Sass {
           tmp = folder + non_partial_filename;
           path_str = tmp.c_str();
           // if we still can't find the file, then throw an error
-          if (stat(path_str, &st) == -1 || S_ISDIR(st.st_mode))
+          if (stat(path_str, &st) == -1 || S_ISDIR(st.st_mode)) {
             throw path;
+          }
         }
       }
     }
diff --git a/sass_interface.cpp b/sass_interface.cpp
@@ -101,15 +101,9 @@ extern "C" {
   int sass_compile_file(sass_file_context* c_ctx)
   {
     using namespace Sass;
+    Context cpp_ctx(c_ctx->options.include_paths, c_ctx->options.image_path, c_ctx->options.source_comments);
     try {
-      Context cpp_ctx(c_ctx->options.include_paths, c_ctx->options.image_path, c_ctx->options.source_comments);
-      // Document doc(c_ctx->input_path, 0, cpp_ctx);
-      // string path_string(c_ctx->options.image_path);
-      // path_string = "'" + path_string + "/";
-      // cpp_ctx.image_path = c_ctx->options.image_path;
       Document doc(Document::make_from_file(cpp_ctx, string(c_ctx->input_path)));
-      // cerr << "MADE A DOC AND CONTEXT OBJ" << endl;
-      // cerr << "REGISTRY: " << doc.context.registry.size() << endl;
       c_ctx->output_string = process_document(doc, c_ctx->options.output_style);
       c_ctx->error_message = 0;
       c_ctx->error_status = 0;
@@ -134,6 +128,29 @@ extern "C" {
       c_ctx->output_string = 0;
       c_ctx->error_message = msg_str;
     }
+    catch(string& bad_path) {
+      for (vector<string>::iterator path = cpp_ctx.include_paths.begin(); path < cpp_ctx.include_paths.end(); ++path) {
+        try {
+          Document doc(Document::make_from_file(cpp_ctx, *path + string(c_ctx->input_path)));
+          c_ctx->output_string = process_document(doc, c_ctx->options.output_style);
+          c_ctx->error_message = 0;
+          c_ctx->error_status = 0;
+          return 0;
+        }
+        catch (string& bad_path) {
+          // continue looping
+        }
+      }
+      // couldn't find the specified file in the include paths; report an error
+      stringstream msg_stream;
+      msg_stream << "error reading file \"" << bad_path << "\"" << endl;
+      string msg(msg_stream.str());
+      char* msg_str = (char*) malloc(msg.size() + 1);
+      strcpy(msg_str, msg.c_str());
+      c_ctx->error_status = 1;
+      c_ctx->output_string = 0;
+      c_ctx->error_message = msg_str;
+    }
     // TO DO: CATCH EVERYTHING ELSE
     return 0;
   }

Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,9 @@ namespace Sass {`
`65`	`65`	`tmp = folder + non_partial_filename;`
`66`	`66`	`path_str = tmp.c_str();`
`67`	`67`	`// if we still can't find the file, then throw an error`
`68`		`- if (stat(path_str, &st) == -1 \|\| S_ISDIR(st.st_mode))`
	`68`	`+ if (stat(path_str, &st) == -1 \|\| S_ISDIR(st.st_mode)) {`
`69`	`69`	`throw path;`
	`70`	`+ }`
`70`	`71`	`}`
`71`	`72`	`}`
`72`	`73`	`}`