added vfs_path_build_filename() function

Signed-off-by: Slava Zanko <slavazanko@gmail.com>

lib/util.h

@@ -206,6 +206,7 @@ gboolean mc_util_unlink_backup_if_possible (const char *, const char *);
 char *guess_message_value (void);
 
 char *mc_build_filename (const char *first_element, ...);
+char *mc_build_filenamev (const char *first_element, va_list args);
 
 /*** inline functions **************************************************/
 

lib/utilunix.c

@@ -1013,10 +1013,9 @@ get_user_permissions (struct stat *st)
  */
 
 char *
-mc_build_filename (const char *first_element, ...)
+mc_build_filenamev (const char *first_element, va_list args)
 {
     gboolean absolute;
-    va_list args;
     const char *element = first_element;
     GString *path;
     char *ret;
@@ -1025,7 +1024,6 @@ mc_build_filename (const char *first_element, ...)
         return NULL;
 
     path = g_string_new ("");
-    va_start (args, first_element);
 
     absolute = (*first_element != '\0' && *first_element == PATH_SEP);
 
@@ -1056,8 +1054,6 @@ mc_build_filename (const char *first_element, ...)
     }
     while (element != NULL);
 
-    va_end (args);
-
     if (absolute)
         g_string_prepend_c (path, PATH_SEP);
 
@@ -1068,3 +1064,24 @@ mc_build_filename (const char *first_element, ...)
 }
 
 /* --------------------------------------------------------------------------------------------- */
+/**
+ * Build filename from arguments.
+ * Like to g_build_filename(), but respect VFS_PATH_URL_DELIMITER
+ */
+
+char *
+mc_build_filename (const char *first_element, ...)
+{
+    va_list args;
+    char *ret;
+
+    if (first_element == NULL)
+        return NULL;
+
+    va_start (args, first_element);
+    ret = mc_build_filenamev (first_element, args);
+    va_end (args);
+    return ret;
+}
+
+/* --------------------------------------------------------------------------------------------- */

lib/vfs/path.c

@@ -1036,3 +1036,28 @@ vfs_path_deserialize (const char *data, GError ** error)
 }
 
 /* --------------------------------------------------------------------------------------------- */
+/**
+ * Build vfs_path_t object from arguments.
+ * 
+ * return newly allocated vfs_path_t object
+ */
+
+vfs_path_t *
+vfs_path_build_filename (const char *first_element, ...)
+{
+    va_list args;
+    char *str_path;
+    vfs_path_t *vpath;
+
+    if (first_element == NULL)
+        return NULL;
+
+    va_start (args, first_element);
+    str_path = mc_build_filenamev (first_element, args);
+    va_end (args);
+    vpath = vfs_path_from_str (str_path);
+    g_free (str_path);
+    return vpath;
+}
+
+/* --------------------------------------------------------------------------------------------- */

lib/vfs/path.h

@@ -57,6 +57,7 @@ char *vfs_path_to_str (const vfs_path_t * path);
 char *vfs_path_to_str_elements_count (const vfs_path_t * path, int elements_count);
 vfs_path_t *vfs_path_from_str (const char *path_str);
 vfs_path_t *vfs_path_from_str_flags (const char *path_str, vfs_path_flag_t flags);
+vfs_path_t *vfs_path_build_filename (const char *first_element, ...);
 
 vfs_path_element_t *vfs_path_get_by_index (const vfs_path_t * path, int element_index);
 vfs_path_element_t *vfs_path_element_clone (const vfs_path_element_t * element);