udftune: Drop pvd- and iuvd-related code

Author: jtru

udftune/main.c

@@ -50,16 +50,13 @@ int main(int argc, char *argv[])
 	int fd;
 	int flags;
 	char buf[256];
-	dstring new_lvid[128];
 	dstring new_vid[32];
 	dstring new_fsid[32];
 	int mark_ro = 0;
 	int mark_rw = 0;
 	int force = 0;
 	int update = 0;
-	int update_pvd = 0;
 	int update_lvd = 0;
-	int update_iuvd = 0;
 	int update_fsd = 0;
 
 	if (fcntl(0, F_GETFL) < 0 && open("/dev/null", O_RDONLY) < 0)
@@ -85,11 +82,9 @@ int main(int argc, char *argv[])
 	disc.tail = disc.head;
 	disc.head->space_type = USPACE;
 
-	memset(new_lvid, 0, sizeof(new_lvid));
 	memset(new_vid, 0, sizeof(new_vid));
 	memset(new_fsid, 0, sizeof(new_fsid));
 
-	new_lvid[0] = 0xFF;
 	new_vid[0] = 0xFF;
 	new_fsid[0] = 0xFF;
 
@@ -104,7 +99,7 @@ int main(int argc, char *argv[])
 		update_fsd = 1;
 	}
 
-	if (update_pvd || update_lvd || update_iuvd || update_fsd)
+	if (update_lvd || update_fsd)
 		update = 1;
 
 	if (update && !(disc.flags & FLAG_NO_WRITE))
@@ -175,12 +170,6 @@ int main(int argc, char *argv[])
 
 	printf("Updating device: %s\n", filename);
 
-	if (!disc.udf_lvid || le32_to_cpu(disc.udf_lvid->integrityType) != LVID_INTEGRITY_TYPE_CLOSE)
-	{
-		fprintf(stderr, "%s: Error: Logical Volume is in inconsistent state\n", appname);
-		exit(1);
-	}
-
 	if (disc.udf_write_rev > 0x0260)
 	{
 		fprintf(stderr, "%s: Error: Minimal UDF Write Revision is %"PRIx16".%02"PRIx16", but udflabel supports only 2.60\n", appname, disc.udf_write_rev >> 8, disc.udf_write_rev & 0xFF);
@@ -246,7 +235,7 @@ int main(int argc, char *argv[])
 	}
 
 	/* TODO: VAT mode */
-	if ((le32_to_cpu(pd->accessType) == PD_ACCESS_TYPE_WRITE_ONCE && !force) || (disc.vat && (new_lvid[0] != 0xFF || new_fsid[0] != 0xFF)))
+	if ((le32_to_cpu(pd->accessType) == PD_ACCESS_TYPE_WRITE_ONCE && !force) || (disc.vat && (new_fsid[0] != 0xFF)))
 	{
 		fprintf(stderr, "%s: Error: Updating Virtual Allocation Table is not supported yet\n", appname);
 		exit(1);
@@ -293,20 +282,6 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	if (update_pvd)
-	{
-		if (!disc.udf_pvd[0] || !check_desc(disc.udf_pvd[0], sizeof(*disc.udf_pvd[0])))
-		{
-			fprintf(stderr, "%s: Error: Main Primary Volume Descriptor is damaged\n", appname);
-			exit(1);
-		}
-		if (!disc.udf_pvd[1] || !check_desc(disc.udf_pvd[1], sizeof(*disc.udf_pvd[1])))
-		{
-			fprintf(stderr, "%s: Error: Reserve Primary Volume Descriptor is damaged\n", appname);
-			exit(1);
-		}
-	}
-
 	if (update_lvd)
 	{
 		if (!disc.udf_lvd[0] || !check_desc(disc.udf_lvd[0], sizeof(*disc.udf_lvd[0]) + le32_to_cpu(disc.udf_lvd[0]->mapTableLength)))
@@ -364,68 +339,27 @@ int main(int argc, char *argv[])
 		dis->domainFlags &= DOMAIN_FLAGS_SOFT_WRITE_PROTECT;
 	}
 
-	if (update_pvd)
-	{
-		printf("Updating Main Primary Volume Descriptor...\n");
-		update_desc(disc.udf_pvd[0], sizeof(*disc.udf_pvd[0]));
-		write_desc(fd, &disc, MVDS, TAG_IDENT_PVD, disc.udf_pvd[0]);
-	}
-
 	if (update_lvd)
 	{
 		printf("Updating Main Logical Volume Descriptor...\n");
 		update_desc(disc.udf_lvd[0], sizeof(*disc.udf_lvd[0]) + le32_to_cpu(disc.udf_lvd[0]->mapTableLength));
 		write_desc(fd, &disc, MVDS, TAG_IDENT_LVD, disc.udf_lvd[0]);
 	}
 
-	if (update_iuvd)
-	{
-		printf("Updating Main Implementation Use Volume Descriptor...\n");
-		update_desc(disc.udf_iuvd[0], sizeof(*disc.udf_iuvd[0]));
-		write_desc(fd, &disc, MVDS, TAG_IDENT_IUVD, disc.udf_iuvd[0]);
-	}
-
-	if (update_pvd || update_lvd || update_iuvd)
-	{
-		printf("Synchronizing...\n");
-		if (!(disc.flags & FLAG_NO_WRITE))
-		{
-			if (fdatasync(fd) != 0)
-			{
-				fprintf(stderr, "%s: Error: Synchronization to device '%s' failed: %s\n", appname, filename, strerror(errno));
-				exit(1);
-			}
-		}
-	}
-
 	if (update_fsd)
 	{
 		printf("Updating File Set Descriptor...\n");
 		update_desc(disc.udf_fsd, sizeof(*disc.udf_fsd));
 		write_desc(fd, &disc, PSPACE, TAG_IDENT_FSD, disc.udf_fsd);
 	}
 
-	if (update_pvd && disc.udf_pvd[1] != disc.udf_pvd[0])
-	{
-		printf("Updating Reserve Primary Volume Descriptor...\n");
-		update_desc(disc.udf_pvd[1], sizeof(*disc.udf_pvd[1]));
-		write_desc(fd, &disc, RVDS, TAG_IDENT_PVD, disc.udf_pvd[1]);
-	}
-
 	if (update_lvd && disc.udf_lvd[1] != disc.udf_lvd[0])
 	{
 		printf("Updating Reserve Logical Volume Descriptor...\n");
 		update_desc(disc.udf_lvd[1], sizeof(*disc.udf_lvd[1]) + le32_to_cpu(disc.udf_lvd[1]->mapTableLength));
 		write_desc(fd, &disc, RVDS, TAG_IDENT_LVD, disc.udf_lvd[1]);
 	}
 
-	if (update_iuvd && disc.udf_iuvd[1] != disc.udf_iuvd[0])
-	{
-		printf("Updating Reserve Implementation Use Volume Descriptor...\n");
-		update_desc(disc.udf_iuvd[1], sizeof(*disc.udf_iuvd[1]));
-		write_desc(fd, &disc, RVDS, TAG_IDENT_IUVD, disc.udf_iuvd[1]);
-	}
-
 	printf("Synchronizing...\n");
 	if (!(disc.flags & FLAG_NO_WRITE))
 	{