Changeset fa90c34

Timestamp:

Dec 21, 2010, 5:54:43 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

8510d5b

Parents:

9b9efa2b

git-author:

David Benjamin <davidben@mit.edu> (12/15/10 15:53:37)

git-committer:

David Benjamin <davidben@mit.edu> (12/21/10 17:54:43)

Message:

Fixup owl_util_recursive_resolve_link to handle relative symlinks

Relative paths in symlinks are resolve relative to the parent directory.
We need to correctly handle this case.

File:

• util.c (modified) (1 diff)

util.c

@@ -391 +391 @@
 gchar *owl_util_recursive_resolve_link(const char *filename)
 {
-  gchar *last_filename = g_strdup(filename);
+  gchar *last_path = g_strdup(filename);
   GError *err = NULL;
-  while (last_filename != NULL && g_file_test(last_filename, G_FILE_TEST_IS_SYMLINK)) {
-    gchar *cur_filename = g_file_read_link(last_filename, &err);
-    g_free(last_filename);
-    last_filename = cur_filename;
-  }
-  if (last_filename == NULL) {
-    owl_function_error("Cannot resolve symlinked file %s: %s",
-                       filename, err->message);
-    g_error_free(err);
-  }
-  return last_filename;
+
+  while (g_file_test(last_path, G_FILE_TEST_IS_SYMLINK)) {
+    gchar *link_path = g_file_read_link(last_path, &err);
+    if (link_path == NULL) {
+      owl_function_error("Cannot resolve symlink %s: %s",
+                         last_path, err->message);
+      g_error_free(err);
+      g_free(last_path);
+      return NULL;
+    }
+
+    /* Deal with obnoxious relative paths. If we really care, all this
+     * is racy. Whatever. */
+    if (!g_path_is_absolute(link_path)) {
+      char *last_dir = g_path_get_dirname(last_path);
+      char *tmp = g_build_path(G_DIR_SEPARATOR_S,
+                               last_dir,
+                               link_path,
+                               NULL);
+      g_free(last_dir);
+      g_free(link_path);
+      link_path = tmp;
+    }
+
+    g_free(last_path);
+    last_path = link_path;
+  }
+  return last_path;
 }