X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Fvol_id.c;h=5c4e05d794837245dd8ce988c427997be0302f07;hp=9830929ef49baebc156f1ddfd8296705ba12163b;hb=be9c76b4345b36ec40d8b7b22dc687b4042fe56f;hpb=1c6c7ab118b1ddbf91b3f4582187d462dd3e8d8e

diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index 9830929ef..5c4e05d79 100644
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -111,6 +111,19 @@ static void set_str(char *to, const char *from, size_t count)
 	to[j] = '\0';
 }
 
+static int all_probers(volume_id_probe_fn_t probe_fn,
+		       struct volume_id *id, uint64_t off, uint64_t size,
+		       void *data)
+{
+	const char *type;
+
+	if (probe_fn(id, off, size) == 0)
+		if (volume_id_get_type(id, &type))
+			printf("%s\n", type);
+
+	return 0;
+}
+
 int main(int argc, char *argv[])
 {
 	static const struct option options[] = {
@@ -121,6 +134,7 @@ int main(int argc, char *argv[])
 		{ "export", 0, NULL, 'x' },
 		{ "skip-raid", 0, NULL, 's' },
 		{ "probe-all", 0, NULL, 'a' },
+		{ "offset", 1, NULL, 'o' },
 		{ "help", 0, NULL, 'h' },
 		{}
 	};
@@ -134,13 +148,14 @@ int main(int argc, char *argv[])
 	} print = PRINT_EXPORT;
 
 	struct volume_id *vid = NULL;
-	char label_safe[128];
-	char uuid_safe[128];
+	char label_safe[256];
+	char label_enc[256];
+	char uuid_enc[256];
 	uint64_t size;
 	int skip_raid = 0;
 	int probe_all = 0;
+	uint64_t offset = 0;
 	const char *node;
-	struct passwd *pw;
 	int fd;
 	const char *label, *uuid, *type, *type_version, *usage;
 	int retval;
@@ -154,7 +169,7 @@ int main(int argc, char *argv[])
 	while (1) {
 		int option;
 
-		option = getopt_long(argc, argv, "lLutxsah", options, NULL);
+		option = getopt_long(argc, argv, "lLutxsaoh", options, NULL);
 		if (option == -1)
 			break;
 
@@ -180,6 +195,9 @@ int main(int argc, char *argv[])
 		case 'a':
 			probe_all = 1;
 			break;
+		case 'o':
+			offset = strtoull(optarg, NULL, 0);
+			break;
 		case 'h':
 			printf("Usage: vol_id [options] <device>\n"
 			    " --export        export key/value pairs\n"
@@ -189,6 +207,7 @@ int main(int argc, char *argv[])
 			    " --uuid          filesystem uuid\n"
 			    " --skip-raid     don't probe for raid\n"
 			    " --probe-all     find possibly conflicting signatures\n"
+			    " --offset        skip given number of bytes of input\n"
 			    " --help\n\n");
 			goto exit;
 		default:
@@ -199,7 +218,7 @@ int main(int argc, char *argv[])
 
 	node = argv[optind];
 	if (!node) {
-		err("no device");
+		err("no device\n");
 		fprintf(stderr, "no device\n");
 		rc = 1;
 		goto exit;
@@ -220,135 +239,30 @@ int main(int argc, char *argv[])
 
 	if (ioctl(fd, BLKGETSIZE64, &size) != 0)
 		size = 0;
-	dbg("BLKGETSIZE64=%llu", (unsigned long long)size);
+	dbg("BLKGETSIZE64=%llu\n", (unsigned long long)size);
 
 	/* try to drop all privileges before reading disk content */
-	pw = getpwnam ("nobody");
-	if (pw != NULL && pw->pw_uid > 0 && pw->pw_gid > 0) {
-		dbg("dropping privileges to %u:%u",
-		    (unsigned int)pw->pw_uid, (unsigned int)pw->pw_gid);
-		if (setgroups(0, NULL) != 0 ||
-		    setgid(pw->pw_gid) != 0 ||
-		    setuid(pw->pw_uid) != 0) {
-			fprintf(stderr, "error dropping privileges: %s\n", strerror(errno));
-			rc = 3;
-			goto exit;
+	if (getuid() == 0) {
+		struct passwd *pw;
+
+		pw = getpwnam("nobody");
+		if (pw != NULL && pw->pw_uid > 0 && pw->pw_gid > 0) {
+			if (setgroups(0, NULL) != 0 ||
+			    setgid(pw->pw_gid) != 0 ||
+			    setuid(pw->pw_uid) != 0)
+				info("unable to drop privileges: %s\n\n", strerror(errno));
 		}
 	}
 
 	if (probe_all) {
-		if (volume_id_probe_linux_raid(vid, 0, size) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_ddf_raid(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_intel_software_raid(vid, 0, size) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_lsi_mega_raid(vid, 0, size) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_via_raid(vid, 0, size) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_silicon_medley_raid(vid, 0, size) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_nvidia_raid(vid, 0, size) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_promise_fasttrack_raid(vid, 0, size) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_highpoint_45x_raid(vid, 0, size) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_adaptec_raid(vid, 0, size) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_jmicron_raid(vid, 0, size) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_vfat(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_linux_swap(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_luks(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_xfs(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_ext(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_reiserfs(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_jfs(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_udf(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_iso9660(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_hfs_hfsplus(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_ufs(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_ntfs(vid, 0, 0)  == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_cramfs(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_romfs(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_hpfs(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_sysv(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_minix(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_ocfs1(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_ocfs2(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_vxfs(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_squashfs(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_netware(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_gfs(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
-		if (volume_id_probe_gfs2(vid, 0, 0) == 0)
-			if (volume_id_get_type(vid, &type))
-				printf("%s\n", type);
+		volume_id_all_probers(all_probers, vid, offset, size, NULL);
 		goto exit;
 	}
 
 	if (skip_raid)
-		retval = volume_id_probe_filesystem(vid, 0, size);
+		retval = volume_id_probe_filesystem(vid, offset, size);
 	else
-		retval = volume_id_probe_all(vid, 0, size);
+		retval = volume_id_probe_all(vid, offset, size);
 	if (retval != 0) {
 		fprintf(stderr, "%s: unknown volume type\n", node);
 		rc = 4;
@@ -365,9 +279,10 @@ int main(int argc, char *argv[])
 	}
 
 	set_str(label_safe, label, sizeof(label_safe));
-	replace_untrusted_chars(label_safe);
-	set_str(uuid_safe, uuid, sizeof(uuid_safe));
-	replace_untrusted_chars(uuid_safe);
+	replace_chars(label_safe, ALLOWED_CHARS_INPUT);
+
+	volume_id_encode_string(label, label_enc, sizeof(label_enc));
+	volume_id_encode_string(uuid, uuid_enc, sizeof(uuid_enc));
 
 	switch (print) {
 	case PRINT_EXPORT:
@@ -375,8 +290,9 @@ int main(int argc, char *argv[])
 		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_UUID_SAFE=%s\n", uuid_safe);
+		printf("ID_FS_UUID_ENC=%s\n", uuid_enc);
 		printf("ID_FS_LABEL=%s\n", label);
+		printf("ID_FS_LABEL_ENC=%s\n", label_enc);
 		printf("ID_FS_LABEL_SAFE=%s\n", label_safe);
 		break;
 	case PRINT_TYPE:
@@ -390,11 +306,11 @@ int main(int argc, char *argv[])
 		printf("%s\n", label_safe);
 		break;
 	case PRINT_UUID:
-		if (uuid_safe[0] == '\0' || strcmp(usage, "raid") == 0) {
+		if (uuid_enc[0] == '\0' || strcmp(usage, "raid") == 0) {
 			rc = 4;
 			goto exit;
 		}
-		printf("%s\n", uuid_safe);
+		printf("%s\n", uuid_enc);
 		break;
 	case PRINT_LABEL_RAW:
 		if (label[0] == '\0' || strcmp(usage, "raid") == 0) {