Changeset 69013 in vbox for trunk/include/iprt

Timestamp:

Oct 9, 2017 12:08:12 PM (7 years ago)

Author:

vboxsync

Message:

IPRT: UDF updates

Location:

trunk/include/iprt

Files:

• err.h (modified) (1 diff)
• formats/udf.h (modified) (4 diffs)
• fsvfs.h (modified) (1 diff)

trunk/include/iprt/err.h

@@ -2997 +2997 @@
 /** Unexpected/unknown/bad descriptor in volume descriptor sequence. */
 #define VERR_ISOFS_UNEXPECTED_VDS_DESC                  (-25306)
+/** Too many primary volume descriptors. */
+#define VERR_ISOFS_TOO_MANY_PVDS                        (-25307)
+/** Too many logical volume descriptors. */
+#define VERR_ISOFS_TOO_MANY_LVDS                        (-25308)
+/** Too many partition descriptors. */
+#define VERR_ISOFS_TOO_MANY_PDS                         (-25309)
+/** The logical volume descriptor has a too big partition map. */
+#define VERR_ISOFS_TOO_BIT_PARTMAP_IN_LVD               (-25310)
+/** No primary volume descriptors found. */
+#define VERR_ISOFS_NO_PVD                               (-25311)
+/** No logical volume descriptors found. */
+#define VERR_ISOFS_NO_LVD                               (-25312)
+/** No partition descriptors found. */
+#define VERR_ISOFS_NO_PD                                (-25313)
+/** Multiple primary volume descriptors found, we can only deal with one. */
+#define VERR_ISOFS_MULTIPLE_PVDS                        (-25314)
+/** Multiple logical volume descriptors found, we can only deal with one. */
+#define VERR_ISOFS_MULTIPLE_LVDS                        (-25315)
+/** Too many partition maps in the logical volume descriptor. */
+#define VERR_ISOFS_TOO_MANY_PART_MAPS                   (-25316)
+/** Malformed partition map table in the logical volume descriptor. */
+#define VERR_ISOFS_MALFORMED_PART_MAP_TABLE             (-25317)
+/** Unable to find partition descriptor for a partition map table entry. */
+#define VERR_ISOFS_PARTITION_NOT_FOUND                  (-25318)
+/** Partition mapping table is shorted than described. */
+#define VERR_ISOFS_INCOMPLETE_PART_MAP_TABLE            (-25319)
+/** Unknown partition map entry type. */
+#define VERR_ISOFS_UNKNOWN_PART_MAP_ENTRY_TYPE          (-25320)
+/** Unkonwn paritition ID found in the partition map table. */
+#define VERR_ISOFS_UNKNOWN_PART_MAP_TYPE_ID             (-25321)
+/** Support for virtual partitions as not yet been implemented. */
+#define VERR_ISOFS_VPM_NOT_SUPPORTED                    (-25322)
+/** Support for sparable partitions as not yet been implemented. */
+#define VERR_ISOFS_SPM_NOT_SUPPORTED                    (-25323)
+/** Support for metadata partitions as not yet been implemented. */
+#define VERR_ISOFS_MPM_NOT_SUPPORTED                    (-25324)
+/** Invalid or unsupported logical block size. */
+#define VERR_ISOFS_UNSUPPORTED_LOGICAL_BLOCK_SIZE       (-25325)
+/** Unsupported domain ID in logical volume descriptor. */
+#define VERR_ISOFS_BAD_LVD_DOMAIN_ID                    (-25326)
+/** Malformed or invalid file set descriptor location. */
+#define VERR_ISOFS_BAD_LVD_FILE_SET_DESC_LOCATION       (-25327)
+/** Non-standard descriptor character set in the logical volume descriptor. */
+#define VERR_ISOFS_BAD_LVD_DESC_CHAR_SET                (-25329)
+/** Invalid partition index in a location. */
+#define VERR_ISOFS_INVALID_PARTITION_INDEX              (-25329)
+/** Unsupported file system charset. */
+#define VERR_ISOFS_FSD_UNSUPPORTED_CHAR_SET             (-25330)
+/** File set descriptor has an zero length or invalid root dir extent. */
+#define VERR_ISOFS_FSD_ZERO_ROOT_DIR                    (-25331)
+/** File set descriptor has a next extent member. */
+#define VERR_ISOFS_FSD_NEXT_EXTENT                      (-25332)
+
+/** Internal processing error \#1.  */
+#define VERR_ISOFS_IPE_1                                (-25391)
+/** Internal processing error \#2.  */
+#define VERR_ISOFS_IPE_2                                (-25392)
+/** Internal processing error \#3.  */
+#define VERR_ISOFS_IPE_3                                (-25393)
+/** Internal processing error \#4.  */
+#define VERR_ISOFS_IPE_4                                (-25394)
+/** Internal processing error \#5.  */
+#define VERR_ISOFS_IPE_5                                (-25395)
 
 /** @} */

trunk/include/iprt/formats/udf.h

@@ -402 +402 @@
 #define UDF_ENTITY_ID_SPM_PARTITION_TYPE        "*UDF Sparable Partition"
 
+/** Metadata partition map, partition type field.
+ * UDF ID suffix. */
+#define UDF_ENTITY_ID_MPM_PARTITION_TYPE        "*UDF Metadata Partition"
+
 /** Sparing table, sparing identifier field.
  * UDF ID suffix. */
 #define UDF_ENTITY_ID_ST_SPARING                "*UDF Sparting Table"
-
-/** Metadata partition map, partition type field.
- * UDF ID suffix. */
-#define UDF_ENTITY_ID_MPM_PARTITION_TYPE        "*UDF Metadata Partition"
 
 /** @} */
@@ -444 +444 @@
 /** @name UDF_TAG_ID_XXX - UDF descriptor tag IDs.
  * @{ */
-#define UDF_TAG_ID_PRIMARY_VOL_DESC                 UINT16_C(0x0001) /**< UDFPRIMARYVOLUMEDESC */
-#define UDF_TAG_ID_ANCHOR_VOLUME_DESC_PTR           UINT16_C(0x0002) /**< UDFANCHORVOLUMEDESCPTR */
-#define UDF_TAG_ID_VOLUME_DESC_PTR                  UINT16_C(0x0003) /**< UDFVOLUMEDESCPTR */
-#define UDF_TAG_ID_IMPLEMENTATION_USE_VOLUME_DESC   UINT16_C(0x0004) /**< UDFIMPLEMENTATIONUSEVOLUMEDESC */
-#define UDF_TAG_ID_PARTITION_DESC                   UINT16_C(0x0005) /**< UDFPARTITIONDESC */
-#define UDF_TAG_ID_LOGICAL_VOLUME_DESC              UINT16_C(0x0006) /**< UDFLOGICALVOLUMEDESC */
-#define UDF_TAG_ID_UNALLOCATED_SPACE_DESC           UINT16_C(0x0007) /**< UDFUNALLOCATEDSPACEDESC */
-#define UDF_TAG_ID_TERMINATING_DESC                 UINT16_C(0x0008) /**< UDFTERMINATINGDESC */
-#define UDF_TAG_ID_LOGICAL_VOLUME_INTEGRITY_DESC    UINT16_C(0x0009) /**< UDFLOGICALVOLINTEGRITYDESC */
-#define UDF_TAG_ID_FILE_SET_DESC                    UINT16_C(0x0100)
-#define UDF_TAG_ID_FILE_ID_DESC                     UINT16_C(0x0101)
-#define UDF_TAG_ID_ALLOCATION_EXTENT_DESC           UINT16_C(0x0102)
-#define UDF_TAG_ID_INDIRECT_ENTRY                   UINT16_C(0x0103)
-#define UDF_TAG_ID_TERMINAL_ENTRY                   UINT16_C(0x0104)
-#define UDF_TAG_ID_FILE_ENTRY                       UINT16_C(0x0105)
-#define UDF_TAG_ID_EXTENDED_ATTRIB_HDR_DESC         UINT16_C(0x0106)
-#define UDF_TAG_ID_UNALLOCATED_SPACE_ENTRY          UINT16_C(0x0107)
-#define UDF_TAG_ID_SPACE_BITMAP_DESC                UINT16_C(0x0108)
-#define UDF_TAG_ID_PARTITION_INTEGERITY_DESC        UINT16_C(0x0109)
-#define UDF_TAG_ID_EXTENDED_FILE_ENTRY              UINT16_C(0x010a)
+#define UDF_TAG_ID_PRIMARY_VOL_DESC                 UINT16_C(0x0001) /**< See UDFPRIMARYVOLUMEDESC */
+#define UDF_TAG_ID_ANCHOR_VOLUME_DESC_PTR           UINT16_C(0x0002) /**< See UDFANCHORVOLUMEDESCPTR */
+#define UDF_TAG_ID_VOLUME_DESC_PTR                  UINT16_C(0x0003) /**< See UDFVOLUMEDESCPTR */
+#define UDF_TAG_ID_IMPLEMENTATION_USE_VOLUME_DESC   UINT16_C(0x0004) /**< See UDFIMPLEMENTATIONUSEVOLUMEDESC */
+#define UDF_TAG_ID_PARTITION_DESC                   UINT16_C(0x0005) /**< See UDFPARTITIONDESC */
+#define UDF_TAG_ID_LOGICAL_VOLUME_DESC              UINT16_C(0x0006) /**< See UDFLOGICALVOLUMEDESC */
+#define UDF_TAG_ID_UNALLOCATED_SPACE_DESC           UINT16_C(0x0007) /**< See UDFUNALLOCATEDSPACEDESC */
+#define UDF_TAG_ID_TERMINATING_DESC                 UINT16_C(0x0008) /**< See UDFTERMINATINGDESC */
+#define UDF_TAG_ID_LOGICAL_VOLUME_INTEGRITY_DESC    UINT16_C(0x0009) /**< See UDFLOGICALVOLINTEGRITYDESC */
+#define UDF_TAG_ID_FILE_SET_DESC                    UINT16_C(0x0100) /**< See UDFFILESETDESC */
+#define UDF_TAG_ID_FILE_ID_DESC                     UINT16_C(0x0101) /**< See UDFFILEIDDESC */
+#define UDF_TAG_ID_ALLOCATION_EXTENT_DESC           UINT16_C(0x0102) /**< See UDFALLOCATIONEXTENTDESC */
+#define UDF_TAG_ID_INDIRECT_ENTRY                   UINT16_C(0x0103) /**< See UDFINDIRECTENTRY */
+#define UDF_TAG_ID_TERMINAL_ENTRY                   UINT16_C(0x0104) /**< See UDFTERMINALENTRY */
+#define UDF_TAG_ID_FILE_ENTRY                       UINT16_C(0x0105) /**< See UDFFILEENTRY */
+#define UDF_TAG_ID_EXTENDED_ATTRIB_HDR_DESC         UINT16_C(0x0106) /**< See UDFEXTATTRIBHDRDESC */
+#define UDF_TAG_ID_UNALLOCATED_SPACE_ENTRY          UINT16_C(0x0107) /**< See UDFUNALLOCATEDSPACEENTRY */
+#define UDF_TAG_ID_SPACE_BITMAP_DESC                UINT16_C(0x0108) /**< See UDFSPACEBITMAPDESC */
+#define UDF_TAG_ID_PARTITION_INTEGERITY_DESC        UINT16_C(0x0109) /**< See UDFPARTITIONINTEGRITYDESC */
+#define UDF_TAG_ID_EXTENDED_FILE_ENTRY              UINT16_C(0x010a) /**< See UDFEXFILEENTRY */
 /** @} */
 
@@ -738 +738 @@
     uint32_t        uVolumeDescSeqNo;
     /** 0x014: Character set used in the achLogicalVolumeID field.   */
-    UDFCHARSPEC     DescriptorCharSet;
+    UDFCHARSPEC     DescCharSet;
     /** 0x054: The logical volume ID (label). */
     UDFDSTRING      achLogicalVolumeID[128];
@@ -820 +820 @@
     /** 0x02: Reserved \#1. */
     uint16_t        uReserved1;
-    /** 0x04: Partition number (UDF_ENTITY_ID_VPM_PARTITION_TYPE). */
+    /** 0x04: Partition number (UDF_ENTITY_ID_VPM_PARTITION_TYPE,
+     *  UDF_ENTITY_ID_SPM_PARTITION_TYPE, or UDF_ENTITY_ID_MPM_PARTITION_TYPE). */
     UDFENTITYID     idPartitionType;
     /** 0x24: Volume sequence number. */

trunk/include/iprt/fsvfs.h

@@ -129 +129 @@
 /** Valid ISO 9660 mount option mask.   */
 #define RTFSISO9660_F_VALID_MASK    UINT32_C(0x00000007)
+/** Checks if @a a_fNoType is the only acceptable volume type. */
+#define RTFSISO9660_F_IS_ONLY_TYPE(a_fFlags, a_fNoType) \
+    (   ((a_fFlags)   & (RTFSISO9660_F_NO_UDF | RTFSISO9660_F_NO_JOLIET | RTFSISO9660_F_NO_ROCK)) \
+     == (~(a_fNoType) & (RTFSISO9660_F_NO_UDF | RTFSISO9660_F_NO_JOLIET | RTFSISO9660_F_NO_ROCK)) )
 /** @}  */