Index: uspace/lib/gpt/global.c =================================================================== --- uspace/lib/gpt/global.c (revision 493b881e774a9aedae2d1e72627aeddd2ac91f96) +++ uspace/lib/gpt/global.c (revision 0435fe4157cc54af9fc49c0c8375e2aff9f90ca9) @@ -41,66 +41,67 @@ const struct partition_type gpt_ptypes[] = { - { "Unused entry", "00000000" "0000" "0000" "0000" "000000000000" }, - { "MBR partition scheme", "024DEE41" "33E7" "11D3" "9D69" "0008C781F39F" }, - { "EFI System", "C12A7328" "F81F" "11D2" "BA4B" "00A0C93EC93B" }, - { "BIOS Boot", "21686148" "6449" "6E6F" "744E" "656564454649" }, - { "Windows Reserved", "E3C9E316" "0B5C" "4DB8" "817D" "F92DF00215AE" }, - { "Windows Basic data", "EBD0A0A2" "B9E5" "4433" "87C0" "68B6B72699C7" }, - { "Windows LDM metadata", "5808C8AA" "7E8F" "42E0" "85D2" "E1E90434CFB3" }, - { "Windows LDM data", "AF9B60A0" "1431" "4F62" "BC68" "3311714A69AD" }, - { "Windows Recovery Environment", "DE94BBA4" "06D1" "4D40" "A16A" "BFD50179D6AC" }, - { "Windows IBM GPFS", "37AFFC90" "EF7D" "4E96" "91C3" "2D7AE055B174" }, - { "Windows Cluster metadata", "DB97DBA9" "0840" "4BAE" "97F0" "FFB9A327C7E1" }, - { "HP-UX Data", "75894C1E" "3AEB" "11D3" "B7C1" "7B03A0000000" }, - { "HP-UX Service", "E2A1E728" "32E3" "11D6" "A682" "7B03A0000000" }, - { "Linux filesystem data", "EBD0A0A2" "B9E5" "4433" "87C0" "68B6B72699C7" }, - { "Linux filesystem data", "0FC63DAF" "8483" "4772" "8E79" "3D69D8477DE4" }, - { "Linux RAID", "A19D880F" "05FC" "4D3B" "A006" "743F0F84911E" }, - { "Linux Swap", "0657FD6D" "A4AB" "43C4" "84E5" "0933C84B4F4F" }, - { "Linux LVM", "E6D6D379" "F507" "44C2" "A23C" "238F2A3DF928" }, - { "Linux Reserved", "8DA63339" "0007" "60C0" "C436" "083AC8230908" }, - { "FreeBSD Boot", "83BD6B9D" "7F41" "11DC" "BE0B" "001560B84F0F" }, - { "FreeBSD Data", "516E7CB4" "6ECF" "11D6" "8FF8" "00022D09712B" }, - { "FreeBSD Swap", "516E7CB5" "6ECF" "11D6" "8FF8" "00022D09712B" }, - { "FreeBSD UFS", "516E7CB6" "6ECF" "11D6" "8FF8" "00022D09712B" }, - { "FreeBSD Vinum VM", "516E7CB8" "6ECF" "11D6" "8FF8" "00022D09712B" }, - { "FreeBSD ZFS", "516E7CBA" "6ECF" "11D6" "8FF8" "00022D09712B" }, - { "Mac OS X HFS+", "48465300" "0000" "11AA" "AA11" "00306543ECAC" }, - { "Mac OS X UFS", "55465300" "0000" "11AA" "AA11" "00306543ECAC" }, - { "Mac OS X ZFS", "6A898CC3" "1DD2" "11B2" "99A6" "080020736631" }, - { "Mac OS X RAID", "52414944" "0000" "11AA" "AA11" "00306543ECAC" }, - { "Mac OS X RAID, offline", "52414944" "5F4F" "11AA" "AA11" "00306543ECAC" }, - { "Mac OS X Boot", "426F6F74" "0000" "11AA" "AA11" "00306543ECAC" }, - { "Mac OS X Label", "4C616265" "6C00" "11AA" "AA11" "00306543ECAC" }, - { "Mac OS X TV Recovery", "5265636F" "7665" "11AA" "AA11" "00306543ECAC" }, - { "Mac OS X Core Storage", "53746F72" "6167" "11AA" "AA11" "00306543ECAC" }, - { "Solaris Boot", "6A82CB45" "1DD2" "11B2" "99A6" "080020736631" }, - { "Solaris Root", "6A85CF4D" "1DD2" "11B2" "99A6" "080020736631" }, - { "Solaris Swap", "6A87C46F" "1DD2" "11B2" "99A6" "080020736631" }, - { "Solaris Backup", "6A8B642B" "1DD2" "11B2" "99A6" "080020736631" }, - { "Solaris /usr", "6A898CC3" "1DD2" "11B2" "99A6" "080020736631" }, - { "Solaris /var", "6A8EF2E9" "1DD2" "11B2" "99A6" "080020736631" }, - { "Solaris /home", "6A90BA39" "1DD2" "11B2" "99A6" "080020736631" }, - { "Solaris Alternate sector", "6A9283A5" "1DD2" "11B2" "99A6" "080020736631" }, - { "Solaris Reserved", "6A945A3B" "1DD2" "11B2" "99A6" "080020736631" }, - { "Solaris Reserved", "6A9630D1" "1DD2" "11B2" "99A6" "080020736631" }, - { "Solaris Reserved", "6A980767" "1DD2" "11B2" "99A6" "080020736631" }, - { "Solaris Reserved", "6A96237F" "1DD2" "11B2" "99A6" "080020736631" }, - { "Solaris Reserved", "6A8D2AC7" "1DD2" "11B2" "99A6" "080020736631" }, - { "NetBSD Swap", "49F48D32" "B10E" "11DC" "B99B" "0019D1879648" }, - { "NetBSD FFS", "49F48D5A" "B10E" "11DC" "B99B" "0019D1879648" }, - { "NetBSD LFS", "49F48D82" "B10E" "11DC" "B99B" "0019D1879648" }, - { "NetBSD RAID", "49F48DAA" "B10E" "11DC" "B99B" "0019D1879648" }, - { "NetBSD Concatenated", "2DB519C4" "B10F" "11DC" "B99B" "0019D1879648" }, - { "NetBSD Encrypted", "2DB519EC" "B10F" "11DC" "B99B" "0019D1879648" }, - { "ChromeOS ChromeOS kernel", "FE3A2A5D" "4F32" "41A7" "B725" "ACCC3285A309" }, - { "ChromeOS rootfs", "3CB8E202" "3B7E" "47DD" "8A3C" "7FF2A13CFCEC" }, - { "ChromeOS future use", "2E0A753D" "9E48" "43B0" "8337" "B15192CB1B5E" }, - { "MidnightBSD Boot", "85D5E45E" "237C" "11E1" "B4B3" "E89A8F7FC3A7" }, - { "MidnightBSD Data", "85D5E45A" "237C" "11E1" "B4B3" "E89A8F7FC3A7" }, - { "MidnightBSD Swap", "85D5E45B" "237C" "11E1" "B4B3" "E89A8F7FC3A7" }, - { "MidnightBSD UFS", "0394Ef8B" "237E" "11E1" "B4B3" "E89A8F7FC3A7" }, - { "MidnightBSD Vinum VM", "85D5E45C" "237C" "11E1" "B4B3" "E89A8F7FC3A7" }, - { "MidnightBSD ZFS", "85D5E45D" "237C" "11E1" "B4B3" "E89A8F7FC3A7" }, + { "Unused entry", "00000000" "0000" "0000" "0000000000000000" }, /* 0 */ + { "HelenOS System", "656C6548" "4F6E" "5320" "53797374656D0000" }, /* 1 It says "HelenOS System\0\0" */ + { "MBR partition scheme", "024DEE41" "33E7" "11D3" "9D690008C781F39F" }, + { "EFI System", "C12A7328" "F81F" "11D2" "BA4B00A0C93EC93B" }, + { "BIOS Boot", "21686148" "6449" "6E6F" "744E656564454649" }, + { "Windows Reserved", "E3C9E316" "0B5C" "4DB8" "817DF92DF00215AE" }, + { "Windows Basic data", "EBD0A0A2" "B9E5" "4433" "87C068B6B72699C7" }, + { "Windows LDM metadata", "5808C8AA" "7E8F" "42E0" "85D2E1E90434CFB3" }, + { "Windows LDM data", "AF9B60A0" "1431" "4F62" "BC683311714A69AD" }, + { "Windows Recovery Environment", "DE94BBA4" "06D1" "4D40" "A16ABFD50179D6AC" }, + { "Windows IBM GPFS", "37AFFC90" "EF7D" "4E96" "91C32D7AE055B174" }, /* 10 */ + { "Windows Cluster metadata", "DB97DBA9" "0840" "4BAE" "97F0FFB9A327C7E1" }, + { "HP-UX Data", "75894C1E" "3AEB" "11D3" "B7C17B03A0000000" }, + { "HP-UX Service", "E2A1E728" "32E3" "11D6" "A6827B03A0000000" }, + { "Linux filesystem data", "EBD0A0A2" "B9E5" "4433" "87C068B6B72699C7" }, + { "Linux filesystem data", "0FC63DAF" "8483" "4772" "8E793D69D8477DE4" }, + { "Linux RAID", "A19D880F" "05FC" "4D3B" "A006743F0F84911E" }, + { "Linux Swap", "0657FD6D" "A4AB" "43C4" "84E50933C84B4F4F" }, + { "Linux LVM", "E6D6D379" "F507" "44C2" "A23C238F2A3DF928" }, + { "Linux Reserved", "8DA63339" "0007" "60C0" "C436083AC8230908" }, + { "FreeBSD Boot", "83BD6B9D" "7F41" "11DC" "BE0B001560B84F0F" }, /* 20 */ + { "FreeBSD Data", "516E7CB4" "6ECF" "11D6" "8FF800022D09712B" }, + { "FreeBSD Swap", "516E7CB5" "6ECF" "11D6" "8FF800022D09712B" }, + { "FreeBSD UFS", "516E7CB6" "6ECF" "11D6" "8FF800022D09712B" }, + { "FreeBSD Vinum VM", "516E7CB8" "6ECF" "11D6" "8FF800022D09712B" }, + { "FreeBSD ZFS", "516E7CBA" "6ECF" "11D6" "8FF800022D09712B" }, + { "Mac OS X HFS+", "48465300" "0000" "11AA" "AA1100306543ECAC" }, + { "Mac OS X UFS", "55465300" "0000" "11AA" "AA1100306543ECAC" }, + { "Mac OS X ZFS", "6A898CC3" "1DD2" "11B2" "99A6080020736631" }, + { "Mac OS X RAID", "52414944" "0000" "11AA" "AA1100306543ECAC" }, + { "Mac OS X RAID, offline", "52414944" "5F4F" "11AA" "AA1100306543ECAC" }, /* 30 */ + { "Mac OS X Boot", "426F6F74" "0000" "11AA" "AA1100306543ECAC" }, + { "Mac OS X Label", "4C616265" "6C00" "11AA" "AA1100306543ECAC" }, + { "Mac OS X TV Recovery", "5265636F" "7665" "11AA" "AA1100306543ECAC" }, + { "Mac OS X Core Storage", "53746F72" "6167" "11AA" "AA1100306543ECAC" }, + { "Solaris Boot", "6A82CB45" "1DD2" "11B2" "99A6080020736631" }, + { "Solaris Root", "6A85CF4D" "1DD2" "11B2" "99A6080020736631" }, + { "Solaris Swap", "6A87C46F" "1DD2" "11B2" "99A6080020736631" }, + { "Solaris Backup", "6A8B642B" "1DD2" "11B2" "99A6080020736631" }, + { "Solaris /usr", "6A898CC3" "1DD2" "11B2" "99A6080020736631" }, + { "Solaris /var", "6A8EF2E9" "1DD2" "11B2" "99A6080020736631" }, /* 40 */ + { "Solaris /home", "6A90BA39" "1DD2" "11B2" "99A6080020736631" }, + { "Solaris Alternate sector", "6A9283A5" "1DD2" "11B2" "99A6080020736631" }, + { "Solaris Reserved", "6A945A3B" "1DD2" "11B2" "99A6080020736631" }, + { "Solaris Reserved", "6A9630D1" "1DD2" "11B2" "99A6080020736631" }, + { "Solaris Reserved", "6A980767" "1DD2" "11B2" "99A6080020736631" }, + { "Solaris Reserved", "6A96237F" "1DD2" "11B2" "99A6080020736631" }, + { "Solaris Reserved", "6A8D2AC7" "1DD2" "11B2" "99A6080020736631" }, + { "NetBSD Swap", "49F48D32" "B10E" "11DC" "B99B0019D1879648" }, + { "NetBSD FFS", "49F48D5A" "B10E" "11DC" "B99B0019D1879648" }, + { "NetBSD LFS", "49F48D82" "B10E" "11DC" "B99B0019D1879648" }, /* 50 */ + { "NetBSD RAID", "49F48DAA" "B10E" "11DC" "B99B0019D1879648" }, + { "NetBSD Concatenated", "2DB519C4" "B10F" "11DC" "B99B0019D1879648" }, + { "NetBSD Encrypted", "2DB519EC" "B10F" "11DC" "B99B0019D1879648" }, + { "ChromeOS ChromeOS kernel", "FE3A2A5D" "4F32" "41A7" "B725ACCC3285A309" }, + { "ChromeOS rootfs", "3CB8E202" "3B7E" "47DD" "8A3C7FF2A13CFCEC" }, + { "ChromeOS future use", "2E0A753D" "9E48" "43B0" "8337B15192CB1B5E" }, + { "MidnightBSD Boot", "85D5E45E" "237C" "11E1" "B4B3E89A8F7FC3A7" }, + { "MidnightBSD Data", "85D5E45A" "237C" "11E1" "B4B3E89A8F7FC3A7" }, + { "MidnightBSD Swap", "85D5E45B" "237C" "11E1" "B4B3E89A8F7FC3A7" }, + { "MidnightBSD UFS", "0394Ef8B" "237E" "11E1" "B4B3E89A8F7FC3A7" }, /* 60 */ + { "MidnightBSD Vinum VM", "85D5E45C" "237C" "11E1" "B4B3E89A8F7FC3A7" }, + { "MidnightBSD ZFS", "85D5E45D" "237C" "11E1" "B4B3E89A8F7FC3A7" }, { "Uknown", NULL} /* keep this as the last one! gpt_get_part_type depends on it! */ }; Index: uspace/lib/gpt/libgpt.c =================================================================== --- uspace/lib/gpt/libgpt.c (revision 493b881e774a9aedae2d1e72627aeddd2ac91f96) +++ uspace/lib/gpt/libgpt.c (revision 0435fe4157cc54af9fc49c0c8375e2aff9f90ca9) @@ -48,4 +48,6 @@ #include #include +#include + #include "libgpt.h" @@ -55,5 +57,4 @@ static int extend_part_array(gpt_partitions_t *); static int reduce_part_array(gpt_partitions_t *); -//static long long nearest_larger_int(double); static uint8_t get_byte(const char *); static bool check_overlap(gpt_part_t *, gpt_part_t *); @@ -313,5 +314,5 @@ fillries * ent_size); - if(uint32_t_le2host(label->gpt->header->pe_array_crc32) != crc) + if (uint32_t_le2host(label->gpt->header->pe_array_crc32) != crc) { rc = EBADCHECKSUM; @@ -369,5 +370,5 @@ /* Perform checks */ - gpt_part_foreach(label, p) { + gpt_part_foreach (label, p) { if (gpt_get_part_type(p) == GPT_PTE_UNUSED) continue; @@ -375,9 +376,10 @@ if (!check_encaps(p, n_blocks, gpt_space)) { rc = ERANGE; - printf("encaps with: %llu, %llu, %llu\n", n_blocks, gpt_space, gpt_get_end_lba(p)); + printf("encaps with: %" PRIuOFF64 ", %" PRIu64 ", %" PRIu64 "\n", + n_blocks, gpt_space, gpt_get_end_lba(p)); goto fail; } - gpt_part_foreach(label, q) { + gpt_part_foreach (label, q) { if (p == q) continue; @@ -385,5 +387,6 @@ if (gpt_get_part_type(p) != GPT_PTE_UNUSED) { if (check_overlap(p, q)) { - printf("overlap with: %llu, %llu\n", gpt_get_start_lba(p), gpt_get_start_lba(q)); + printf("overlap with: %" PRIu64 ", %" PRIu64 "\n", + gpt_get_start_lba(p), gpt_get_start_lba(q)); rc = ERANGE; goto fail; @@ -709,5 +712,5 @@ void gpt_set_random_uuid(uint8_t * uuid) { - srandom((unsigned int) uuid); + srandom((unsigned int) (size_t) uuid); unsigned int i; @@ -786,5 +789,5 @@ size_t nsize = p->arr_size * 2; gpt_entry_t * tmp = malloc(nsize * sizeof(gpt_entry_t)); - if(tmp == NULL) { + if (tmp == NULL) { errno = ENOMEM; return -1; @@ -801,9 +804,9 @@ static int reduce_part_array(gpt_partitions_t * p) { - if(p->arr_size > GPT_MIN_PART_NUM) { + if (p->arr_size > GPT_MIN_PART_NUM) { unsigned int nsize = p->arr_size / 2; nsize = nsize > GPT_MIN_PART_NUM ? nsize : GPT_MIN_PART_NUM; gpt_entry_t * tmp = malloc(nsize * sizeof(gpt_entry_t)); - if(tmp == NULL) + if (tmp == NULL) return ENOMEM; @@ -816,13 +819,4 @@ return 0; } - -/*static long long nearest_larger_int(double a) -{ - if ((long long) a == a) { - return (long long) a; - } - - return ((long long) a) + 1; -}*/ /* Parse a byte from a string in hexadecimal Index: uspace/lib/mbr/libmbr.c =================================================================== --- uspace/lib/mbr/libmbr.c (revision 493b881e774a9aedae2d1e72627aeddd2ac91f96) +++ uspace/lib/mbr/libmbr.c (revision 0435fe4157cc54af9fc49c0c8375e2aff9f90ca9) @@ -170,5 +170,4 @@ mbr_part_t *p; mbr_part_t *ext = NULL; - //mbr_partitions_t *parts; if (label->parts != NULL) @@ -598,5 +597,5 @@ } -// Internal functions follow // +/* Internal functions follow */ static br_block_t *alloc_br() @@ -732,5 +731,4 @@ { if (src != NULL) { - //trgt->status = mbr_get_flag(src, ST_BOOT) ? B_ACTIVE : B_INACTIVE; trgt->status = (uint8_t) (src->status & 0xFF); /* ingoring CHS */ @@ -741,9 +739,9 @@ trgt->last_chs[1] = 0xFF; trgt->last_chs[2] = 0xFF; - if (ebr) { // encoding reference to EBR + if (ebr) { /* encoding reference to EBR */ trgt->ptype = PT_EXTENDED_LBA; trgt->first_lba = host2uint32_t_le(src->ebr_addr - base); trgt->length = host2uint32_t_le(src->length + src->start_addr - src->ebr_addr); - } else { // encoding reference to partition + } else { /* encoding reference to partition */ trgt->ptype = src->type; trgt->first_lba = host2uint32_t_le(src->start_addr - base); @@ -850,5 +848,5 @@ bool first_logical = true; mbr_part_t *iter; - mbr_part_foreach(label, iter) { + mbr_part_foreach (label, iter) { if (mbr_get_flag(iter, ST_LOGIC)) { if (check_overlap(p, iter))