Commit aeb3682f by Tycho Andersen

utils: add lxc_deslashify

parent 36662416
......@@ -716,6 +716,24 @@ char **lxc_normalize_path(const char *path)
return components;
}
bool lxc_deslashify(char *path)
{
char **parts = NULL, *path2;
parts = lxc_normalize_path(path);
if (!parts)
return false;
path2 = lxc_string_join("/", (const char **) parts, *path == '/');
lxc_free_array((void **) parts, free);
if (!path2)
return false;
strncpy(path, path2, strlen(path));
free(path2);
return true;
}
char *lxc_append_paths(const char *first, const char *second)
{
size_t len = strlen(first) + strlen(second) + 1;
......
......@@ -248,6 +248,8 @@ extern char *lxc_string_join(const char *sep, const char **parts, bool use_as_pr
* foo//bar -> { foo, bar, NULL }
*/
extern char **lxc_normalize_path(const char *path);
/* remove multiple slashes from the path, e.g. ///foo//bar -> /foo/bar */
extern bool lxc_deslashify(char *path);
extern char *lxc_append_paths(const char *first, const char *second);
/* Note: the following two functions use strtok(), so they will never
* consider an empty element, even if two delimiters are next to
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment