Changeset 87337dc5 in mainline for uspace/app/mkfat/mkfat.c

Timestamp:

2018-07-09T15:00:24Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d054ad3

Parents:

914c693

git-author:

Jiri Svoboda <jiri@…> (2018-07-08 19:58:56)

git-committer:

Jiri Svoboda <jiri@…> (2018-07-09 15:00:24)

Message:

Random number generator interface. FAT and exFAT should be created with random volume serial numbers.

File:

• uspace/app/mkfat/mkfat.c (modified) (9 diffs)

uspace/app/mkfat/mkfat.c

@@ -48 +48 @@
 #include <inttypes.h>
 #include <errno.h>
+#include <rndgen.h>
 #include <str.h>
 #include "fat.h"
@@ -89 +90 @@
 static errno_t fat_params_compute(struct fat_cfg *cfg);
 static errno_t fat_blocks_write(struct fat_cfg const *cfg, service_id_t service_id);
-static void fat_bootsec_create(struct fat_cfg const *cfg, struct fat_bs *bs);
+static errno_t fat_bootsec_create(struct fat_cfg const *cfg, struct fat_bs *bs);
 
 int main(int argc, char **argv)
@@ -376 +377 @@
         fat_dentry_t *de;
 
-        fat_bootsec_create(cfg, &bs);
+        rc = fat_bootsec_create(cfg, &bs);
+        if (rc != EOK)
+                return rc;
 
         rc = block_write_direct(service_id, BS_BLOCK, 1, &bs);
@@ -442 +445 @@
                         (void) fat_label_encode(&de->name, cfg->label);
                         de->attr = FAT_ATTR_VOLLABEL;
-                        de->mtime = 0x1234;
-                        de->mdate = 0x1234;
+                        de->mtime = 0x1234; // XXX Proper time
+                        de->mdate = 0x1234; // XXX Proper date
                 } else if (idx == 1) {
                         /* Clear volume label entry */
@@ -462 +465 @@
 
 /** Construct boot sector with the given parameters. */
-static void fat_bootsec_create(struct fat_cfg const *cfg, struct fat_bs *bs)
+static errno_t fat_bootsec_create(struct fat_cfg const *cfg, struct fat_bs *bs)
 {
         const char *bs_label;
+        rndgen_t *rndgen;
+        uint32_t vsn;
+        errno_t rc;
+
+        /* Generate a volume serial number */
+        rc = rndgen_create(&rndgen);
+        if (rc != EOK)
+                return rc;
+
+        rc = rndgen_uint32(rndgen, &vsn);
+        if (rc != EOK) {
+                rndgen_destroy(rndgen);
+                return rc;
+        }
+
+        rndgen_destroy(rndgen);
 
         /*
@@ -503 +522 @@
         bs->hidden_sec = host2uint32_t_le(0);
 
+
         if (cfg->fat_type == FAT32) {
                 bs->sec_per_fat = 0;
@@ -509 +529 @@
                 bs->fat32.pdn = 0x80;
                 bs->fat32.ebs = 0x29;
-                bs->fat32.id = host2uint32_t_be(0x12345678);
+                bs->fat32.id = host2uint32_t_be(vsn);
                 bs->fat32.root_cluster = 2;
 
@@ -518 +538 @@
                 bs->pdn = 0x80;
                 bs->ebs = 0x29;
-                bs->id = host2uint32_t_be(0x12345678);
+                bs->id = host2uint32_t_be(vsn);
 
                 (void) fat_label_encode(&bs->label, bs_label);
@@ -526 +546 @@
                         memcpy(bs->type, "FAT16   ", 8);
         }
+
+        return EOK;
 }