new function enter_file2

[swftools.git] / lib / as3 / files.c

diff --git a/lib/as3/files.c b/lib/as3/files.c
index 52e1552..cf6145b 100644 (file)
--- a/lib/as3/files.c
+++ b/lib/as3/files.c
@@ -23,7 +23,9 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <memory.h>
+#include <errno.h>
 #include "files.h"
+#include "tokenizer.h"
 
 static int verbose = 0;
 static void dbg(const char*format, ...)
@@ -148,6 +150,8 @@ char*find_file(char*filename)
 
 char*enter_file(char*filename, void*state)
 {
+    filename = strdup(filename);
+
     if(include_stack_ptr >= MAX_INCLUDE_DEPTH) {
        as3_error("Includes nested too deeply");
        exit(1);
@@ -165,7 +169,7 @@ char*enter_file(char*filename, void*state)
     include_stack[include_stack_ptr] = state;
     line_stack[include_stack_ptr] = current_line;
     column_stack[include_stack_ptr] = current_column;
-    shortfilename_stack[include_stack_ptr] = current_filename_short = strdup(filename);
+    shortfilename_stack[include_stack_ptr] = current_filename_short;
     filename_stack[include_stack_ptr] = current_filename;
     includedir_stack[include_stack_ptr] = current_include_dirs;
     add_include_dir(get_path(fullfilename));
@@ -175,20 +179,32 @@ char*enter_file(char*filename, void*state)
 
     current_line=1;
     current_column=0;
-    current_filename=fullfilename;
+    current_filename = fullfilename;
+    current_filename_short = filename;
     return fullfilename;
 }
 
+FILE*enter_file2(char*filename, void*state)
+{
+    char*fullfilename = enter_file(filename, state);
+    FILE*fi = fopen(fullfilename, "rb");
+    if(!fi) {
+       as3_error("Couldn't find file %s: %s", fullfilename, strerror(errno));
+    }
+    return fi;
+}
+
+
 void* leave_file()
 {
     dbg("leaving file %s", current_filename);
-    if(--include_stack_ptr<0) {
+    if(--include_stack_ptr<=0) {
         return 0;
     } else {
-        current_column = column_stack[include_stack_ptr];
-        current_line = line_stack[include_stack_ptr];
         free(current_filename);current_filename = filename_stack[include_stack_ptr];
         free(current_filename_short);current_filename_short = shortfilename_stack[include_stack_ptr];
+        current_column = column_stack[include_stack_ptr];
+        current_line = line_stack[include_stack_ptr];
         current_include_dirs = includedir_stack[include_stack_ptr];
         return include_stack[include_stack_ptr];
     }