Changeset 96861 in vbox for trunk/include

Timestamp:

Sep 26, 2022 10:52:54 AM (2 years ago)

Author:

vboxsync

Message:

IPRT/Vfs,Main/Unattended: Detect fedora ISOs, various code cleanups. Added a parameter to RTVfsQueryLabel so we can get the primary volume ID of an ISO (required for fedora ISOs, as the joliet version is truncated). bugref:9781

Location:

trunk/include/iprt

Files:

• vfs.h (modified) (1 diff)
• vfslowlevel.h (modified) (1 diff)

trunk/include/iprt/vfs.h

@@ -203 +203 @@
  *
  * @returns IPRT status code.
- * @param   hVfs        VFS handle.
- * @param   pszLabel    Where to store the lable.
- * @param   cbLabel     Size of the buffer @a pszLable points at.
- * @param   pcbActual   Where to return the label length, including the
- *                      terminator.  In case of VERR_BUFFER_OVERFLOW returns,
- *                      this will be set to the required buffer size.  Optional.
- */
-RTDECL(int) RTVfsQueryLabel(RTVFS hVfs, char *pszLabel, size_t cbLabel, size_t *pcbActual);
+ * @param   hVfs            VFS handle.
+ * @param   fAlternative    For use with ISO files to retrieve the primary lable
+ *                          rather than the joliet / UDF one that the mount
+ *                          options would indicate.  For other file systems, as
+ *                          well for ISO not mounted in joliet / UDF mode, the
+ *                          flag is ignored.
+ * @param   pszLabel        Where to store the lable.
+ * @param   cbLabel         Size of the buffer @a pszLable points at.
+ * @param   pcbActual       Where to return the label length, including the
+ *                          terminator.  In case of VERR_BUFFER_OVERFLOW
+ *                          returns, this will be set to the required buffer
+ *                          size.  Optional.
+ */
+RTDECL(int) RTVfsQueryLabel(RTVFS hVfs, bool fAlternative, char *pszLabel, size_t cbLabel, size_t *pcbActual);
 
 

trunk/include/iprt/vfslowlevel.h

@@ -182 +182 @@
      * Returns a UTF-8 string. */
     RTVFSQIEX_VOL_LABEL,
+    /** Alternative volume label, the primary one for ISOs, otherwise treated same
+     * as RTVFSQIEX_VOL_LABEL. */
+    RTVFSQIEX_VOL_LABEL_ALT,
     /** Volume serial number.
      * Returns a uint32_t, uint64_t or RTUUID. */