*
* Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2 of the License.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _GNU_SOURCE
#define _GNU_SOURCE 1
#endif
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <ctype.h>
#include "libvolume_id.h"
-#include "util.h"
+#include "libvolume_id-private.h"
struct volume_descriptor {
struct descriptor_tag {
#define UDF_VSD_OFFSET 0x8000
-int volume_id_probe_udf(struct volume_id *id, uint64_t off)
+int volume_id_probe_udf(struct volume_id *id, uint64_t off, uint64_t size)
{
struct volume_descriptor *vd;
struct volume_structure_descriptor *vsd;
unsigned int loc;
unsigned int clen;
- dbg("probing at offset 0x%llx", (unsigned long long) off);
+ info("probing at offset 0x%" PRIx64 "\n", off);
vsd = (struct volume_structure_descriptor *) volume_id_get_buffer(id, off + UDF_VSD_OFFSET, 0x200);
if (vsd == NULL)
vsd = (struct volume_structure_descriptor *) volume_id_get_buffer(id, off + UDF_VSD_OFFSET + bs, 0x800);
if (vsd == NULL)
return -1;
- dbg("test for blocksize: 0x%x", bs);
+ dbg("test for blocksize: 0x%x\n", bs);
if (vsd->id[0] != '\0')
goto nsr;
}
if (vsd == NULL)
return -1;
- dbg("vsd: %c%c%c%c%c",
+ dbg("vsd: %c%c%c%c%c\n",
vsd->id[0], vsd->id[1], vsd->id[2], vsd->id[3], vsd->id[4]);
if (vsd->id[0] == '\0')
/* get desriptor list address and block count */
count = le32_to_cpu(vd->type.anchor.length) / bs;
loc = le32_to_cpu(vd->type.anchor.location);
- dbg("0x%x descriptors starting at logical secor 0x%x", count, loc);
+ dbg("0x%x descriptors starting at logical secor 0x%x\n", count, loc);
/* pick the primary descriptor from the list */
for (b = 0; b < count; b++) {
return -1;
type = le16_to_cpu(vd->tag.id);
- dbg("descriptor type %i", type);
+ dbg("descriptor type %i\n", type);
/* check validity */
if (type == 0)
volume_id_set_label_raw(id, &(vd->type.primary.ident.clen), 32);
clen = vd->type.primary.ident.clen;
- dbg("label string charsize=%i bit", clen);
+ dbg("label string charsize=%i bit\n", clen);
if (clen == 8)
volume_id_set_label_string(id, vd->type.primary.ident.c, 31);
else if (clen == 16)