X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=extras%2Fvolume_id%2Fvol_id.c;h=2b487d0b3c51f635862a094ac8c56d46020dd5e0;hb=d4f687c013a18010fdc2ddf937fad064343e635a;hp=79ed0998038024e8f206106af98ecafb719fec79;hpb=75250977137c26f706fc1514aca7982107859b1c;p=elogind.git

diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index 79ed09980..2b487d0b3 100644
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -39,6 +39,7 @@
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)
 
 static int debug;
+struct udev *udev_ctx;
 
 static void log_fn(struct udev *udev, int priority,
 		   const char *file, int line, const char *fn,
@@ -56,8 +57,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);
-	log_fn(NULL, priority, file, line, NULL, format, args);
+	log_fn(udev_ctx, priority, file, line, NULL, format, args);
 	va_end(args);
 	return;
 }
@@ -109,18 +112,18 @@ static int all_probers(volume_id_probe_fn_t probe_fn,
 
 int main(int argc, char *argv[])
 {
-	struct udev *udev;
 	static const struct option options[] = {
-		{ "label", 0, NULL, 'l' },
-		{ "label-raw", 0, NULL, 'L' },
-		{ "uuid", 0, NULL, 'u' },
-		{ "type", 0, NULL, 't' },
-		{ "export", 0, NULL, 'x' },
-		{ "skip-raid", 0, NULL, 's' },
-		{ "probe-all", 0, NULL, 'a' },
-		{ "offset", 2, NULL, 'o' },
-		{ "debug", 0, NULL, 'd' },
-		{ "help", 0, NULL, 'h' },
+		{ "label", no_argument, NULL, 'l' },
+		{ "label-raw", no_argument, NULL, 'L' },
+		{ "uuid", no_argument, NULL, 'u' },
+		{ "type", no_argument, NULL, 't' },
+		{ "export", no_argument, NULL, 'x' },
+		{ "skip-raid", no_argument, NULL, 's' },
+		{ "size", required_argument, NULL, 'S' },
+		{ "probe-all", no_argument, NULL, 'a' },
+		{ "offset", optional_argument, NULL, 'o' },
+		{ "debug", no_argument, NULL, 'd' },
+		{ "help", no_argument, NULL, 'h' },
 		{}
 	};
 
@@ -136,7 +139,7 @@ int main(int argc, char *argv[])
 	char label_safe[256];
 	char label_enc[256];
 	char uuid_enc[256];
-	uint64_t size;
+	uint64_t size = 0;
 	int skip_raid = 0;
 	int probe_all = 0;
 	uint64_t offset = 0;
@@ -146,11 +149,11 @@ int main(int argc, char *argv[])
 	int retval;
 	int rc = 0;
 
-	udev = udev_new();
-	if (udev == NULL)
+	udev_ctx = udev_new();
+	if (udev_ctx == NULL)
 		goto exit;
 	logging_init("vol_id");
-	udev_set_log_fn(udev, log_fn);
+	udev_set_log_fn(udev_ctx, log_fn);
 
 	/* hook in our debug into libvolume_id */
 	volume_id_log_fn = vid_log;
@@ -158,15 +161,15 @@ int main(int argc, char *argv[])
 	while (1) {
 		int option;
 
-		option = getopt_long(argc, argv, "lLutxsaodh", options, NULL);
+		option = getopt_long(argc, argv, "lLutxsS:aodh", options, NULL);
 		if (option == -1)
 			break;
 
 		switch (option) {
 		case 'd':
 			debug = 1;
-			if (udev_get_log_priority(udev) < LOG_INFO)
-				udev_set_log_priority(udev, LOG_INFO);
+			if (udev_get_log_priority(udev_ctx) < LOG_INFO)
+				udev_set_log_priority(udev_ctx, LOG_INFO);
 			break;
 		case 'l':
 			print = PRINT_LABEL;
@@ -189,6 +192,10 @@ int main(int argc, char *argv[])
 		case 'a':
 			probe_all = 1;
 			break;
+		case 'S':
+			if (optarg[0] != '\0')
+				size = strtoull(optarg, NULL, 0);
+			break;
 		case 'o':
 			if (optarg[0] != '\0')
 				offset = strtoull(optarg, NULL, 0);
@@ -203,6 +210,7 @@ int main(int argc, char *argv[])
 			    " --skip-raid      don't probe for raid\n"
 			    " --probe-all      find possibly conflicting signatures\n"
 			    " --offset=<bytes> probe at the given offset\n"
+			    " --size=<bytes>   overwrite device size\n"
 			    " --debug          print debug output to stderr\n"
 			    " --help\n\n");
 			goto exit;
@@ -214,7 +222,7 @@ int main(int argc, char *argv[])
 
 	node = argv[optind];
 	if (!node) {
-		err(udev, "no device\n");
+		err(udev_ctx, "no device\n");
 		fprintf(stderr, "no device\n");
 		rc = 1;
 		goto exit;
@@ -233,9 +241,11 @@ int main(int argc, char *argv[])
 		goto exit;
 	}
 
-	if (ioctl(fd, BLKGETSIZE64, &size) != 0)
-		size = 0;
-	info(udev, "BLKGETSIZE64=%llu (%lluGB)\n", (unsigned long long)size, (unsigned long long)size >> 30);
+	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);
+	}
 
 	/* try to drop all privileges before reading disk content */
 	if (getuid() == 0) {
@@ -246,7 +256,7 @@ int main(int argc, char *argv[])
 			if (setgroups(0, NULL) != 0 ||
 			    setgid(pw->pw_gid) != 0 ||
 			    setuid(pw->pw_uid) != 0)
-				info(udev, "unable to drop privileges: %s\n\n", strerror(errno));
+				info(udev_ctx, "unable to drop privileges: %s\n\n", strerror(errno));
 		}
 	}
 
@@ -320,7 +330,7 @@ int main(int argc, char *argv[])
 exit:
 	if (vid != NULL)
 		volume_id_close(vid);
-	udev_unref(udev);
+	udev_unref(udev_ctx);
 	logging_close();
 	return rc;
 }