1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
--- libseed/seed-importer.c.orig 2009-08-10 16:23:35.000000000 -0400
+++ libseed/seed-importer.c 2009-08-22 14:36:00.000000000 -0400
@@ -22,6 +22,8 @@
#include <gio/gio.h>
#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
#include "seed-private.h"
@@ -637,8 +639,9 @@ seed_importer_handle_file (JSContextRef
JSValueRef js_file_dirname;
JSObjectRef global, c_global;
JSStringRef file_contents, file_name;
- gchar *contents, *walk, *file_path, *canonical, *absolute_path;
+ gchar *contents, *walk, *file_path, *canonical, *absolute_path, *normalp;
gchar *normalized_path;
+ gsize path_max;
file_path = g_build_filename (dir, file, NULL);
canonical = seed_importer_canonicalize_path (file_path);
@@ -692,15 +695,24 @@ seed_importer_handle_file (JSContextRef
g_path_get_dirname (file_path), NULL);
}
- normalized_path = canonicalize_file_name (absolute_path);
+#ifdef PATH_MAX
+ path_max = PATH_MAX;
+#else
+ path_max = pathconf (absolute_path, _PC_PATH_MAX);
+ if (path_max <= 0)
+ path_max = 4096;
+#endif
+ normalized_path = (gchar *) g_malloc (path_max);
+ normalp = realpath (absolute_path, normalized_path);
- js_file_dirname = seed_value_from_string (ctx, normalized_path, NULL);
+ js_file_dirname = seed_value_from_string (ctx, normalp, NULL);
seed_object_set_property (nctx, global, "__script_path__", js_file_dirname);
g_hash_table_insert (file_imports, canonical, global);
g_free (file_path);
g_free (absolute_path);
+ g_free (normalized_path);
JSEvaluateScript (nctx, file_contents, NULL, file_name, 0, exception);
|
