From: Karel Zak <kzak@redhat.com>
Date: Tue, 2 Apr 2013 20:26:12 +0000 (+0200)
Subject: libmount: add version and features to debug output
X-Git-Tag: v2.23-rc2~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39de73f5f1c15c8acc5285a0162b43888354e6aa;p=thirdparty%2Futil-linux.git

libmount: add version and features to debug output

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libmount/src/init.c b/libmount/src/init.c
index 58d4c18878..4e5f489c45 100644
--- a/libmount/src/init.c
+++ b/libmount/src/init.c
@@ -38,8 +38,21 @@ void mnt_init_debug(int mask)
 	} else
 		libmount_debug_mask = mask;
 
-	if (libmount_debug_mask)
-		fprintf(stderr, "libmount: debug mask set to 0x%04x.\n",
-				libmount_debug_mask);
 	libmount_debug_mask |= MNT_DEBUG_INIT;
+
+	if (libmount_debug_mask && libmount_debug_mask != MNT_DEBUG_INIT) {
+		const char *ver = NULL;
+		const char **features = NULL, **p;
+
+		DBG(INIT, mnt_debug("library debug mask: 0x%04x",
+				libmount_debug_mask));
+
+		mnt_get_library_version(&ver);
+		mnt_get_library_features(&features);
+
+		DBG(INIT, mnt_debug("library version: %s", ver));
+		p = features;
+		while (p && *p)
+			DBG(INIT, mnt_debug("    feature: %s", *p++));
+	}
 }