--- open-vm-tools-10.0.5-3227872/lib/include/vmware/guestrpc/vmbackup.h	2015-11-23 23:07:44.000000000 -0800

+++ open-vm-tools-10.0.5-3227872/lib/include/vmware/guestrpc/vmbackup.h	2017-01-11 02:08:21.000000000 -0800

@@ -1,5 +1,5 @@ 

 /*********************************************************

- * Copyright (C) 2007-2015 VMware, Inc. All rights reserved.

+ * Copyright (C) 2007-2016 VMware, Inc. All rights reserved.

  *

  * This program is free software; you can redistribute it and/or modify it

  * under the terms of the GNU Lesser General Public License as published

@@ -54,6 +54,8 @@ 

 #define VMBACKUP_PROTOCOL_ABORT           VMBACKUP_PROTOCOL_PREFIX"abort"

 #define VMBACKUP_PROTOCOL_SNAPSHOT_DONE   VMBACKUP_PROTOCOL_PREFIX"snapshotDone"

 #define VMBACKUP_PROTOCOL_EVENT_SET       VMBACKUP_PROTOCOL_PREFIX"eventSet"

+#define VMBACKUP_PROTOCOL_SNAPSHOT_COMPLETED \

+   VMBACKUP_PROTOCOL_PREFIX"snapshotCompleted"

 /* These are responses to messages sent to the guest. */

 #define VMBACKUP_PROTOCOL_ERROR           "protocol.error"

--- open-vm-tools-10.0.5-3227872/services/plugins/vmbackup/guestQuiesce.x	2015-11-23 23:07:44.000000000 -0800

+++ open-vm-tools-10.0.5-3227872/services/plugins/vmbackup/guestQuiesce.x	2017-01-11 02:08:21.000000000 -0800

@@ -1,5 +1,5 @@ 

 /*********************************************************

- * Copyright (C) 2010-2015 VMware, Inc. All rights reserved.

+ * Copyright (C) 2010-2016 VMware, Inc. All rights reserved.

  *

  * This program is free software; you can redistribute it and/or modify it

  * under the terms of the GNU Lesser General Public License as published

@@ -24,12 +24,14 @@ 

  */

 enum GuestQuiesceParamsVersion {

-   GUESTQUIESCEPARAMS_V1 = 1

+   GUESTQUIESCEPARAMS_V1 = 1,

+   GUESTQUIESCEPARAMS_V2 = 2

 };

 const GUESTQUIESCE_SCRIPTARG_MAX_LEN = 256;

 const GUESTQUIESCE_DISKUUID_MAX_LEN = 3200;   /* (UUID_MAXLEN + 1) * 64 disks */

+

 /*  Guest Quiescing parameters. */

 struct GuestQuiesceParamsV1 {

    Bool createManifest;     /* Create manifest describing the operations */

@@ -42,7 +44,19 @@ 

    string diskUuids<GUESTQUIESCE_DISKUUID_MAX_LEN>;   /* disk Uuids */

 };

+/*  Guest Quiescing parameters V2. */

+struct GuestQuiesceParamsV2 {

+   struct GuestQuiesceParamsV1 paramsV1;

+   uint32 vssBackupContext;

+   uint32 vssBackupType;

+   Bool vssBootableSystemState;

+   Bool vssPartialFileSupport;

+};

+

+

 union GuestQuiesceParams switch (GuestQuiesceParamsVersion ver) {

 case GUESTQUIESCEPARAMS_V1:

    struct GuestQuiesceParamsV1 *guestQuiesceParamsV1;

+case GUESTQUIESCEPARAMS_V2:

+   struct GuestQuiesceParamsV2 *guestQuiesceParamsV2;

 };

--- open-vm-tools-10.0.5-3227872/lib/include/vmware/tools/utils.h	2015-11-23 23:07:44.000000000 -0800

+++ open-vm-tools-10.0.5-3227872/lib/include/vmware/tools/utils.h	2017-01-11 02:07:50.000000000 -0800

@@ -1,5 +1,5 @@ 

 /*********************************************************

- * Copyright (C) 2008-2015 VMware, Inc. All rights reserved.

+ * Copyright (C) 2008-2016 VMware, Inc. All rights reserved.

  *

  * This program is free software; you can redistribute it and/or modify it

  * under the terms of the GNU Lesser General Public License as published

@@ -121,6 +121,24 @@ 

                           const gchar *domain,

                           GKeyFile *conf);

+gboolean

+VMTools_ConfigGetBoolean(GKeyFile *config,

+                         const gchar *section,

+                         const gchar *key,

+                         gboolean defValue);

+

+gint

+VMTools_ConfigGetInteger(GKeyFile *config,

+                         const gchar *section,

+                         const gchar *key,

+                         gint defValue);

+

+gchar *

+VMTools_ConfigGetString(GKeyFile *config,

+                        const gchar *section,

+                        const gchar *key,

+                        gchar *defValue);

+

 #if defined(G_PLATFORM_WIN32)

 gboolean

--- open-vm-tools-10.0.5-3227872/libvmtools/vmtoolsConfig.c	2015-11-23 23:07:44.000000000 -0800

+++ open-vm-tools-10.0.5-3227872/libvmtools/vmtoolsConfig.c	2017-01-11 02:07:50.000000000 -0800

@@ -1,5 +1,5 @@ 

 /*********************************************************

- * Copyright (C) 2008-2015 VMware, Inc. All rights reserved.

+ * Copyright (C) 2008-2016 VMware, Inc. All rights reserved.

  *

  * This program is free software; you can redistribute it and/or modify it

  * under the terms of the GNU Lesser General Public License as published

@@ -329,7 +329,12 @@ 

    gchar *backup = NULL;

    gchar *defaultPath = NULL;

    gchar *localPath = NULL;

+   /* GStatBuf was added in 2.26. */

+#if GLIB_CHECK_VERSION(2, 26, 0)

+   GStatBuf confStat;

+#else

    struct stat confStat;

+#endif

    GHashTable *old = NULL;

    GError *err = NULL;

    GKeyFile *cfg = NULL;

@@ -527,3 +532,122 @@ 

    return ret;

 }

+

+/**

+ * Loads boolean value for a key from the specified config section.

+ *

+ * @param[in]  config   Config file to read the key from.

+ * @param[in]  section  Section to look for in the config file.

+ * @param[in]  defValue Default value if the key is not found or error.

+ *

+ * @return value of the key if value was read successfully, else defValue.

+ */

+

+gboolean

+VMTools_ConfigGetBoolean(GKeyFile *config,

+                         const gchar *section,

+                         const gchar *key,

+                         gboolean defValue)

+{

+   GError *err = NULL;

+   gboolean value;

+

+   if (config == NULL || section == NULL || key == NULL) {

+      g_debug("%s: Returning default value for '[%s] %s'=%s.\n",

+              __FUNCTION__, section ? section : "(null)",

+              key ? key : "(null)", defValue ? "TRUE" : "FALSE");

+      return defValue;

+   }

+

+   value = g_key_file_get_boolean(config, section, key, &err;;

+   if (err != NULL) {

+      if (err->code != G_KEY_FILE_ERROR_KEY_NOT_FOUND &&

+          err->code != G_KEY_FILE_ERROR_GROUP_NOT_FOUND) {

+         g_warning("%s: Failed to get value for '[%s] %s': %s (err=%d).\n",

+                   __FUNCTION__, section, key, err->message, err->code);

+      }

+      g_debug("%s: Returning default value for '[%s] %s'=%s.\n",

+              __FUNCTION__, section, key, defValue ? "TRUE" : "FALSE");

+      value = defValue;

+      g_clear_error(&err;;

+   }

+   return value;

+}

+

+

+/**

+ * Loads integer value for a key from the specified config section.

+ *

+ * @param[in]  config   Config file to read the key from.

+ * @param[in]  section  Section to look for in the config file.

+ * @param[in]  defValue Default value if the key is not found or error.

+ *

+ * @return value of the key if value was read successfully, else defValue.

+ */

+

+gint

+VMTools_ConfigGetInteger(GKeyFile *config,

+                         const gchar *section,

+                         const gchar *key,

+                         gint defValue)

+{

+   GError *err = NULL;

+   gint value;

+

+   ASSERT(config);

+   ASSERT(key);

+   ASSERT(section);

+

+   value = g_key_file_get_integer(config, section, key, &err;;

+   if (err != NULL) {

+      if (err->code != G_KEY_FILE_ERROR_KEY_NOT_FOUND &&

+          err->code != G_KEY_FILE_ERROR_GROUP_NOT_FOUND) {

+         g_warning("%s: Failed to get value for '[%s] %s': %s (err=%d).\n",

+                   __FUNCTION__, section, key, err->message, err->code);

+      }

+      g_debug("%s: Returning default value for '[%s] %s'=%d.\n",

+              __FUNCTION__, section, key, defValue);

+      value = defValue;

+      g_clear_error(&err;;

+   }

+   return value;

+}

+

+

+/**

+ * Loads string value for a key from the specified config section.

+ *

+ * @param[in]  config   Config file to read the key from.

+ * @param[in]  section  Section to look for in the config file.

+ * @param[in]  defValue Default value if the key is not found or error.

+ *

+ * @return value of the key if value was read successfully, else defValue.

+ */

+

+gchar *

+VMTools_ConfigGetString(GKeyFile *config,

+                        const gchar *section,

+                        const gchar *key,

+                        gchar *defValue)

+{

+   GError *err = NULL;

+   gchar *value;

+

+   ASSERT(config);

+   ASSERT(key);

+   ASSERT(section);

+

+   value = g_key_file_get_string(config, section, key, &err;;

+   if (err != NULL) {

+      if (err->code != G_KEY_FILE_ERROR_KEY_NOT_FOUND &&

+          err->code != G_KEY_FILE_ERROR_GROUP_NOT_FOUND) {

+         g_warning("%s: Failed to get value for '[%s] %s': %s (err=%d).\n",

+                   __FUNCTION__, section, key, err->message, err->code);

+      }

+      g_debug("%s: Returning default value for '[%s] %s'=%s.\n",

+              __FUNCTION__, section, key, defValue ? defValue : "(null)");

+      value = defValue;

+      g_clear_error(&err;;

+   }

+   return value;

+}

--- open-vm-tools-10.0.5-3227872/lib/syncDriver/Makefile.am	2015-11-23 23:07:44.000000000 -0800

+++ open-vm-tools-10.0.5-3227872/lib/syncDriver/Makefile.am	2017-01-11 02:07:53.000000000 -0800

@@ -1,5 +1,5 @@ 

 ################################################################################

-### Copyright (C) 2007-2015 VMware, Inc.  All rights reserved.

+### Copyright (C) 2007-2016 VMware, Inc.  All rights reserved.

 ###

 ### This program is free software; you can redistribute it and/or modify

 ### it under the terms of version 2 of the GNU General Public License as

@@ -17,6 +17,9 @@ 

 noinst_LTLIBRARIES = libSyncDriver.la

+libSyncDriver_la_CPPFLAGS =

+libSyncDriver_la_CPPFLAGS += @GLIB2_CPPFLAGS@

+

 libSyncDriver_la_SOURCES =

 libSyncDriver_la_SOURCES += syncDriverPosix.c

--- open-vm-tools-10.0.5-3227872/lib/syncDriver/nullDriver.c	2015-11-23 23:07:44.000000000 -0800

+++ open-vm-tools-10.0.5-3227872/lib/syncDriver/nullDriver.c	2017-01-11 02:08:10.000000000 -0800

@@ -1,5 +1,5 @@ 

 /*********************************************************

- * Copyright (C) 2011-2015 VMware, Inc. All rights reserved.

+ * Copyright (C) 2011-2016 VMware, Inc. All rights reserved.

  *

  * This program is free software; you can redistribute it and/or modify it

  * under the terms of the GNU Lesser General Public License as published

@@ -63,7 +63,7 @@ 

  */

 SyncDriverErr

-NullDriver_Freeze(const char *paths,

+NullDriver_Freeze(const GSList *paths,

                   SyncDriverHandle *handle)

 {

    /*

--- open-vm-tools-10.0.5-3227872/lib/syncDriver/syncDriverInt.h	2015-11-23 23:07:44.000000000 -0800

+++ open-vm-tools-10.0.5-3227872/lib/syncDriver/syncDriverInt.h	2017-01-11 02:08:10.000000000 -0800

@@ -1,5 +1,5 @@ 

 /*********************************************************

- * Copyright (C) 2011-2015 VMware, Inc. All rights reserved.

+ * Copyright (C) 2011-2016 VMware, Inc. All rights reserved.

  *

  * This program is free software; you can redistribute it and/or modify it

  * under the terms of the GNU Lesser General Public License as published

@@ -25,19 +25,22 @@ 

  * Internal definitions for the sync driver library.

  */

+#include <glib.h>

 #include "syncDriver.h"

 #define LGPFX "SyncDriver: "

 #if !defined(Win32)

+#define SYNCDRIVER_PATH_SEPARATOR   ':'

+

 typedef enum {

    SD_SUCCESS,

    SD_ERROR,

    SD_UNAVAILABLE,

 } SyncDriverErr;

-typedef SyncDriverErr (*SyncFreezeFn)(const char *paths,

+typedef SyncDriverErr (*SyncFreezeFn)(const GSList *paths,

                                       SyncDriverHandle *handle);

 typedef struct SyncHandle {

@@ -47,15 +50,15 @@ 

 #if defined(linux)

 SyncDriverErr

-LinuxDriver_Freeze(const char *userPaths,

+LinuxDriver_Freeze(const GSList *userPaths,

                    SyncDriverHandle *handle);

 SyncDriverErr

-VmSync_Freeze(const char *userPaths,

+VmSync_Freeze(const GSList *userPaths,

               SyncDriverHandle *handle);

 SyncDriverErr

-NullDriver_Freeze(const char *userPaths,

+NullDriver_Freeze(const GSList *userPaths,

                   SyncDriverHandle *handle);

 #endif

--- open-vm-tools-10.0.5-3227872/lib/syncDriver/syncDriverLinux.c	2015-11-23 23:07:44.000000000 -0800

+++ open-vm-tools-10.0.5-3227872/lib/syncDriver/syncDriverLinux.c	2017-01-11 02:08:10.000000000 -0800

@@ -1,5 +1,5 @@ 

 /*********************************************************

- * Copyright (C) 2011-2015 VMware, Inc. All rights reserved.

+ * Copyright (C) 2011-2017 VMware, Inc. All rights reserved.

  *

  * This program is free software; you can redistribute it and/or modify it

  * under the terms of the GNU Lesser General Public License as published

@@ -32,7 +32,6 @@ 

 #include <sys/ioctl.h>

 #include "debug.h"

 #include "dynbuf.h"

-#include "strutil.h"

 #include "syncDriverInt.h"

 /* Out toolchain headers are somewhat outdated and don't define these. */

@@ -70,8 +69,13 @@ 

    LinuxDriver *sync = (LinuxDriver *) handle;

    SyncDriverErr err = SD_SUCCESS;

-   for (i = 0; i < sync->fdCnt; i++) {

-      if (ioctl(sync->fds[i], FITHAW) == -1) {

+   /*

+    * Thaw in the reverse order of freeze

+    */

+   for (i = sync->fdCnt; i > 0; i--) {

+      Debug(LGPFX "Thawing fd=%d.\n", sync->fds[i-1]);

+      if (ioctl(sync->fds[i-1], FITHAW) == -1) {

+         Debug(LGPFX "Thaw failed for fd=%d.\n", sync->fds[i-1]);

          err = SD_ERROR;

       }

    }

@@ -98,8 +102,12 @@ 

    LinuxDriver *sync = (LinuxDriver *) handle;

    size_t i;

-   for (i = 0; i < sync->fdCnt; i++) {

-      close(sync->fds[i]);

+   /*

+    * Close in the reverse order of open

+    */

+   for (i = sync->fdCnt; i > 0; i--) {

+      Debug(LGPFX "Closing fd=%d.\n", sync->fds[i-1]);

+      close(sync->fds[i-1]);

    }

    free(sync->fds);

    free(sync);

@@ -120,7 +128,7 @@ 

  * slow when guest is performing significant IO. Therefore, caller should

  * consider running this function in a separate thread.

  *

- * @param[in]  paths    Paths to freeze (colon-separated).

+ * @param[in]  paths    List of paths to freeze.

  * @param[out] handle   Handle to use for thawing.

  *

  * @return A SyncDriverErr.

@@ -129,13 +137,10 @@ 

  */

 SyncDriverErr

-LinuxDriver_Freeze(const char *paths,

+LinuxDriver_Freeze(const GSList *paths,

                    SyncDriverHandle *handle)

 {

-   char *path;

-   int fd;

-   size_t count = 0;

-   unsigned int index = 0;

+   ssize_t count = 0;

    Bool first = TRUE;

    DynBuf fds;

    LinuxDriver *sync = NULL;

@@ -143,7 +148,7 @@ 

    DynBuf_Init(&fds);

-   Debug(LGPFX "Freezing %s using Linux ioctls...\n", paths);

+   Debug(LGPFX "Freezing using Linux ioctls...\n");

    sync = calloc(1, sizeof *sync);

    if (sync == NULL) {

@@ -154,12 +159,20 @@ 

    sync->driver.close = LinuxFiClose;

    /*

+    * Ensure we did not get an empty list

+    */

+   VERIFY(paths != NULL);

+

+   /*

     * Iterate through the requested paths. If we get an error for the first

     * path, and it's not EPERM, assume that the ioctls are not available in

     * the current kernel.

     */

-   while ((path = StrUtil_GetNextToken(&index, paths, ":")) != NULL) {

+   while (paths != NULL) {

+      int fd;

+      const char *path = paths->data;

       Debug(LGPFX "opening path '%s'.\n", path);

+      paths = g_slist_next(paths);

       fd = open(path, O_RDONLY);

       if (fd == -1) {

          switch (errno) {

@@ -169,7 +182,6 @@ 

              * as users with permission 700, so just ignore these.

              */

             Debug(LGPFX "cannot access mounted directory '%s'.\n", path);

-            free(path);

             continue;

          case EIO:

@@ -179,19 +191,17 @@ 

              * this should be enough. Just skip.

              */

             Debug(LGPFX "I/O error reading directory '%s'.\n", path);

-            free(path);

             continue;

          default:

             Debug(LGPFX "failed to open '%s': %d (%s)\n",

                   path, errno, strerror(errno));

             err = SD_ERROR;

-            free(path);

             goto exit;

          }

       }

-      Debug(LGPFX "freezing path '%s'.\n", path);

+      Debug(LGPFX "freezing path '%s' (fd=%d).\n", path, fd);

       if (ioctl(fd, FIFREEZE) == -1) {

          int ioctlerr = errno;

          /*

@@ -211,17 +221,15 @@ 

             Debug(LGPFX "failed to freeze '%s': %d (%s)\n",

                   path, ioctlerr, strerror(ioctlerr));

             err = first && ioctlerr == ENOTTY ? SD_UNAVAILABLE : SD_ERROR;

-            free(path);

             break;

          }

       } else {

-         Debug(LGPFX "successfully froze '%s'.\n", path);

+         Debug(LGPFX "successfully froze '%s' (fd=%d).\n", path, fd);

          if (!DynBuf_Append(&fds, &fd, sizeof fd)) {

             if (ioctl(fd, FITHAW) == -1) {

                Warning(LGPFX "failed to thaw '%s': %d (%s)\n",

                        path, errno, strerror(errno));

             }

-            free(path);

             close(fd);

             err = SD_ERROR;

             break;

@@ -229,7 +237,6 @@ 

          count++;

       }

-      free(path);

       first = FALSE;

    }

--- open-vm-tools-10.0.5-3227872/lib/syncDriver/syncDriverPosix.c	2015-11-23 23:07:44.000000000 -0800

+++ open-vm-tools-10.0.5-3227872/lib/syncDriver/syncDriverPosix.c	2017-01-11 02:08:10.000000000 -0800

@@ -1,5 +1,5 @@ 

 /*********************************************************

- * Copyright (C) 2005-2015 VMware, Inc. All rights reserved.

+ * Copyright (C) 2005-2016 VMware, Inc. All rights reserved.

  *

  * This program is free software; you can redistribute it and/or modify it

  * under the terms of the GNU Lesser General Public License as published

@@ -25,9 +25,9 @@ 

 #include <stdio.h>

 #include <sys/param.h>

 #include <sys/mount.h>

+#include <glib.h>

 #include "vmware.h"

 #include "debug.h"

-#include "dynbuf.h"

 #include "str.h"

 #include "syncDriverInt.h"

 #include "util.h"

@@ -85,19 +85,21 @@ 

 /*

  *-----------------------------------------------------------------------------

  *

- * SyncDriverListMounts --

+ * SyncDriverLocalMounts --

  *

- *    Returns a newly allocated string containing a list of colon-separated

- *    mount paths in the system. No filtering is done, so all paths are added.

- *    This assumes that the driver allows "unfreezable" paths to be provided

- *    to the freeze command.

+ *    Returns a singly-linked list of all local disk paths mounted in the

+ *    system filtering out remote file systems. There is no filtering for

+ *    other mount points because we assume that the underlying driver and

+ *    IOCTL can deal with "unfreezable" paths. The returned list of paths

+ *    is in the reverse order of the paths returned by GETNEXT_MNTINFO.

+ *    Caller must free each path and the list itself.

  *

  *    XXX: mntinfo.h mentions Solaris and Linux, but not FreeBSD. If we ever

  *    have a FreeBSD sync driver, we should make sure this function also

  *    works there.

  *

  * Results:

- *    The list of devices to freeze, or NULL on failure.

+ *    GSList* on success, NULL on failure.

  *

  * Side effects:

  *    None

@@ -105,21 +107,20 @@ 

  *-----------------------------------------------------------------------------

  */

-static char *

-SyncDriverListMounts(void)

+static GSList *

+SyncDriverLocalMounts(void)

 {

-   char *paths = NULL;

-   DynBuf buf;

+   GSList *paths = NULL;

    MNTHANDLE mounts;

    DECLARE_MNTINFO(mntinfo);

    if ((mounts = OPEN_MNTFILE("r")) == NULL) {

+      Warning(LGPFX "Failed to open mount point table.\n");

       return NULL;

    }

-   DynBuf_Init(&buf;;

-

    while (GETNEXT_MNTINFO(mounts, mntinfo)) {

+      char *path;

       /*

        * Skip remote mounts because they are not freezable and opening them

        * could lead to hangs. See PR 1196785.

@@ -130,29 +131,21 @@ 

          continue;

       }

+      path = Util_SafeStrdup(MNTINFO_MNTPT(mntinfo));

+

       /*

-       * Add a separator if it's not the first path, and add the path to the

-       * tail of the list.

+       * A mount point could depend on existence of a previous mount

+       * point like a loopback. In order to avoid deadlock/hang in

+       * freeze operation, a mount point needs to be frozen before

+       * its dependency is frozen.

+       * Typically, mount points are listed in the order they are

+       * mounted by the system i.e. dependent comes after the

+       * dependency. So, we need to keep them in reverse order of

+       * mount points to achieve the dependency order.

        */

-      if ((DynBuf_GetSize(&buf) != 0 && !DynBuf_Append(&buf, ":", 1))

-          || !DynBuf_Append(&buf,

-                            MNTINFO_MNTPT(mntinfo),

-                            strlen(MNTINFO_MNTPT(mntinfo)))) {

-         goto exit;

-      }

-   }

-

-   if (!DynBuf_Append(&buf, "\0", 1)) {

-      goto exit;

+      paths = g_slist_prepend(paths, path);

    }

-   paths = DynBuf_AllocGet(&buf;;

-   if (paths == NULL) {

-      Debug(LGPFX "Failed to allocate path list.\n");

-   }

-

-exit:

-   DynBuf_Destroy(&buf;;

    (void) CLOSE_MNTFILE(mounts);

    return paths;

 }

@@ -185,6 +178,29 @@ 

 /*

  *-----------------------------------------------------------------------------

  *

+ * SyncDriverFreePath --

+ *

+ *    A GFunc for freeing path strings. It is intended for g_slist_foreach.

+ *

+ * Results:

+ *    None

+ *

+ * Side effects:

+ *    None

+ *

+ *-----------------------------------------------------------------------------

+ */

+

+static void

+SyncDriverFreePath(gpointer data, gpointer userData)

+{

+   free(data);

+}

+

+

+/*

+ *-----------------------------------------------------------------------------

+ *

  * SyncDriver_Freeze --

  *

  *    Freeze I/O on the indicated drives. "all" means all drives.

@@ -214,14 +230,11 @@ 

                   Bool enableNullDriver,     // IN

                   SyncDriverHandle *handle)  // OUT

 {

-   char *paths = NULL;

+   GSList *paths = NULL;

    SyncDriverErr err = SD_UNAVAILABLE;

    size_t i = 0;

    /*

-    * First, convert the given path list to something the backends will

-    * understand: a colon-separated list of paths.

-    *

     * NOTE: Ignore disk UUIDs. We ignore the userPaths if it does

     * not start with '/' because all paths are absolute and it is

     * possible only when we get diskUUID as userPaths. So, all

@@ -229,26 +242,42 @@ 

     */

    if (userPaths == NULL ||

        Str_Strncmp(userPaths, "all", sizeof "all") == 0 ||

-       *userPaths != '/') {

-      paths = SyncDriverListMounts();

-      if (paths == NULL) {

-         Debug(LGPFX "Failed to list mount points.\n");

-         return SD_ERROR;

-      }

+       userPaths[0] != '/') {

+      paths = SyncDriverLocalMounts();

    } else {

       /*

-       * The sync driver API specifies spaces as separators, but the driver

-       * uses colons as the path separator on Unix.

+       * The sync driver API specifies spaces as separators.

        */

-      char *c;

-      paths = Util_SafeStrdup(userPaths);

-      for (c = paths; *c != '\0'; c++) {

-         if (*c == ' ') {

-            *c = ':';

+      while (*userPaths != '\0') {

+         const char *c;

+         char *path;

+

+         if (*userPaths == ' ') {

+            /*

+             * Trim spaces from beginning

+             */

+            userPaths++;

+            continue;

+         }

+

+         c = strchr(userPaths, ' ');

+         if (c == NULL) {

+            path = Util_SafeStrdup(userPaths);

+            paths = g_slist_append(paths, path);

+            break;

+         } else {

+            path = Util_SafeStrndup(userPaths, c - userPaths);

+            paths = g_slist_append(paths, path);

+            userPaths = c;

          }

       }

    }

+   if (paths == NULL) {

+      Warning(LGPFX "No paths to freeze.\n");

+      return SD_ERROR;

+   }

+

    while (err == SD_UNAVAILABLE && i < ARRAYSIZE(gBackends)) {

       SyncFreezeFn freezeFn = gBackends[i];

       Debug(LGPFX "Calling backend %d.\n", (int) i);

@@ -262,7 +291,12 @@ 

       err = freezeFn(paths, handle);

    }

-   free(paths);

+   /*

+    * g_slist_free_full requires glib >= v2.28

+    */

+   g_slist_foreach(paths, SyncDriverFreePath, NULL);

+   g_slist_free(paths);