Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/util-linux/volume_id/hfs.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/util-linux/volume_id/hfs.c (modified) (4 diffs)

branches/3.2/mindi-busybox/util-linux/volume_id/hfs.c

@@ -132 +132 @@
 #define HFSPLUS_POR_CNID        1
 
+static void FAST_FUNC hfs_set_uuid(struct volume_id *id, const uint8_t *hfs_id)
+{
+#define hfs_id_len 8
+    md5_ctx_t md5c;
+    uint8_t uuid[16];
+    unsigned i;
+
+    for (i = 0; i < hfs_id_len; i++)
+        if (hfs_id[i] != 0)
+            goto do_md5;
+    return;
+ do_md5:
+    md5_begin(&md5c);
+    md5_hash(&md5c, "\263\342\17\71\362\222\21\326\227\244\0\60\145\103\354\254", 16);
+    md5_hash(&md5c, hfs_id, hfs_id_len);
+    md5_end(&md5c, uuid);
+    uuid[6] = 0x30 | (uuid[6] & 0x0f);
+    uuid[8] = 0x80 | (uuid[8] & 0x3f);
+    volume_id_set_uuid(id, uuid, UUID_DCE);
+}
+
 int FAST_FUNC volume_id_probe_hfs_hfsplus(struct volume_id *id /*,uint64_t off*/)
 {
@@ -194 +215 @@
     }
 
-    volume_id_set_uuid(id, hfs->finder_info.id, UUID_HFS);
+    hfs_set_uuid(id, hfs->finder_info.id);
 //  volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
-//  id->type = "hfs";
+    IF_FEATURE_BLKID_TYPE(id->type = "hfs";)
 
     return 0;
@@ -208 +229 @@
 
  hfsplus:
-    volume_id_set_uuid(id, hfsplus->finder_info.id, UUID_HFS);
+    hfs_set_uuid(id, hfsplus->finder_info.id);
 
     blocksize = be32_to_cpu(hfsplus->blocksize);
@@ -287 +308 @@
  found:
 //  volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
-//  id->type = "hfsplus";
+    IF_FEATURE_BLKID_TYPE(id->type = "hfsplus";)
 
     return 0;