@@ -38,6 +38,7 @@
#include <linux/kdev_t.h>
#include <limits.h>
#include <blkid/blkid.h>
+#include <stdarg.h>
#include "kerncompat.h"
#include "radix-tree.h"
#include "ctree.h"
@@ -2108,3 +2109,65 @@ int lookup_ino_rootid(int fd, u64 *rootid)
return 0;
}
+
+/*
+ * Joints a list of string. The list has to be NULL terminated
+ */
+char *pathjoin( char *s, ...)
+{
+ va_list ap;
+ int size;
+ char *dst;
+
+ if (!s || !strlen(s))
+ return NULL;
+
+ size = strlen(s)+1;
+ va_start(ap, s);
+
+ do {
+ char *p;
+
+ p = va_arg(ap, char *);
+ if (!p)
+ break;
+
+ size += strlen(p)+1;
+ } while(1);
+
+ va_end(ap);
+ size++;
+
+ dst = malloc(size);
+ if (!dst)
+ return NULL;
+
+ strcpy(dst, s);
+ va_start(ap, s);
+
+ do {
+ char *p;
+ int l, l2;
+ p = va_arg(ap, char *);
+ if (!p)
+ break;
+ if (*p == '/')
+ p++;
+
+ l2 = strlen(p);
+ if (!l2)
+ continue;
+ if (p[l2-1] == '/')
+ p[l2-1] = 0;
+
+ l = strlen(dst);
+ if (dst[l-1] != '/')
+ strcat(dst, "/");
+ strcat(dst, p);
+
+ } while(1);
+ va_end(ap);
+
+ return dst;
+
+}
\ No newline at end of file
@@ -94,5 +94,6 @@ int ask_user(char *question);
int lookup_ino_rootid(int fd, u64 *rootid);
int btrfs_scan_lblkid(int update_kernel);
int get_btrfs_mount(const char *dev, char *mp, size_t mp_size);
+char *pathjoin(char *, ...);
#endif
The pathjoin() function creates a path from a list of strings. Signed-off-by: Goffredo Baroncelli <kreijack@inwind.it> --- utils.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ utils.h | 1 + 2 files changed, 64 insertions(+)