Changeset c3cbbb2 in mainline for uspace/lib/gpt/libgpt.c

Timestamp:

2013-07-26T21:48:22Z (12 years ago)

Author:

Dominik Taborsky (AT DOT) <brembyseznamcz>

Branches:

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

Children:

903a897, dc76f4a

Parents:

9f4650c

Message:

more libgpt fixes

File:

• uspace/lib/gpt/libgpt.c (modified) (11 diffs)

uspace/lib/gpt/libgpt.c

@@ -230 +230 @@
         int rc;
         unsigned int i;
-        uint32_t fill = uint32_t_le2host(label->gpt->header->fillries);
+        uint32_t fillries = uint32_t_le2host(label->gpt->header->fillries);
         uint32_t ent_size = uint32_t_le2host(label->gpt->header->entry_size);
         uint64_t ent_lba = uint64_t_le2host(label->gpt->header->entry_lba);
         
         if (label->parts == NULL) {
-                label->parts = alloc_part_array(fill);
+                label->parts = alloc_part_array(fillries);
                 if (label->parts == NULL) {
                         return ENOMEM;
@@ -263 +263 @@
          * will always read just sizeof(gpt_entry_t) bytes - hopefully they
          * don't break backward compatibility) */
-        for (i = 0; i < fill; ++i) {
+        for (i = 0; i < fillries; ++i) {
                 //FIXME: this does bypass cache...
                 rc = block_read_bytes_direct(label->device, pos, sizeof(gpt_entry_t), label->parts->part_array + i);
@@ -280 +280 @@
          */
         uint32_t crc = compute_crc32((uint8_t *) label->parts->part_array, 
-                           label->parts->fill * sizeof(gpt_entry_t));
+                           fillries * sizeof(gpt_entry_t));
 
         if(uint32_t_le2host(label->gpt->header->pe_array_crc32) != crc)
@@ -312 +312 @@
         size_t b_size;
         uint32_t e_size = uint32_t_le2host(label->gpt->header->entry_size);
-        size_t fill = label->parts->fill > GPT_MIN_PART_NUM ? label->parts->fill : GPT_MIN_PART_NUM;
-        
-        label->gpt->header->pe_array_crc32 = compute_crc32(
+        size_t fillries = label->parts->fill > GPT_MIN_PART_NUM ? label->parts->fill : GPT_MIN_PART_NUM;
+        
+        label->gpt->header->fillries = host2uint32_t_le(fillries);
+        label->gpt->header->pe_array_crc32 = host2uint32_t_le(compute_crc32(
                                        (uint8_t *) label->parts->part_array,
-                                       fill * e_size);
+                                       fillries * e_size));
         
         /* comm_size of 4096 is ignored */
@@ -339 +340 @@
         /* Write to main GPT partition array location */
         rc = block_write_direct(dev_handle, uint64_t_le2host(label->gpt->header->entry_lba),
-                        nearest_larger_int((uint64_t_le2host(label->gpt->header->entry_size) * label->parts->fill) / b_size),
-                        label->parts->part_array);
+                 nearest_larger_int((uint64_t_le2host(label->gpt->header->entry_size) * fillries) / b_size),
+                 label->parts->part_array);
         if (rc != EOK)
                 goto fail;
@@ -385 +386 @@
 {
         gpt_part_t *p;
+        
         
         /* Find the first empty entry */
@@ -482 +484 @@
         memset(label->parts->part_array + idx, 0, sizeof(gpt_entry_t));
         
-        label->parts->fill -= 1;
+        label->parts->fill = idx;
         
         /* FIXME! HOPEFULLY FIXED.
@@ -633 +635 @@
 }
 
+void gpt_set_random_uuid(uint8_t * uuid)
+{
+        srandom((unsigned int) uuid);
+        
+        unsigned int i;
+        for (i = 0; i < 16/sizeof(long int); ++i)
+                ((long int *)uuid)[i] = random();
+        
+}
+
 // Internal functions follow //
 
@@ -683 +695 @@
         }
 
-        res->fill = num;
-        res->arr_size = size;
+        res->fill = 0;
+        res->arr_size = num;
 
         return res;
@@ -691 +703 @@
 static int extend_part_array(gpt_partitions_t * p)
 {
-        unsigned int nsize = p->arr_size * 2;
+        size_t nsize = p->arr_size * 2;
         gpt_entry_t * tmp = malloc(nsize * sizeof(gpt_entry_t));
         if(tmp == NULL) {
@@ -697 +709 @@
                 return -1;
         }
-
-        memcpy(tmp, p->part_array, p->fill);
+        
+        memcpy(tmp, p->part_array, p->fill * sizeof(gpt_entry_t));
         free(p->part_array);
         p->part_array = tmp;