hal/volume_id Makefile.am, 1.9, 1.10 squashfs.c, NONE, 1.1 volume_id.c, 1.14, 1.15 volume_id.h, 1.14, 1.15

[Kay Sievers]

Update of /cvs/hal/hal/volume_id
In directory kemper:/tmp/cvs-serv5196/volume_id

Modified Files:
	Makefile.am volume_id.c volume_id.h 
Added Files:
	squashfs.c 
Log Message:
2006-03-08  Kay Sievers  <kay.sievers at vrfy.org>

        Add squashfs detection.

        * volume_id/Makefile.am:
        * volume_id/volume_id.c: (volume_id_probe_filesystem):
        * volume_id/volume_id.h:
        * volume_id/squashfs.c:


Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/volume_id/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.am	15 Nov 2005 03:32:36 -0000	1.9
+++ Makefile.am	8 Mar 2006 19:02:44 -0000	1.10
@@ -34,6 +34,7 @@
 	minix.c			\
 	ocfs.c			\
 	vxfs.c			\
+	squashfs.c		\
 	logging.h		\
 	util.h			\
 	util.c			\

--- NEW FILE: squashfs.c ---
/*
 * volume_id - reads filesystem label and uuid
 *
 * Copyright (C) 2006 Kay Sievers <kay.sievers at 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.
 */

#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 <string.h>
#include <errno.h>
#include <ctype.h>

#include "volume_id.h"
#include "logging.h"
#include "util.h"

#define SQUASHFS_MAGIC		0x73717368

struct squashfs_super {
	uint32_t		s_magic;
} PACKED;

int volume_id_probe_squashfs(struct volume_id *id, uint64_t off)
{
	struct squashfs_super *sqs;

	dbg("probing at offset 0x%llx", (unsigned long long) off);

	sqs = (struct squashfs_super *) volume_id_get_buffer(id, off + 0x200, 0x200);
	if (sqs == NULL)
		return -1;

	if (sqs->s_magic == SQUASHFS_MAGIC || sqs->s_magic == bswap_32(SQUASHFS_MAGIC)) {
		volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
		id->type = "squashfs";
		return 0;
	}

	return -1;
}

Index: volume_id.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/volume_id.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- volume_id.c	21 Feb 2006 19:15:17 -0000	1.14
+++ volume_id.c	8 Mar 2006 19:02:44 -0000	1.15
@@ -149,6 +149,9 @@
 	if (volume_id_probe_vxfs(id, off) == 0)
 		goto found;
 
+	if (volume_id_probe_squashfs(id, off) == 0)
+		goto found;
+
 	return -1;
 
 found:

Index: volume_id.h
===================================================================
RCS file: /cvs/hal/hal/volume_id/volume_id.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- volume_id.h	21 Feb 2006 19:15:17 -0000	1.14
+++ volume_id.h	8 Mar 2006 19:02:44 -0000	1.15
@@ -14,7 +14,7 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#define VOLUME_ID_VERSION		58
+#define VOLUME_ID_VERSION		59
 
 #ifndef PACKED
 #define PACKED				__attribute__((packed))
@@ -96,6 +96,7 @@
 extern int volume_id_probe_ufs(struct volume_id *id, uint64_t off);
 extern int volume_id_probe_vxfs(struct volume_id *id, uint64_t off);
 extern int volume_id_probe_xfs(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_squashfs(struct volume_id *id, uint64_t off);
 
 /* special formats */
 extern int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off);