X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Ffiles.c;h=53900271ed8ec7a58816dab0f52f50257b87ecf5;hb=015233e6dbf54b574dd7f55d11c0d0d614802fde;hp=cf6145b81104e11f0c4c585eb8ebd3adaf5f9069;hpb=6280f844ee2e70d15c06e49d2caec41308c26aae;p=swftools.git

diff --git a/lib/as3/files.c b/lib/as3/files.c
index cf6145b..5390027 100644
--- a/lib/as3/files.c
+++ b/lib/as3/files.c
@@ -49,15 +49,11 @@ static void dbg(const char*format, ...)
 }
 
 
-typedef struct _include_dir {
-    char*path;
-    struct _include_dir*next;
-} include_dir_t;
-
 int current_line=1;
 int current_column=0;
 char* current_filename=0;
 char* current_filename_short=0;
+char* current_filename_long=0;
 include_dir_t* current_include_dirs=0;
 
 #define MAX_INCLUDE_DEPTH 16
@@ -67,6 +63,7 @@ int line_stack[MAX_INCLUDE_DEPTH];
 int column_stack[MAX_INCLUDE_DEPTH];
 char* filename_stack[MAX_INCLUDE_DEPTH];
 char* shortfilename_stack[MAX_INCLUDE_DEPTH];
+char* longfilename_stack[MAX_INCLUDE_DEPTH];
 include_dir_t* includedir_stack[MAX_INCLUDE_DEPTH];
 int include_stack_ptr = 0;
 
@@ -74,11 +71,23 @@ void add_include_dir(char*dir)
 {
     include_dir_t*d = malloc(sizeof(include_dir_t));
     memset(d , 0, sizeof(include_dir_t));
-    d->path = dir;
+    d->path = strdup(dir);
     d->next = current_include_dirs;
     current_include_dirs = d;
 }
-char*get_path(char*file)
+
+void del_include_dirs(include_dir_t*d, include_dir_t*d2)
+{
+    while(d && d!=d2) {
+        include_dir_t*next = d->next;
+        free(d->path);d->path=0;
+        d->next = 0;
+        free(d);
+        d = next;
+    }
+}
+
+char*get_path(const char*file)
 {
     char*path = strdup(file);
     char*r1 = strrchr(path, '/');
@@ -93,6 +102,78 @@ char*get_path(char*file)
         return strdup(".");
     }
 }
+char* normalize_path(const char*path)
+{
+    char*n = 0, *d = 0;
+    if(path[0] != '/') {
+        char buf[512];
+        char*c = getcwd(buf,512);
+        int l = strlen(buf);
+        d = n = malloc(l+strlen(path)+10);
+        strcpy(n, buf);d += l;
+        if(!l || n[l-1]!='/') {
+            *d='/';d++;
+        }
+    } else {
+        d = n = strdup(path);
+    }
+    const char*s=path;
+    char init = 1;
+
+    while(*s) {
+        if(init && s[0] == '.' && (s[1]=='/' || s[1]=='\0')) {
+            if(!s[1]) break;
+            s+=2;
+            init=1;
+            continue;
+        }
+        if(init && s[0] == '.' && s[1] == '.' && (s[2] == '/' || s[2]=='\0')) {
+            // step one down
+            char*last = 0;
+            if(d<=n) 
+                return 0;
+            *--d = 0;
+            if(!(last=strrchr(n, '/'))) {
+                return 0;
+            }
+            d = last+1;
+            if(!s[2]) break;
+            s+=3;
+            init=1;
+            continue;
+        }
+
+        *d = *s;
+        if(*s=='/') init=1;
+        else init=0;
+        d++;s++;
+    }
+    if(d!=n && d[-1]=='/') 
+        d--;
+    *d = 0;
+    return n;
+}
+static void testnormalize()
+{
+#define TEST(x) {printf("%s -> %s\n", (x), normalize_path(x));}
+    TEST(".");
+    TEST("../as3");
+    TEST("../as3/");
+    TEST("../as3/parser.y");
+    TEST("../as3/ok/../ok/scope.as");
+    TEST("ok/scope.as");
+    TEST("ok/./scope.as");
+    TEST("./ok/scope.as");
+    TEST("./");
+    TEST("/tmp/");
+    TEST("/./tmp/");
+    TEST("../");
+    TEST("/");
+    TEST("/tmp");
+    TEST("/tmp/../usr/");
+}
+
+
 char* concat_paths(const char*base, const char*add)
 {
     int l1 = strlen(base);
@@ -109,7 +190,7 @@ char* concat_paths(const char*base, const char*add)
     memcpy(&n[l1+1],&add[pos],l2-pos+1);
     return n;
 }
-char is_absolute(char*filename) 
+char is_absolute(const char*filename) 
 {
     if(!filename || !filename[0])
         return 0;
@@ -121,7 +202,8 @@ char is_absolute(char*filename)
         return 1;
     return 0;
 }
-char*find_file(char*filename)
+
+char*find_file(const char*filename, char error)
 {
     include_dir_t*i = current_include_dirs;
     FILE*fi = 0;
@@ -131,70 +213,74 @@ char*find_file(char*filename)
             fclose(fi);
             return strdup(filename);
         }
-        return 0;
+    } else {
+        if(!i && error) {
+            as3_warning("Include directory stack is empty, while looking for file %s", filename);
+        }
+        while(i) {
+            char*p = concat_paths(i->path, filename);
+            fi = fopen(p, "rb");
+            if(fi) {
+                fclose(fi);
+                return p;
+            } else {
+                free(p);
+            }
+            i = i->next;
+        }
     }
-    if(!i) {
-        as3_warning("Include directory stack is empty, while looking for file %s", filename);
+    if(!error) {
+        return 0;
     }
+
+    as3_error("Couldn't find file %s", filename);
+    i = current_include_dirs;
     while(i) {
-        char*p = concat_paths(i->path, filename);
-        fi = fopen(p, "rb");
-        if(fi) {
-            fclose(fi);
-            return p;
-        }
+        fprintf(stderr, "include dir: %s\n", i->path);
         i = i->next;
     }
     return 0;
 }
 
-char*enter_file(char*filename, void*state)
+void enter_file(const char*name, const char*filename, void*state)
 {
-    filename = strdup(filename);
-
     if(include_stack_ptr >= MAX_INCLUDE_DEPTH) {
     	as3_error("Includes nested too deeply");
 	exit(1);
     }
-    char*fullfilename = find_file(filename);
-    if(!fullfilename) {
-    	as3_error("Couldn't find file %s", filename);
-        include_dir_t*i = current_include_dirs;
-        while(i) {
-            fprintf(stderr, "include dir: %s\n", i->path);
-            i = i->next;
-        }
-	exit(1);
-    }
     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;
+    longfilename_stack[include_stack_ptr] = current_filename_long;
     filename_stack[include_stack_ptr] = current_filename;
     includedir_stack[include_stack_ptr] = current_include_dirs;
-    add_include_dir(get_path(fullfilename));
+    
+    /*char*dir = get_path(filename);
+    add_include_dir(dir);
+    free(dir);*/
+
     include_stack_ptr++;
     
-    dbg("entering file %s", fullfilename);
+    dbg("entering file %s", filename);
 
     current_line=1;
     current_column=0;
-    current_filename = fullfilename;
-    current_filename_short = filename;
-    return fullfilename;
+    current_filename = strdup(name);
+    current_filename_short = strdup(name);
+    current_filename_long = strdup(filename);
 }
 
-FILE*enter_file2(char*filename, void*state)
+FILE*enter_file2(const char*name, const char*filename, void*state)
 {
-    char*fullfilename = enter_file(filename, state);
-    FILE*fi = fopen(fullfilename, "rb");
+    enter_file(name, filename, state);
+    FILE*fi = fopen(filename, "rb");
     if(!fi) {
-	as3_error("Couldn't find file %s: %s", fullfilename, strerror(errno));
+	as3_error("Couldn't find file %s: %s", filename, strerror(errno));
     }
     return fi;
 }
 
-
 void* leave_file()
 {
     dbg("leaving file %s", current_filename);
@@ -203,8 +289,10 @@ void* leave_file()
     } else {
         free(current_filename);current_filename = filename_stack[include_stack_ptr];
         free(current_filename_short);current_filename_short = shortfilename_stack[include_stack_ptr];
+        free(current_filename_long);current_filename_long = longfilename_stack[include_stack_ptr];
         current_column = column_stack[include_stack_ptr];
         current_line = line_stack[include_stack_ptr];
+        del_include_dirs(includedir_stack[include_stack_ptr], current_include_dirs);
         current_include_dirs = includedir_stack[include_stack_ptr];
         return include_stack[include_stack_ptr];
     }