From: Harald Hoyer Date: Thu, 30 Nov 2017 14:07:48 +0000 (+0100) Subject: dracut-install: remove double "//" in path names X-Git-Tag: 047~77 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a13e97e5110121e38f9a6d9550b5ac07250a37af;p=thirdparty%2Fdracut.git dracut-install: remove double "//" in path names makes relative symlinks shorter --- diff --git a/install/dracut-install.c b/install/dracut-install.c index 82e882cc5..90077226b 100644 --- a/install/dracut-install.c +++ b/install/dracut-install.c @@ -633,7 +633,7 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res hashmap_put(items, i, i); - ret = asprintf(&fulldstpath, "%s/%s", destrootdir, dst); + ret = asprintf(&fulldstpath, "%s/%s", destrootdir, (dst[0]=='/' ? (dst+1) : dst)); if (ret < 0) { log_error("Out of memory!"); exit(EXIT_FAILURE); @@ -720,7 +720,7 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res if (lstat(fulldstpath, &sb) != 0) { _cleanup_free_ char *absdestpath = NULL; - ret = asprintf(&absdestpath, "%s/%s", destrootdir, abspath); + ret = asprintf(&absdestpath, "%s/%s", destrootdir, (abspath[0]=='/' ? (abspath+1) : abspath)); if (ret < 0) { log_error("Out of memory!"); exit(EXIT_FAILURE);