chiark / gitweb /
[PATCH] update udev_volume_id
[elogind.git] / extras / volume_id / volume_id.c
index cc5475fc8dda2f24fe37dcf23297ed6269e8abed..ac7e76b9d4740aa6b3f919a48866b4a72eceed4e 100644 (file)
@@ -7,25 +7,29 @@
  *     the e2fsprogs. This is a simple straightforward implementation for
  *     reading the label strings of only the most common filesystems.
  *     If you need a full featured library with attribute caching, support for
- *     much more partition/media types or non-root data access, you may have
+ *     much more partition/media types or non-root disk access, you may have
  *     a look at:
  *             http://e2fsprogs.sourceforge.net.
  *
- *     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 library is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU Lesser General Public
+ *     License as published by the Free Software Foundation; either
+ *     version 2.1 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, write to the Free Software Foundation, Inc.,
- *     675 Mass Ave, Cambridge, MA 02139, USA.
+ *     This library 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
+ *     Lesser General Public License for more details.
  *
+ *     You should have received a copy of the GNU Lesser General Public
+ *     License along with this library; if not, write to the Free Software
+ *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "volume_id.h"
 
+#ifdef DEBUG
+#define dbg(format, arg...)                                            \
+       do {                                                            \
+               printf("%s: " format "\n", __FUNCTION__ , ## arg);      \
+       } while (0)
+#else
+#define dbg(format, arg...)    do {} while (0)
+#endif
+
+#define bswap16(x) (__u16)((((__u16)(x) & 0x00ffu) << 8) | \
+                          (((__u32)(x) & 0xff00u) >> 8))
 
 #define bswap32(x) (__u32)((((__u32)(x) & 0xff000000u) >> 24) | \
                           (((__u32)(x) & 0x00ff0000u) >>  8) | \
                           (((__u32)(x) & 0x0000ff00u) <<  8) | \
                           (((__u32)(x) & 0x000000ffu) << 24))
 
+#define bswap64(x) (__u64)((((__u64)(x) & 0xff00000000000000u) >> 56) | \
+                          (((__u64)(x) & 0x00ff000000000000u) >> 40) | \
+                          (((__u64)(x) & 0x0000ff0000000000u) >> 24) | \
+                          (((__u64)(x) & 0x000000ff00000000u) >>  8) | \
+                          (((__u64)(x) & 0x00000000ff000000u) <<  8) | \
+                          (((__u64)(x) & 0x0000000000ff0000u) << 24) | \
+                          (((__u64)(x) & 0x000000000000ff00u) << 40) | \
+                          (((__u64)(x) & 0x00000000000000ffu) << 56))
+
 #if (__BYTE_ORDER == __LITTLE_ENDIAN) 
-#define cpu_to_le32(x) (x)
+#define le16_to_cpu(x) (x)
+#define le32_to_cpu(x) (x)
+#define le64_to_cpu(x) (x)
 #elif (__BYTE_ORDER == __BIG_ENDIAN)
-#define cpu_to_le32(x) bswap32(x)
+#define le16_to_cpu(x) bswap16(x)
+#define le32_to_cpu(x) bswap32(x)
+#define le64_to_cpu(x) bswap64(x)
 #endif
 
-#define VOLUME_ID_BUFFER_SIZE          0x11000 /* reiser offset is 64k */
+/* size of superblock buffer, reiser block is at 64k */
+#define SB_BUFFER_SIZE                         0x11000
+/* size of seek buffer 2k */
+#define SEEK_BUFFER_SIZE                       0x800
 
 
-static void set_label(struct volume_id *id, char *buf, int count)
+static void set_label_raw(struct volume_id *id,
+                         const __u8 *buf, unsigned int count)
 {
-       int i;
+       memcpy(id->label_raw, buf, count);
+       id->label_raw_len = count;
+}
 
-       memcpy(id->label, buf, count);
+static void set_label_string(struct volume_id *id,
+                            const __u8 *buf, unsigned int count)
+{
+       unsigned int i;
 
        memcpy(id->label_string, buf, count);
 
        /* remove trailing whitespace */
-       i = strlen(id->label_string);
+       i = strnlen(id->label_string, count);
        while (i--) {
                if (! isspace(id->label_string[i]))
                        break;
@@ -70,9 +107,42 @@ static void set_label(struct volume_id *id, char *buf, int count)
        id->label_string[i+1] = '\0';
 }
 
-static void set_uuid(struct volume_id *id, unsigned char *buf, int count)
+#define LE             0
+#define BE             1
+static void set_label_unicode16(struct volume_id *id,
+                               const __u8 *buf,
+                               unsigned int endianess,
+                               unsigned int count)
 {
-       int i;
+       unsigned int i, j;
+       __u16 c;
+
+       j = 0;
+       for (i = 0; i <= count-2; i += 2) {
+               if (endianess == LE)
+                       c = (buf[i+1] << 8) | buf[i];
+               else
+                       c = (buf[i] << 8) | buf[i+1];
+               if (c == 0) {
+                       id->label_string[j] = '\0';
+                       break;
+               } else if (c < 0x80) {
+                       id->label_string[j++] = (__u8) c;
+               } else if (c < 0x800) {
+                       id->label_string[j++] = (__u8) (0xc0 | (c >> 6));
+                       id->label_string[j++] = (__u8) (0x80 | (c & 0x3f));
+               } else {
+                       id->label_string[j++] = (__u8) (0xe0 | (c >> 12));
+                       id->label_string[j++] = (__u8) (0x80 | ((c >> 6) & 0x3f));
+                       id->label_string[j++] = (__u8) (0x80 | (c & 0x3f));
+               }
+       }
+}
+
+static void set_uuid(struct volume_id *id,
+                    const __u8 *buf, unsigned int count)
+{
+       unsigned int i;
 
        memcpy(id->uuid, buf, count);
 
@@ -90,7 +160,8 @@ set:
                break;
        case 16:
                sprintf(id->uuid_string,
-                       "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+                       "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-"
+                       "%02x%02x%02x%02x%02x%02x",
                        buf[0], buf[1], buf[2], buf[3],
                        buf[4], buf[5],
                        buf[6], buf[7],
@@ -100,29 +171,69 @@ set:
        }
 }
 
-static int open_superblock(struct volume_id *id)
+static __u8 *get_buffer(struct volume_id *id,
+                       unsigned long off, unsigned int len)
 {
-       /* get buffer to read the first block */
-       if (id->buf == NULL) {
-               id->buf = malloc(VOLUME_ID_BUFFER_SIZE);
-               if (id->buf == NULL)
-                       return -1;
+       unsigned int buf_len;
+
+       /* check if requested area fits in superblock buffer */
+       if (off + len <= SB_BUFFER_SIZE) {
+               if (id->sbbuf == NULL) {
+                       id->sbbuf = malloc(SB_BUFFER_SIZE);
+                       if (id->sbbuf == NULL)
+                               return NULL;
+               }
+
+               /* check if we need to read */
+               if ((off + len) > id->sbbuf_len) {
+                       dbg("read sbbuf len:0x%lx", off + len);
+                       lseek64(id->fd, 0, SEEK_SET);
+                       buf_len = read(id->fd, id->sbbuf, off + len);
+                       id->sbbuf_len = buf_len;
+                       if (buf_len < off + len)
+                               return NULL;
+               }
+
+               return &(id->sbbuf[off]);
+       } else {
+               if (len > SEEK_BUFFER_SIZE)
+                       len = SEEK_BUFFER_SIZE;
+
+               /* get seek buffer */
+               if (id->seekbuf == NULL) {
+                       id->seekbuf = malloc(SEEK_BUFFER_SIZE);
+                       if (id->seekbuf == NULL)
+                               return NULL;
+               }
+
+               /* check if we need to read */
+               if ((off < id->seekbuf_off) ||
+                   ((off + len) > (id->seekbuf_off + id->seekbuf_len))) {
+                       dbg("read seekbuf off:0x%lx len:0x%x", off, len);
+                       lseek64(id->fd, off, SEEK_SET);
+                       buf_len = read(id->fd, id->seekbuf, len);
+                       dbg("got 0x%x (%i) bytes", buf_len, buf_len);
+                       id->seekbuf_off = off;
+                       id->seekbuf_len = buf_len;
+                       if (buf_len < len)
+                               return NULL;
+               }
+
+               return &(id->seekbuf[off - id->seekbuf_off]);
        }
-
-       /* try to read the first 64k, but at least the first block */
-       memset(id->buf, 0x00, VOLUME_ID_BUFFER_SIZE);
-       lseek(id->fd, 0, SEEK_SET);
-       if (read(id->fd, id->buf, VOLUME_ID_BUFFER_SIZE) < 0x200)
-               return -1;
-
-       return 0;
 }
 
-static void close_superblock(struct volume_id *id)
+static void free_buffer(struct volume_id *id)
 {
-       if (id->buf != NULL) {
-               free(id->buf);
-               id->buf = NULL;
+       if (id->sbbuf != NULL) {
+               free(id->sbbuf);
+               id->sbbuf = NULL;
+               id->sbbuf_len = 0;
+       }
+       if (id->seekbuf != NULL) {
+               free(id->seekbuf);
+               id->seekbuf = NULL;
+               id->seekbuf_len = 0;
        }
 }
 
@@ -132,34 +243,39 @@ static void close_superblock(struct volume_id *id)
 static int probe_ext(struct volume_id *id)
 {
        struct ext2_super_block {
-               __u32           s_inodes_count;
-               __u32           s_blocks_count;
-               __u32           s_r_blocks_count;
-               __u32           s_free_blocks_count;
-               __u32           s_free_inodes_count;
-               __u32           s_first_data_block;
-               __u32           s_log_block_size;
-               __u32           s_dummy3[7];
-               unsigned char   s_magic[2];
-               __u16           s_state;
-               __u32           s_dummy5[8];
-               __u32           s_feature_compat;
-               __u32           s_feature_incompat;
-               __u32           s_feature_ro_compat;
-               unsigned char   s_uuid[16];
-               char            s_volume_name[16];
-       } *es;
-
-       es = (struct ext2_super_block *) (id->buf + EXT_SUPERBLOCK_OFFSET);
-
-       if (es->s_magic[0] != 0123 ||
-           es->s_magic[1] != 0357)
+               __u32   inodes_count;
+               __u32   blocks_count;
+               __u32   r_blocks_count;
+               __u32   free_blocks_count;
+               __u32   free_inodes_count;
+               __u32   first_data_block;
+               __u32   log_block_size;
+               __u32   dummy3[7];
+               __u8    magic[2];
+               __u16   state;
+               __u32   dummy5[8];
+               __u32   feature_compat;
+               __u32   feature_incompat;
+               __u32   feature_ro_compat;
+               __u8    uuid[16];
+               __u8    volume_name[16];
+       } __attribute__((__packed__)) *es;
+
+       es = (struct ext2_super_block *)
+            get_buffer(id, EXT_SUPERBLOCK_OFFSET, 0x200);
+       if (es == NULL)
+               return -1;
+
+       if (es->magic[0] != 0123 ||
+           es->magic[1] != 0357)
                return -1;
 
-       set_label(id, es->s_volume_name, 16);
-       set_uuid(id, es->s_uuid, 16);
+       set_label_raw(id, es->volume_name, 16);
+       set_label_string(id, es->volume_name, 16);
+       set_uuid(id, es->uuid, 16);
 
-       if ((cpu_to_le32(es->s_feature_compat) & EXT3_FEATURE_COMPAT_HAS_JOURNAL) != 0) {
+       if ((le32_to_cpu(es->feature_compat) &
+            EXT3_FEATURE_COMPAT_HAS_JOURNAL) != 0) {
                id->fs_type = EXT3;
                id->fs_name = "ext3";
        } else {
@@ -175,38 +291,45 @@ static int probe_ext(struct volume_id *id)
 static int probe_reiser(struct volume_id *id)
 {
        struct reiser_super_block {
-               __u32           rs_blocks_count;
-               __u32           rs_free_blocks;
-               __u32           rs_root_block;
-               __u32           rs_journal_block;
-               __u32           rs_journal_dev;
-               __u32           rs_orig_journal_size;
-               __u32           rs_dummy2[5];
-               __u16           rs_blocksize;
-               __u16           rs_dummy3[3];
-               unsigned char   rs_magic[12];
-               __u32           rs_dummy4[5];
-               unsigned char   rs_uuid[16];
-               char            rs_label[16];
-       } *rs;
-
-       rs = (struct reiser_super_block *) &(id->buf[REISER1_SUPERBLOCK_OFFSET]);
-
-       if (strncmp(rs->rs_magic, "ReIsErFs", 8) == 0)
+               __u32   blocks_count;
+               __u32   free_blocks;
+               __u32   root_block;
+               __u32   journal_block;
+               __u32   journal_dev;
+               __u32   orig_journal_size;
+               __u32   dummy2[5];
+               __u16   blocksize;
+               __u16   dummy3[3];
+               __u8    magic[12];
+               __u32   dummy4[5];
+               __u8    uuid[16];
+               __u8    label[16];
+       } __attribute__((__packed__)) *rs;
+
+       rs = (struct reiser_super_block *)
+            get_buffer(id, REISER_SUPERBLOCK_OFFSET, 0x200);
+       if (rs == NULL)
+               return -1;
+
+       if (strncmp(rs->magic, "ReIsEr2Fs", 9) == 0)
+               goto found;
+       if (strncmp(rs->magic, "ReIsEr3Fs", 9) == 0)
                goto found;
 
-       rs = (struct reiser_super_block *) &(id->buf[REISER_SUPERBLOCK_OFFSET]);
+       rs = (struct reiser_super_block *)
+            get_buffer(id, REISER1_SUPERBLOCK_OFFSET, 0x200);
+       if (rs == NULL)
+               return -1;
 
-       if (strncmp(rs->rs_magic, "ReIsEr2Fs", 9) == 0)
-               goto found;
-       if (strncmp(rs->rs_magic, "ReIsEr3Fs", 9) == 0)
+       if (strncmp(rs->magic, "ReIsErFs", 8) == 0)
                goto found;
 
        return -1;
 
 found:
-       set_label(id, rs->rs_label, 16);
-       set_uuid(id, rs->rs_uuid, 16);
+       set_label_raw(id, rs->label, 16);
+       set_label_string(id, rs->label, 16);
+       set_uuid(id, rs->uuid, 16);
 
        id->fs_type = REISER;
        id->fs_name = "reiser";
@@ -217,27 +340,30 @@ found:
 static int probe_xfs(struct volume_id *id)
 {
        struct xfs_super_block {
-               unsigned char   xs_magic[4];
-               __u32           xs_blocksize;
-               __u64           xs_dblocks;
-               __u64           xs_rblocks;
-               __u32           xs_dummy1[2];
-               unsigned char   xs_uuid[16];
-               __u32           xs_dummy2[15];
-               char            xs_fname[12];
-               __u32           xs_dummy3[2];
-               __u64           xs_icount;
-               __u64           xs_ifree;
-               __u64           xs_fdblocks;
-       } *xs;
-
-       xs = (struct xfs_super_block *) id->buf;
-
-       if (strncmp(xs->xs_magic, "XFSB", 4) != 0)
+               __u8    magic[4];
+               __u32   blocksize;
+               __u64   dblocks;
+               __u64   rblocks;
+               __u32   dummy1[2];
+               __u8    uuid[16];
+               __u32   dummy2[15];
+               __u8    fname[12];
+               __u32   dummy3[2];
+               __u64   icount;
+               __u64   ifree;
+               __u64   fdblocks;
+       } __attribute__((__packed__)) *xs;
+
+       xs = (struct xfs_super_block *) get_buffer(id, 0, 0x200);
+       if (xs == NULL)
+               return -1;
+
+       if (strncmp(xs->magic, "XFSB", 4) != 0)
                return -1;
 
-       set_label(id, xs->xs_fname, 12);
-       set_uuid(id, xs->xs_uuid, 16);
+       set_label_raw(id, xs->fname, 12);
+       set_label_string(id, xs->fname, 12);
+       set_uuid(id, xs->uuid, 16);
 
        id->fs_type = XFS;
        id->fs_name = "xfs";
@@ -249,25 +375,29 @@ static int probe_xfs(struct volume_id *id)
 static int probe_jfs(struct volume_id *id)
 {
        struct jfs_super_block {
-               unsigned char   js_magic[4];
-               __u32           js_version;
-               __u64           js_size;
-               __u32           js_bsize;
-               __u32           js_dummy1;
-               __u32           js_pbsize;
-               __u32           js_dummy2[27];
-               unsigned char   js_uuid[16];
-               unsigned char   js_label[16];
-               unsigned char   js_loguuid[16];
-       } *js;
-
-       js = (struct jfs_super_block *) &(id->buf[JFS_SUPERBLOCK_OFFSET]);
-
-       if (strncmp(js->js_magic, "JFS1", 4) != 0)
+               __u8    magic[4];
+               __u32   version;
+               __u64   size;
+               __u32   bsize;
+               __u32   dummy1;
+               __u32   pbsize;
+               __u32   dummy2[27];
+               __u8    uuid[16];
+               __u8    label[16];
+               __u8    loguuid[16];
+       } __attribute__((__packed__)) *js;
+
+       js = (struct jfs_super_block *)
+            get_buffer(id, JFS_SUPERBLOCK_OFFSET, 0x200);
+       if (js == NULL)
+               return -1;
+
+       if (strncmp(js->magic, "JFS1", 4) != 0)
                return -1;
 
-       set_label(id, js->js_label, 16);
-       set_uuid(id, js->js_uuid, 16);
+       set_label_raw(id, js->label, 16);
+       set_label_string(id, js->label, 16);
+       set_uuid(id, js->uuid, 16);
 
        id->fs_type = JFS;
        id->fs_name = "jfs";
@@ -278,46 +408,49 @@ static int probe_jfs(struct volume_id *id)
 static int probe_vfat(struct volume_id *id)
 {
        struct vfat_super_block {
-               unsigned char   vs_ignored[3];
-               unsigned char   vs_sysid[8];
-               unsigned char   vs_sector_size[2];
-               __u8            vs_cluster_size;
-               __u16           vs_reserved;
-               __u8            vs_fats;
-               unsigned char   vs_dir_entries[2];
-               unsigned char   vs_sectors[2];
-               unsigned char   vs_media;
-               __u16           vs_fat_length;
-               __u16           vs_secs_track;
-               __u16           vs_heads;
-               __u32           vs_hidden;
-               __u32           vs_total_sect;
-               __u32           vs_fat32_length;
-               __u16           vs_flags;
-               __u8            vs_version[2];
-               __u32           vs_root_cluster;
-               __u16           vs_insfo_sector;
-               __u16           vs_backup_boot;
-               __u16           vs_reserved2[6];
-               unsigned char   vs_unknown[3];
-               unsigned char   vs_serno[4];
-               char            vs_label[11];
-               unsigned char   vs_magic[8];
-               unsigned char   vs_dummy2[164];
-               unsigned char   vs_pmagic[2];
-       } *vs;
-
-       vs = (struct vfat_super_block *) id->buf;
-
-       if (strncmp(vs->vs_magic, "MSWIN", 5) == 0)
+               __u8    ignored[3];
+               __u8    sysid[8];
+               __u8    sector_size[2];
+               __u8    cluster_size;
+               __u16   reserved;
+               __u8    fats;
+               __u8    dir_entries[2];
+               __u8    sectors[2];
+               __u8    media;
+               __u16   fat_length;
+               __u16   secs_track;
+               __u16   heads;
+               __u32   hidden;
+               __u32   total_sect;
+               __u32   fat32_length;
+               __u16   flags;
+               __u8    version[2];
+               __u32   root_cluster;
+               __u16   insfo_sector;
+               __u16   backup_boot;
+               __u16   reserved2[6];
+               __u8    unknown[3];
+               __u8    serno[4];
+               __u8    label[11];
+               __u8    magic[8];
+               __u8    dummy2[164];
+               __u8    pmagic[2];
+       } __attribute__((__packed__)) *vs;
+
+       vs = (struct vfat_super_block *) get_buffer(id, 0, 0x200);
+       if (vs == NULL)
+               return -1;
+
+       if (strncmp(vs->magic, "MSWIN", 5) == 0)
                goto found;
-       if (strncmp(vs->vs_magic, "FAT32   ", 8) == 0)
+       if (strncmp(vs->magic, "FAT32   ", 8) == 0)
                goto found;
        return -1;
 
 found:
-       memcpy(id->label, vs->vs_label, 11);
-       memcpy(id->uuid, vs->vs_serno, 4);
+       set_label_raw(id, vs->label, 11);
+       set_label_string(id, vs->label, 11);
+       set_uuid(id, vs->serno, 4);
 
        id->fs_type = VFAT;
        id->fs_name = "vfat";
@@ -328,41 +461,44 @@ found:
 static int probe_msdos(struct volume_id *id)
 {
        struct msdos_super_block {
-               unsigned char   ms_ignored[3];
-               unsigned char   ms_sysid[8];
-               unsigned char   ms_sector_size[2];
-               __u8            ms_cluster_size;
-               __u16           ms_reserved;
-               __u8            ms_fats;
-               unsigned char   ms_dir_entries[2];
-               unsigned char   ms_sectors[2];
-               unsigned char   ms_media;
-               __u16           ms_fat_length;
-               __u16           ms_secs_track;
-               __u16           ms_heads;
-               __u32           ms_hidden;
-               __u32           ms_total_sect;
-               unsigned char   ms_unknown[3];
-               unsigned char   ms_serno[4];
-               char            ms_label[11];
-               unsigned char   ms_magic[8];
-               unsigned char   ms_dummy2[192];
-               unsigned char   ms_pmagic[2];
-       } *ms;
-
-       ms = (struct msdos_super_block *) id->buf;
-
-       if (strncmp(ms->ms_magic, "MSDOS", 5) == 0)
+               __u8    ignored[3];
+               __u8    sysid[8];
+               __u8    sector_size[2];
+               __u8    cluster_size;
+               __u16   reserved;
+               __u8    fats;
+               __u8    dir_entries[2];
+               __u8    sectors[2];
+               __u8    media;
+               __u16   fat_length;
+               __u16   secs_track;
+               __u16   heads;
+               __u32   hidden;
+               __u32   total_sect;
+               __u8    unknown[3];
+               __u8    serno[4];
+               __u8    label[11];
+               __u8    magic[8];
+               __u8    dummy2[192];
+               __u8    pmagic[2];
+       } __attribute__((__packed__)) *ms;
+
+       ms = (struct msdos_super_block *) get_buffer(id, 0, 0x200);
+       if (ms == NULL)
+               return -1;
+
+       if (strncmp(ms->magic, "MSDOS", 5) == 0)
                goto found;
-       if (strncmp(ms->ms_magic, "FAT16   ", 8) == 0)
+       if (strncmp(ms->magic, "FAT16   ", 8) == 0)
                goto found;
-       if (strncmp(ms->ms_magic, "FAT12   ", 8) == 0)
+       if (strncmp(ms->magic, "FAT12   ", 8) == 0)
                goto found;
        return -1;
 
 found:
-       set_label(id, ms->ms_label, 11);
-       set_uuid(id, ms->ms_serno, 4);
+       set_label_raw(id, ms->label, 11);
+       set_label_string(id, ms->label, 11);
+       set_uuid(id, ms->serno, 4);
 
        id->fs_type = MSDOS;
        id->fs_name = "msdos";
@@ -370,33 +506,365 @@ found:
        return 0;
 }
 
+#define UDF_VSD_OFFSET                 0x8000
+static int probe_udf(struct volume_id *id)
+{
+       struct volume_descriptor {
+               struct descriptor_tag {
+                       __u16   id;
+                       __u16   version;
+                       __u8    checksum;
+                       __u8    reserved;
+                       __u16   serial;
+                       __u16   crc;
+                       __u16   crc_len;
+                       __u32   location;
+               } __attribute__((__packed__)) tag;
+               union {
+                       struct anchor_descriptor {
+                               __u32   length;
+                               __u32   location;
+                       } __attribute__((__packed__)) anchor;
+                       struct primary_descriptor {
+                               __u32   seq_num;
+                               __u32   desc_num;
+                               struct dstring {
+                                       __u8    clen;
+                                       __u8    c[31];
+                               } __attribute__((__packed__)) ident;
+                       } __attribute__((__packed__)) primary;
+               } __attribute__((__packed__)) type;
+       } __attribute__((__packed__)) *vd;
+
+       struct volume_structure_descriptor {
+               __u8    type;
+               __u8    id[5];
+               __u8    version;
+       } *vsd;
+
+       unsigned int bs;
+       unsigned int b;
+       unsigned int type;
+       unsigned int count;
+       unsigned int loc;
+       unsigned int clen;
+
+       vsd = (struct volume_structure_descriptor *)
+             get_buffer(id, UDF_VSD_OFFSET, 0x200);
+       if (vsd == NULL)
+               return -1;
+
+       if (strncmp(vsd->id, "NSR02", 5) == 0)
+               goto blocksize;
+       if (strncmp(vsd->id, "NSR03", 5) == 0)
+               goto blocksize;
+       if (strncmp(vsd->id, "BEA01", 5) == 0)
+               goto blocksize;
+       if (strncmp(vsd->id, "BOOT2", 5) == 0)
+               goto blocksize;
+       if (strncmp(vsd->id, "CD001", 5) == 0)
+               goto blocksize;
+       if (strncmp(vsd->id, "CDW02", 5) == 0)
+               goto blocksize;
+       if (strncmp(vsd->id, "TEA03", 5) == 0)
+               goto blocksize;
+       return -1;
+
+blocksize:
+       /* search the next VSD to get the logical block size of the volume */
+       for (bs = 0x800; bs < 0x8000; bs += 0x800) {
+               vsd = (struct volume_structure_descriptor *)
+                     get_buffer(id, UDF_VSD_OFFSET + bs, 0x800);
+               if (vsd == NULL)
+                       return -1;
+               dbg("test for blocksize: 0x%x", bs);
+               if (vsd->id[0] != '\0')
+                       goto nsr;
+       }
+       return -1;
+
+nsr:
+       /* search the list of VSDs for a NSR descriptor */
+       for (b = 0; b < 64; b++) {
+               vsd = (struct volume_structure_descriptor *)
+                     get_buffer(id, UDF_VSD_OFFSET + (b * bs), 0x800);
+               if (vsd == NULL)
+                       return -1;
+
+               dbg("vsd: %c%c%c%c%c",
+                   vsd->id[0], vsd->id[1], vsd->id[2], vsd->id[3], vsd->id[4]);
+
+               if (vsd->id[0] == '\0')
+                       return -1;
+               if (strncmp(vsd->id, "NSR02", 5) == 0)
+                       goto anchor;
+               if (strncmp(vsd->id, "NSR03", 5) == 0)
+                       goto anchor;
+       }
+       return -1;
+
+anchor:
+       /* read anchor volume descriptor */
+       vd = (struct volume_descriptor *) get_buffer(id, 256 * bs, 0x200);
+       if (vd == NULL)
+               return -1;
+
+       type = le16_to_cpu(vd->tag.id);
+       if (type != 2) /* TAG_ID_AVDP */
+               goto found;
+
+       /* 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);
+
+       /* pick the primary descriptor from the list */
+       for (b = 0; b < count; b++) {
+               vd = (struct volume_descriptor *)
+                    get_buffer(id, (loc + b) * bs, 0x200);
+               if (vd == NULL)
+                       return -1;
+
+               type = le16_to_cpu(vd->tag.id);
+               dbg("descriptor type %i", type);
+
+               /* check validity */
+               if (type == 0)
+                       goto found;
+               if (le32_to_cpu(vd->tag.location) != loc + b)
+                       goto found;
+
+               if (type == 1) /* TAG_ID_PVD */
+                       goto pvd;
+       }
+       goto found;
+
+pvd:
+       set_label_raw(id, &(vd->type.primary.ident.clen), 32);
+
+       clen = vd->type.primary.ident.clen;
+       dbg("label string charsize=%i bit", clen);
+       if (clen == 8) 
+               set_label_string(id, vd->type.primary.ident.c, 31);
+       else if (clen == 16)
+               set_label_unicode16(id, vd->type.primary.ident.c, BE,31);
+
+found:
+       id->fs_type = UDF;
+       id->fs_name = "udf";
+
+       return 0;
+}
+
+#define ISO_SUPERBLOCK_OFFSET          0x8000
+static int probe_iso9660(struct volume_id *id)
+{
+       union iso_super_block {
+               struct iso_header {
+                       __u8    type;
+                       __u8    id[5];
+                       __u8    version;
+                       __u8    unused1;
+                       __u8            system_id[32];
+                       __u8            volume_id[32];
+               } __attribute__((__packed__)) iso;
+               struct hs_header {
+                       __u8    foo[8];
+                       __u8    type;
+                       __u8    id[4];
+                       __u8    version;
+               } __attribute__((__packed__)) hs;
+       } __attribute__((__packed__)) *is;
+
+       is = (union iso_super_block *)
+            get_buffer(id, ISO_SUPERBLOCK_OFFSET, 0x200);
+       if (is == NULL)
+               return -1;
+
+       if (strncmp(is->iso.id, "CD001", 5) == 0) {
+               set_label_raw(id, is->iso.volume_id, 32);
+               set_label_string(id, is->iso.volume_id, 32);
+               goto found;
+       }
+       if (strncmp(is->hs.id, "CDROM", 5) == 0)
+               goto found;
+       return -1;
+
+found:
+       id->fs_type = ISO9660;
+       id->fs_name = "iso9660";
+
+       return 0;
+}
+
+#define MFT_RECORD_VOLUME                      3
+#define MFT_RECORD_ATTR_VOLUME_NAME            0x60u
+#define MFT_RECORD_ATTR_OBJECT_ID              0x40u
+#define MFT_RECORD_ATTR_END                    0xffffffffu
 static int probe_ntfs(struct volume_id *id)
 {
        struct ntfs_super_block {
-               char jump[3];
-               char oem_id[4];
-       } *ns;
-
-       ns = (struct ntfs_super_block *) id->buf;
+               __u8    jump[3];
+               __u8    oem_id[8];
+               struct bios_param_block {
+                       __u16   bytes_per_sector;
+                       __u8    sectors_per_cluster;
+                       __u16   reserved_sectors;
+                       __u8    fats;
+                       __u16   root_entries;
+                       __u16   sectors;
+                       __u8    media_type;             /* 0xf8 = hard disk */
+                       __u16   sectors_per_fat;
+                       __u16   sectors_per_track;
+                       __u16   heads;
+                       __u32   hidden_sectors;
+                       __u32   large_sectors;
+               } __attribute__((__packed__)) bpb;
+               __u8 unused[4];
+               __u64   number_of_sectors;
+               __u64   mft_cluster_location;
+               __u64   mft_mirror_cluster_location;
+               __s8    cluster_per_mft_record;
+       } __attribute__((__packed__)) *ns;
+
+       struct master_file_table_record {
+               __u8    magic[4];
+               __u16   usa_ofs;
+               __u16   usa_count;
+               __u64   lsn;
+               __u16   sequence_number;
+               __u16   link_count;
+               __u16   attrs_offset;
+               __u16   flags;
+               __u32   bytes_in_use;
+               __u32   bytes_allocated;
+       } __attribute__((__packed__)) *mftr;
+
+       struct file_attribute {
+               __u32   type;
+               __u32   len;
+               __u8    non_resident;
+               __u8    name_len;
+               __u16   name_offset;
+               __u16   flags;
+               __u16   instance;
+               __u32   value_len;
+               __u16   value_offset;
+       } __attribute__((__packed__)) *attr;
+
+       unsigned int    sector_size;
+       unsigned int    cluster_size;
+       unsigned long   mft_cluster;
+       unsigned long   mft_off;
+       unsigned int    mft_record_size;
+       unsigned int    attr_type;
+       unsigned int    attr_off;
+       unsigned int    attr_len;
+       unsigned int    val_off;
+       unsigned int    val_len;
+       const __u8 *buf;
+       const __u8 *val;
+
+       ns = (struct ntfs_super_block *) get_buffer(id, 0, 0x200);
+       if (ns == NULL)
+               return -1;
 
        if (strncmp(ns->oem_id, "NTFS", 4) != 0)
                return -1;
 
+       sector_size = le16_to_cpu(ns->bpb.bytes_per_sector);
+       cluster_size = ns->bpb.sectors_per_cluster * sector_size;
+       mft_cluster = le64_to_cpu(ns->mft_cluster_location);
+       mft_off = mft_cluster * cluster_size;
+
+       if (ns->cluster_per_mft_record < 0)
+               /* size = -log2(mft_record_size); normally 1024 Bytes */
+               mft_record_size = 1 << -ns->cluster_per_mft_record;
+       else
+               mft_record_size = ns->cluster_per_mft_record * cluster_size;
+
+       dbg("sectorsize  0x%x", sector_size);
+       dbg("clustersize 0x%x", cluster_size);
+       dbg("mftcluster  %li", mft_cluster);
+       dbg("mftoffset  0x%lx", mft_off);
+       dbg("cluster per mft_record  %i", ns->cluster_per_mft_record);
+       dbg("mft record size  %i", mft_record_size);
+
+       buf = get_buffer(id, mft_off + (MFT_RECORD_VOLUME * mft_record_size),
+                        mft_record_size);
+       if (buf == NULL)
+               goto found;
+
+       mftr = (struct master_file_table_record*) buf;
+
+       dbg("mftr->magic[0] = '%c' %03d, 0x%02x", mftr->magic[0], mftr->magic[0], mftr->magic[0]);
+       dbg("mftr->magic[1] = '%c' %03d, 0x%02x", mftr->magic[1], mftr->magic[1], mftr->magic[1]);
+       dbg("mftr->magic[2] = '%c' %03d, 0x%02x", mftr->magic[2], mftr->magic[2], mftr->magic[2]);
+       dbg("mftr->magic[3] = '%c' %03d, 0x%02x", mftr->magic[3], mftr->magic[3], mftr->magic[3]);
+       if (strncmp(mftr->magic, "FILE", 4) != 0)
+               goto found;
+
+       attr_off = le16_to_cpu(mftr->attrs_offset);
+       dbg("file $Volume's attributes are at offset %i", attr_off);
+
+       while (1) {
+               attr = (struct file_attribute*) &buf[attr_off];
+               attr_type = le32_to_cpu(attr->type);
+               attr_len = le16_to_cpu(attr->len);
+               val_off = le16_to_cpu(attr->value_offset);
+               val_len = le32_to_cpu(attr->value_len);
+
+               if (attr_type == MFT_RECORD_ATTR_END)
+                       break;
+
+               dbg("found attribute type 0x%x, len %i, at offset %i",
+                   attr_type, attr_len, attr_off);
+
+               if (attr_type == MFT_RECORD_ATTR_VOLUME_NAME) {
+                       dbg("found label, len %i", val_len);
+                       if (val_len > VOLUME_ID_LABEL_SIZE)
+                               val_len = VOLUME_ID_LABEL_SIZE;
+
+                       val = &((__u8 *) attr)[val_off];
+                       set_label_raw(id, val, val_len);
+                       set_label_unicode16(id, val, LE, val_len);
+               }
+
+               if (attr_type == MFT_RECORD_ATTR_OBJECT_ID) {
+                       dbg("found uuid");
+                       val = &((__u8 *) attr)[val_off];
+                       set_uuid(id, val, 16);
+               }
+
+               if (attr_len == 0)
+                       break;
+               attr_off += attr_len;
+               if (attr_off >= mft_record_size)
+                       break;
+       }
+
+found:
        id->fs_type = NTFS;
        id->fs_name = "ntfs";
 
        return 0;
 }
 
+#define LARGEST_PAGESIZE                       0x4000
 static int probe_swap(struct volume_id *id)
 {
-       int magic;
+       const __u8 *sig;
+       unsigned int page;
 
        /* huhh, the swap signature is on the end of the PAGE_SIZE */
-       for (magic = 0x1000; magic <= 0x4000; magic <<= 1) {
-                       if (strncmp(&(id->buf[magic -10]), "SWAP-SPACE", 10) == 0)
+       for (page = 0x1000; page <= LARGEST_PAGESIZE; page <<= 1) {
+                       sig = get_buffer(id, page-10, 10);
+                       if (sig == NULL)
+                               return -1;
+
+                       if (strncmp(sig, "SWAP-SPACE", 10) == 0)
                                goto found;
-                       if (strncmp(&(id->buf[magic -10]), "SWAPSPACE2", 10) == 0)
+                       if (strncmp(sig, "SWAPSPACE2", 10) == 0)
                                goto found;
        }
        return -1;
@@ -416,9 +884,6 @@ int volume_id_probe(struct volume_id *id, enum filesystem_type fs_type)
        if (id == NULL)
                return -EINVAL;
 
-       if (open_superblock(id) != 0)
-               return -EACCES;
-
        switch (fs_type) {
        case EXT3:
        case EXT2:
@@ -439,13 +904,22 @@ int volume_id_probe(struct volume_id *id, enum filesystem_type fs_type)
        case VFAT:
                rc = probe_vfat(id);
                break;
+       case UDF:
+               rc = probe_udf(id);
+               break;
+       case ISO9660:
+               rc = probe_iso9660(id);
+               break;
        case NTFS:
                rc = probe_ntfs(id);
                break;
        case SWAP:
                rc = probe_swap(id);
                break;
+       case ALL:
        default:
+               /* fill buffer with maximum */
+               get_buffer(id, 0, SB_BUFFER_SIZE);
                rc = probe_ext(id);
                if (rc == 0)
                        break;
@@ -462,6 +936,12 @@ int volume_id_probe(struct volume_id *id, enum filesystem_type fs_type)
                if (rc == 0)
                        break;
                rc = probe_vfat(id);
+               if (rc == 0)
+                       break;
+               rc = probe_udf(id);
+               if (rc == 0)
+                       break;
+               rc = probe_iso9660(id);
                if (rc == 0)
                        break;
                rc = probe_ntfs(id);
@@ -473,8 +953,10 @@ int volume_id_probe(struct volume_id *id, enum filesystem_type fs_type)
                rc = -1;
        }
 
+       /* If the filestystem in recognized, we free the allocated buffers,
+          otherwise they will stay in place for the possible next probe call */
        if (rc == 0)
-               close_superblock(id);
+               free_buffer(id);
 
        return rc;
 }
@@ -518,13 +1000,14 @@ struct volume_id *volume_id_open_node(const char *path)
 struct volume_id *volume_id_open_dev_t(dev_t devt)
 {
        struct volume_id *id;
-       char tmp_node[VOLUME_ID_PATH_MAX];
+       __u8 tmp_node[VOLUME_ID_PATH_MAX];
 
        snprintf(tmp_node, VOLUME_ID_PATH_MAX,
-                "/tmp/volume-%u-%u", major(devt), minor(devt));
+                "/tmp/volume-%u-%u-%u", getpid(), major(devt), minor(devt));
        tmp_node[VOLUME_ID_PATH_MAX] = '\0';
 
        /* create tempory node to open the block device */
+       unlink(tmp_node);
        if (mknod(tmp_node, (S_IFBLK | 0600), devt) != 0)
                return NULL;
 
@@ -544,7 +1027,7 @@ void volume_id_close(struct volume_id *id)
        if (id->fd_close != 0)
                close(id->fd);
 
-       close_superblock(id);
+       free_buffer(id);
 
        free(id);
 }