X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Fvol_id.c;h=b4db5adcd86210dcebcdd6e4ca414f92a8bffa42;hb=f4700eb8a02c17972c3cef658bd8c96a725355b8;hp=19aa0bd3c25d1e0de47735f1894cbd956225721b;hpb=22c89d3fd78d7ef3f231fc837a47860efcc4cc9e;p=elogind.git

diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index 19aa0bd3c..b4db5adcd 100644
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -31,6 +31,7 @@
 #include <grp.h>
 #include <getopt.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <sys/ioctl.h>
 
 #include "../../udev/udev.h"
@@ -57,8 +58,10 @@ static void vid_log(int priority, const char *file, int line, const char *format
 {
 	va_list args;
 
+	if (priority > udev_get_log_priority(udev_ctx))
+		return;
 	va_start(args, format);
-	udev_log(udev_ctx, priority, file, line, NULL, format, args);
+	log_fn(udev_ctx, priority, file, line, NULL, format, args);
 	va_end(args);
 	return;
 }
@@ -136,7 +139,10 @@ int main(int argc, char *argv[])
 	struct volume_id *vid = NULL;
 	char label_safe[256];
 	char label_enc[256];
+	char uuid_safe[256];
 	char uuid_enc[256];
+	char type_enc[256];
+	char type_version_enc[256];
 	uint64_t size = 0;
 	int skip_raid = 0;
 	int probe_all = 0;
@@ -242,7 +248,7 @@ int main(int argc, char *argv[])
 	if (size == 0) {
 		if (ioctl(fd, BLKGETSIZE64, &size) != 0)
 			size = 0;
-		info(udev_ctx, "BLKGETSIZE64=%llu (%lluGB)\n", (unsigned long long)size, (unsigned long long)size >> 30);
+		info(udev_ctx, "BLKGETSIZE64=%" PRIu64 " (%" PRIu64 "GB)\n", size, size >> 30);
 	}
 
 	/* try to drop all privileges before reading disk content */
@@ -284,20 +290,24 @@ int main(int argc, char *argv[])
 
 	set_str(label_safe, label, sizeof(label_safe));
 	util_replace_chars(label_safe, ALLOWED_CHARS_INPUT);
-
 	volume_id_encode_string(label, label_enc, sizeof(label_enc));
+
+	set_str(uuid_safe, uuid, sizeof(uuid_safe));
+	util_replace_chars(uuid_safe, ALLOWED_CHARS_INPUT);
 	volume_id_encode_string(uuid, uuid_enc, sizeof(uuid_enc));
 
+	volume_id_encode_string(type, type_enc, sizeof(type_enc));
+	volume_id_encode_string(type_version, type_version_enc, sizeof(type_version_enc));
+
 	switch (print) {
 	case PRINT_EXPORT:
 		printf("ID_FS_USAGE=%s\n", usage);
-		printf("ID_FS_TYPE=%s\n", type);
-		printf("ID_FS_VERSION=%s\n", type_version);
-		printf("ID_FS_UUID=%s\n", uuid);
+		printf("ID_FS_TYPE=%s\n", type_enc);
+		printf("ID_FS_VERSION=%s\n", type_version_enc);
+		printf("ID_FS_UUID=%s\n", uuid_safe);
 		printf("ID_FS_UUID_ENC=%s\n", uuid_enc);
-		printf("ID_FS_LABEL=%s\n", label);
+		printf("ID_FS_LABEL=%s\n", label_safe);
 		printf("ID_FS_LABEL_ENC=%s\n", label_enc);
-		printf("ID_FS_LABEL_SAFE=%s\n", label_safe);
 		break;
 	case PRINT_TYPE:
 		printf("%s\n", type);