valadoc: Drop custom realpath()

diff --git a/libvaladoc/api/tree.vala b/libvaladoc/api/tree.vala
index 4344c2e4603d40212ebc981aa669f1e38fa960d3..b505fafcdea85292e1261eae3917c616ad77950c 100644 (file)
--- a/libvaladoc/api/tree.vala
+++ b/libvaladoc/api/tree.vala
@@ -332,7 +332,7 @@ public class Valadoc.Api.Tree {
                                        continue;
                                }
 
-                               path = realpath (path);
+                               path = Vala.CodeContext.realpath (path);
                                imported = true;
 
                                if (!processed.contains (path)) {

diff --git a/libvaladoc/filehelper.vala b/libvaladoc/filehelper.vala
index 54c7b87ac076123c06f68fdeff1e2c2d3cfc011f..c9ff9c137cf6c7fbe4ba4418e83e5fd5440e7fce 100644 (file)
--- a/libvaladoc/filehelper.vala
+++ b/libvaladoc/filehelper.vala
@@ -112,88 +112,5 @@ namespace Valadoc {
 
                return true;
        }
-
-
-       private inline bool ends_with_dir_separator (string s) {
-               // --- ported from libvala ---
-               return Path.is_dir_separator (s.get_char (s.length - 1));
-       }
-
-       /**
-        * Returns canonicalized absolute pathname
-        *
-        * @param name the path being checked
-        * @return a canonicalized absolute pathname
-        */
-       public string realpath (string name) {
-               // --- ported from libvala ---
-
-               string rpath;
-
-               // start of path component
-               weak string start;
-               // end of path component
-               weak string end;
-
-               if (!Path.is_absolute (name)) {
-                       // relative path
-                       rpath = Environment.get_current_dir ();
-
-                       start = end = name;
-               } else {
-                       // set start after root
-                       start = end = Path.skip_root (name);
-
-                       // extract root
-                       rpath = name.substring (0, (int) ((char*) start - (char*) name));
-               }
-
-               long root_len = (long) ((char*) Path.skip_root (rpath) - (char*) rpath);
-
-               for (; start.get_char () != 0; start = end) {
-                       // skip sequence of multiple path-separators
-                       while (Path.is_dir_separator (start.get_char ())) {
-                               start = start.next_char ();
-                       }
-
-                       // find end of path component
-                       long len = 0;
-                       for (end = start; end.get_char () != 0 && !Path.is_dir_separator (end.get_char ()); end = end.next_char ()) {
-                               len++;
-                       }
-
-                       if (len == 0) {
-                               break;
-                       } else if (len == 1 && start.get_char () == '.') {
-                               // do nothing
-                       } else if (len == 2 && start.has_prefix ("..")) {
-                               // back up to previous component, ignore if at root already
-                               if (rpath.length > root_len) {
-                                       do {
-                                               rpath = rpath.substring (0, rpath.length - 1);
-                                       } while (!ends_with_dir_separator (rpath));
-                               }
-                       } else {
-                               if (!ends_with_dir_separator (rpath)) {
-                                       rpath += Path.DIR_SEPARATOR_S;
-                               }
-
-                               rpath += start.substring (0, len);
-                       }
-               }
-
-               if (rpath.length > root_len && ends_with_dir_separator (rpath)) {
-                       rpath = rpath.substring (0, rpath.length - 1);
-               }
-
-               if (Path.DIR_SEPARATOR != '/') {
-                       // don't use backslashes internally,
-                       // to avoid problems in #include directives
-                       string[] components = rpath.split ("\\");
-                       rpath = string.joinv ("/", components);
-               }
-
-               return rpath;
-       }
 }
 

diff --git a/libvaladoc/importer/internalidregistrar.vala b/libvaladoc/importer/internalidregistrar.vala
index 8bad9ab1eeefc5f343a71b6cfe88a71eee875797..fcc1e5a2ad0ee11c2ca47ff57ab96351be0ee44a 100644 (file)
--- a/libvaladoc/importer/internalidregistrar.vala
+++ b/libvaladoc/importer/internalidregistrar.vala
@@ -52,7 +52,7 @@ public class Valadoc.Importer.InternalIdRegistrar {
                Vala.SourceLocation end;
                Vala.MarkupTokenType token;
 
-               string base_path = index_sgml_online ?? realpath (filename);
+               string base_path = index_sgml_online ?? Vala.CodeContext.realpath (filename);
                var reader = new Vala.MarkupReader (filename);
 
                while ((token = reader.read_token (out begin, out end)) != Vala.MarkupTokenType.EOF) {

diff --git a/libvaladoc/moduleloader.vala b/libvaladoc/moduleloader.vala
index 7f729a0a3e61be933566135a869145174dc43d5e..d73adda7492774ece97db801e84c73ec18890092 100644 (file)
--- a/libvaladoc/moduleloader.vala
+++ b/libvaladoc/moduleloader.vala
@@ -92,7 +92,7 @@ public class Valadoc.ModuleLoader : Object {
        }
 
        public Doclet? create_doclet (string _path) {
-               string path = realpath (_path);
+               string path = Vala.CodeContext.realpath (_path);
 
                ModuleData? data = doclets.get (path);
                if (data == null) {

diff --git a/vala/valacodecontext.vala b/vala/valacodecontext.vala
index 404d9d8ae5d57fd22801132a4fe6cbc4d11ac9f0..ad6fcd44e3bd97fe471611be2cbc4a7152b0076d 100644 (file)
--- a/vala/valacodecontext.vala
+++ b/vala/valacodecontext.vala
@@ -603,7 +603,13 @@ public class Vala.CodeContext {
                return Path.is_dir_separator (s.get_char (s.length - 1));
        }
 
-       /* ported from glibc */
+       /**
+        * Returns canonicalized absolute pathname
+        * ported from glibc
+        *
+        * @param name the path being checked
+        * @return a canonicalized absolute pathname
+        */
        public static string realpath (string name) {
                string rpath;
 

diff --git a/valadoc/doclets/gtkdoc/doclet.vala b/valadoc/doclets/gtkdoc/doclet.vala
index 11b6e88a131ed6d0c3292505585309c36d6e6ee3..c8c8bb0dcac176252700f2bda099a1eb7347bea4 100644 (file)
--- a/valadoc/doclets/gtkdoc/doclet.vala
+++ b/valadoc/doclets/gtkdoc/doclet.vala
@@ -64,7 +64,7 @@ namespace Gtkdoc.Config {
 
                // real path to ignored headers
                for (int i=0; i < ignore_headers.length; i++) {
-                       var realheader = realpath (ignore_headers[i]);
+                       var realheader = Vala.CodeContext.realpath (ignore_headers[i]);
                        if (realheader != null) {
                                ignore_headers[i] = realheader;
                        }
@@ -179,7 +179,7 @@ public class Gtkdoc.Director : Valadoc.Doclet, Object {
                string[] prepared = new string[]{};
 
                foreach (string relative_filename in files) {
-                       var filename = realpath (relative_filename);
+                       var filename = Vala.CodeContext.realpath (relative_filename);
 
                        if (filename in prepared) {
                                continue;
@@ -253,7 +253,7 @@ public class Gtkdoc.Director : Valadoc.Doclet, Object {
                StringBuilder library_paths = new StringBuilder ();
                StringBuilder library_dirs = new StringBuilder ();
                foreach (string library in Config.library_filenames) {
-                       string so_path = realpath (library);
+                       string so_path = Vala.CodeContext.realpath (library);
                        string name = Path.get_dirname (so_path);
                        library_dirs.append (name);
                        library_paths.append (so_path);

diff --git a/valadoc/treebuilder.vala b/valadoc/treebuilder.vala
index b060e0ccd970b43ee380f3a0349a635fbe979f12..bc32e9832e2965a26a6532009f41a2de52639a15 100644 (file)
--- a/valadoc/treebuilder.vala
+++ b/valadoc/treebuilder.vala
@@ -819,7 +819,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 
                foreach (string source in sources) {
                        if (FileUtils.test (source, FileTest.EXISTS)) {
-                               var rpath = realpath (source);
+                               var rpath = Vala.CodeContext.realpath (source);
                                if (source.has_suffix (".vala") || source.has_suffix (".gs")) {
                                        var source_file = new Vala.SourceFile (context, Vala.SourceFileType.SOURCE, rpath);
 
@@ -877,13 +877,13 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
                context.gir_directories = settings.gir_directories;
 
                if (settings.basedir == null) {
-                       context.basedir = realpath (".");
+                       context.basedir = Vala.CodeContext.realpath (".");
                } else {
-                       context.basedir = realpath (settings.basedir);
+                       context.basedir = Vala.CodeContext.realpath (settings.basedir);
                }
 
                if (settings.directory != null) {
-                       context.directory = realpath (settings.directory);
+                       context.directory = Vala.CodeContext.realpath (settings.directory);
                } else {
                        context.directory = context.basedir;
                }

diff --git a/valadoc/valadoc.vala b/valadoc/valadoc.vala
index d68ed62e56a09e0f036ea5decdc346322949d934..11263a0f76d627d88f13953588910d1c1267dbc2 100644 (file)
--- a/valadoc/valadoc.vala
+++ b/valadoc/valadoc.vala
@@ -209,7 +209,7 @@ public class ValaDoc : Object {
                settings._internal = ValaDoc._internal;
                settings.with_deps = ValaDoc.with_deps;
                settings._private = ValaDoc._private;
-               settings.path = realpath (ValaDoc.directory);
+               settings.path = Vala.CodeContext.realpath (ValaDoc.directory);
                settings.verbose = ValaDoc.verbose;
                settings.wiki_directory = ValaDoc.wikidirectory;
                settings.pluginargs = ValaDoc.pluginargs;