From: Sami Kerola <kerolasa@iki.fi>
Date: Tue, 2 Apr 2013 19:42:50 +0000 (+0100)
Subject: losetup: allow -j option argument to be relative path
X-Git-Tag: v2.23-rc2~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=114ade3d1be7c9091999d49ba97130641c4dde86;p=thirdparty%2Futil-linux.git

losetup: allow -j option argument to be relative path

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c
index 45e46c8c1b..8f3614e1f5 100644
--- a/sys-utils/losetup.c
+++ b/sys-utils/losetup.c
@@ -23,6 +23,7 @@
 #include "closestream.h"
 #include "optutils.h"
 #include "xalloc.h"
+#include "canonicalize.h"
 
 enum {
 	A_CREATE = 1,		/* setup a new device */
@@ -167,9 +168,15 @@ static int show_all_loops(struct loopdev_cxt *lc, const char *file,
 		st = NULL;
 
 	while (loopcxt_next(lc) == 0) {
-
-		if (file && !loopcxt_is_used(lc, st, file, offset, flags))
-			continue;
+		if (file && !loopcxt_is_used(lc, st, file, offset, flags)) {
+			char *canonized;
+			int ret;
+			canonized = canonicalize_path(file);
+			ret = loopcxt_is_used(lc, st, canonized, offset, flags);
+			free(canonized);
+			if (!ret)
+				continue;
+		}
 		printf_loopdev(lc);
 	}
 	loopcxt_deinit_iterator(lc);