/*
* volume_id - reads filesystem label and uuid
*
- * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2005-2007 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"
+
+#define MINIX_SUPERBLOCK_OFFSET 0x400
+
+#define MINIX_SUPER_MAGIC 0x137F
+#define MINIX_SUPER_MAGIC2 0x138F
+#define MINIX2_SUPER_MAGIC 0x2468
+#define MINIX2_SUPER_MAGIC2 0x2478
+#define MINIX3_SUPER_MAGIC 0x4d5a
struct minix_super_block
{
uint32_t s_zones;
} PACKED;
-#define MINIX_SUPERBLOCK_OFFSET 0x400
+struct minix3_super_block {
+ uint32_t s_ninodes;
+ uint16_t s_pad0;
+ uint16_t s_imap_blocks;
+ uint16_t s_zmap_blocks;
+ uint16_t s_firstdatazone;
+ uint16_t s_log_zone_size;
+ uint16_t s_pad1;
+ uint32_t s_max_size;
+ uint32_t s_zones;
+ uint16_t s_magic;
+ uint16_t s_pad2;
+ uint16_t s_blocksize;
+ uint8_t s_disk_version;
+} PACKED;
int volume_id_probe_minix(struct volume_id *id, uint64_t off, uint64_t size)
{
+ uint8_t *buf;
struct minix_super_block *ms;
+ struct minix3_super_block *m3s;
- info("probing at offset 0x%llx", (unsigned long long) off);
+ info("probing at offset 0x%" PRIx64 "\n", off);
- ms = (struct minix_super_block *) volume_id_get_buffer(id, off + MINIX_SUPERBLOCK_OFFSET, 0x200);
- if (ms == NULL)
+ buf = volume_id_get_buffer(id, off + MINIX_SUPERBLOCK_OFFSET, 0x200);
+ if (buf == NULL)
return -1;
- if (le16_to_cpu(ms->s_magic) == 0x137f) {
+ ms = (struct minix_super_block *) buf;
+
+ if (ms->s_magic == MINIX_SUPER_MAGIC ||
+ ms->s_magic == bswap_16(MINIX_SUPER_MAGIC)) {
strcpy(id->type_version, "1");
goto found;
}
-
- if (le16_to_cpu(ms->s_magic) == 0x1387) {
+ if (ms->s_magic == MINIX_SUPER_MAGIC2 ||
+ ms->s_magic == bswap_16(MINIX_SUPER_MAGIC2)) {
strcpy(id->type_version, "1");
goto found;
}
-
- if (le16_to_cpu(ms->s_magic) == 0x2468) {
+ if (ms->s_magic == MINIX2_SUPER_MAGIC ||
+ ms->s_magic == bswap_16(MINIX2_SUPER_MAGIC)) {
strcpy(id->type_version, "2");
goto found;
}
-
- if (le16_to_cpu(ms->s_magic) == 0x2478) {
+ if (ms->s_magic == MINIX2_SUPER_MAGIC2 ||
+ ms->s_magic == bswap_16(MINIX2_SUPER_MAGIC2)) {
strcpy(id->type_version, "2");
goto found;
}
+ m3s = (struct minix3_super_block *) buf;
+ if (m3s->s_magic == MINIX3_SUPER_MAGIC ||
+ m3s->s_magic == bswap_16(MINIX3_SUPER_MAGIC)) {
+ strcpy(id->type_version, "3");
+ goto found;
+ }
goto exit;
found: