* mu-util: use wordexp for shell-like expansion

src/mu-util.c

@@ -17,30 +17,36 @@
 **
 */
 
+#define _XOPEN_SOURCE
+#include <wordexp.h> /* for shell-style globbing */
+
 #include <stdlib.h>
 #include <string.h>
 
 #include "mu-util.h"
 
 char*
-mu_util_homedir_expand (const char *path)
+mu_util_dir_expand (const char *path)
 {
-	const char* home;
+	wordexp_t wexp;
+	char *dir;
 	
-	if (!path)
+	g_return_val_if_fail (path, NULL);
-		return NULL;
-	
-	if (path[0] != '~' || path[1] != G_DIR_SEPARATOR)
-		return g_strdup (path);
 
-	home = getenv ("HOME");
+	dir = NULL;
-	if (!home)
+	wordexp (path, &wexp, 0);
-		home = g_get_home_dir ();
+	if (wexp.we_wordc != 1) 
+		g_printerr ("error expanding dir '%s'", path);
+	else 
+		dir = g_strdup (wexp.we_wordv[0]);
 	
-	return g_strdup_printf ("%s%s", home, path + 1);
+	wordfree (&wexp);
+
+	return dir;
 }
 
 
+
 GSList *
 mu_util_strlist_from_args (int argc, char *argv[])
 {

src/mu-util.h

@@ -25,16 +25,14 @@
 G_BEGIN_DECLS
 
 /** 
- * get the expanded path; currently only a starting '~/' will be
+ * get the expanded path; ie. perform shell expansion on the path
- * replaced by the users home directory, ie. for a user 'bob' this could mean
- * something like "~/my/path/to/something" --> "/home/bob/my/path/to/something"
  *
  * @param path path to expand
  * 
  * @return the expanded path as a newly allocated string, or NULL in
  * case of error
  */
-char*       mu_util_homedir_expand (const char* path);
+char*       mu_util_dir_expand (const char* path);
 
 
 /**