appliance: Use configurable separator character for LIBGUESTFS_PATH.

On Windows, the path separator character will be ';' instead.
libguestfs · Feb 17, 2014 · 6b71b81 · 6b71b81
1 parent 22f6c79
commit 6b71b81
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1574,6 +1574,10 @@ PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], [
 ])
 AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test "x$bash_completion" = "xyes"])
 
+dnl For search paths.
+AC_DEFINE_UNQUOTED([PATH_SEPARATOR],["$PATH_SEPARATOR"],
+                   [Character that separates path elements in search paths])
+
 dnl Library versioning.
 MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR`
 AC_SUBST(MAX_PROC_NR)

diff --git a/src/appliance.c b/src/appliance.c
@@ -907,7 +907,7 @@ find_path (guestfs_h *g,
    * libguestfs < 1.5.4).
    */
   do {
-    len = strcspn (pelem, ":");
+    len = strcspn (pelem, PATH_SEPARATOR);
 
     /* Empty element or "." means current directory. */
     if (len == 0)
@@ -926,7 +926,7 @@ find_path (guestfs_h *g,
 
     free (*pelem_ret);
 
-    if (pelem[len] == ':')
+    if (pelem[len] == PATH_SEPARATOR[0])
       pelem += len + 1;
     else
       pelem += len;