[evolution-data-server] Bug 642783 - CamelLocalFolder: Let glibc's realpath() allocate for us

[Matthew Barnes <mbarnes src gnome org>]

commit b60d2b8f74702cfa26e24ed67dede58fb9aabddc
Author: Emilio Pozuelo Monfort <pochu27 gmail com>
Date:   Tue Mar 8 12:45:25 2011 -0500

    Bug 642783 - CamelLocalFolder: Let glibc's realpath() allocate for us

 camel/providers/local/camel-local-folder.c |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)
---
diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
index e76a124..b872b66 100644
--- a/camel/providers/local/camel-local-folder.c
+++ b/camel/providers/local/camel-local-folder.c
@@ -501,7 +501,11 @@ camel_local_folder_construct (CamelLocalFolder *lf,
 	const gchar *root_dir_path;
 	gchar *tmp, *statepath;
 #ifndef G_OS_WIN32
+#ifdef __GLIBC__
+	gchar *folder_path;
+#else
 	gchar folder_path[PATH_MAX];
+#endif
 	struct stat st;
 #endif
 	gint forceindex, len;
@@ -549,12 +553,27 @@ camel_local_folder_construct (CamelLocalFolder *lf,
 		camel_local_folder_set_index_body (lf, TRUE);
 		camel_object_state_write (CAMEL_OBJECT (lf));
 	}
+
+	/* XXX Canonicalizing the folder path portably is a messy affair.
+	 *     The proposed GLib function in [1] would be useful here.
+	 *
+	 *     [1] https://bugzilla.gnome.org/show_bug.cgi?id=111848
+	 */
 #ifndef G_OS_WIN32
 	/* follow any symlinks to the mailbox */
 	if (g_lstat (lf->folder_path, &st) != -1 && S_ISLNK (st.st_mode) &&
+#ifdef __GLIBC__
+	    (folder_path = realpath (lf->folder_path, NULL)) != NULL) {
+#else
 	    realpath (lf->folder_path, folder_path) != NULL) {
+#endif
 		g_free (lf->folder_path);
 		lf->folder_path = g_strdup (folder_path);
+#ifdef __GLIBC__
+		/* Not a typo.  Use free() here, not g_free().
+		 * The path string was allocated by realpath(). */
+		free (folder_path);
+#endif
 	}
 #endif
 	lf->changes = camel_folder_change_info_new ();