vol_id: make the --offset= argument optional

[elogind.git] / extras / volume_id / lib / iso9660.c

diff --git a/extras/volume_id/lib/iso9660.c b/extras/volume_id/lib/iso9660.c
index be64a8b8af4e75d6d20f412cfee6b53228092504..0e2c686fa20f143cf06761dcb6177619f32afe5a 100644 (file)
--- a/extras/volume_id/lib/iso9660.c
+++ b/extras/volume_id/lib/iso9660.c
@@ -35,9 +35,9 @@
 #define ISO_VD_MAX                     16
 
 struct iso_volume_descriptor {
-       uint8_t         vd_type;
-       uint8_t         vd_id[5];
-       uint8_t         vd_version;
+       uint8_t         type;
+       uint8_t         id[5];
+       uint8_t         version;
        uint8_t         flags;
        uint8_t         system_id[32];
        uint8_t         volume_id[32];
@@ -49,17 +49,17 @@ struct iso_volume_descriptor {
 struct high_sierra_volume_descriptor {
        uint8_t         foo[8];
        uint8_t         type;
-       uint8_t         id[4];
+       uint8_t         id[5];
        uint8_t         version;
 } PACKED;
 
-int volume_id_probe_iso9660(struct volume_id *id, uint64_t off)
+int volume_id_probe_iso9660(struct volume_id *id, uint64_t off, uint64_t size)
 {
        uint8_t *buf;
        struct iso_volume_descriptor *is;
        struct high_sierra_volume_descriptor *hs;
 
-       info("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx\n", (unsigned long long) off);
 
        buf = volume_id_get_buffer(id, off + ISO_SUPERBLOCK_OFFSET, 0x200);
        if (buf == NULL)
@@ -67,33 +67,33 @@ int volume_id_probe_iso9660(struct volume_id *id, uint64_t off)
 
        is = (struct iso_volume_descriptor *) buf;
 
-       if (memcmp(is->vd_id, "CD001", 5) == 0) {
+       if (memcmp(is->id, "CD001", 5) == 0) {
                int vd_offset;
                int i;
 
-               dbg("read label from PVD");
+               dbg("read label from PVD\n");
                volume_id_set_label_raw(id, is->volume_id, 32);
                volume_id_set_label_string(id, is->volume_id, 32);
 
-               dbg("looking for SVDs");
+               dbg("looking for SVDs\n");
                vd_offset = ISO_VD_OFFSET;
                for (i = 0; i < ISO_VD_MAX; i++) {
                        uint8_t svd_label[64];
 
                        is = (struct iso_volume_descriptor *) volume_id_get_buffer(id, off + vd_offset, 0x200);
-                       if (is == NULL || is->vd_type == ISO_VD_END)
+                       if (is == NULL || is->type == ISO_VD_END)
                                break;
-                       if (is->vd_type != ISO_VD_SUPPLEMENTARY)
+                       if (is->type != ISO_VD_SUPPLEMENTARY)
                                continue;
 
-                       dbg("found SVD at offset 0x%llx", (unsigned long long) (off + vd_offset));
+                       dbg("found SVD at offset 0x%llx\n", (unsigned long long) (off + vd_offset));
                        if (memcmp(is->escape_sequences, "%/@", 3) == 0||
                            memcmp(is->escape_sequences, "%/C", 3) == 0||
                            memcmp(is->escape_sequences, "%/E", 3) == 0) {
-                               dbg("Joliet extension found");
-                               volume_id_set_unicode16((char *)svd_label, sizeof(svd_label), is->volume_id, BE, 32);
+                               dbg("Joliet extension found\n");
+                               volume_id_set_unicode16(svd_label, sizeof(svd_label), is->volume_id, BE, 32);
                                if (memcmp(id->label, svd_label, 16) == 0) {
-                                       dbg("SVD label is identical, use the possibly longer PVD one");
+                                       dbg("SVD label is identical, use the possibly longer PVD one\n");
                                        break;
                                }