search for: find_by_guid

...re."); goto bail; } - } else if (!strncmp(opt.drivename, "guid", 4)) { + } else if (!strncmp(opt.drivename, "guid", 4) || + !strncmp(opt.drivename, "uuid", 4)) { if (str_to_guid(opt.drivename + 5, &gpt_guid)) goto bail; if (find_by_guid(&gpt_guid, &iter) < 0) { diff --git a/com32/chain/options.c b/com32/chain/options.c index e9c4a62..5531556 100644 --- a/com32/chain/options.c +++ b/com32/chain/options.c @@ -394,6 +394,8 @@ int opt_parse_args(int argc, char *argv[]) || !strncmp(argv[i], "mbr=", 4) |...

...uid using chain.c32 from both 4.03 and latest 4.04 pre12 doesn't work as expected (unable to find requested GPT disk/partition). The entered guid is correct according to gdisk and chain.c32 debug information but still chain.c32 claims it can't find the drive. The bug is located in function find_by_guid, line 991. It is is_me = !memcmp(&header->disk_guid, &gpt_guid, sizeof(*gpt_guid)); but should be is_me = !memcmp(&header->disk_guid, gpt_guid, sizeof(*gpt_guid)); as memcmp takes two void pointers and gpt_guid is already a pointer to struct guid. I've recompiled chain.c32 wi...

...{ + /* Check for a matching MBR disk */ + if (iter->type == typedos && iter->dos.disk_sig == mbr_sig) goto ok; - } + pi_del(&iter); } drive = -1; ok: - *_boot_part = boot_part; + *_boot_part = iter; return drive; } @@ -95,29 +91,26 @@ ok: static int find_by_guid(const struct guid *gpt_guid, struct part_iter **_boot_part) { - struct part_iter *boot_part = NULL; + struct part_iter *iter = NULL; struct disk_info diskinfo; int drive; for (drive = 0x80; drive < 0x80 + fixed_cnt; drive++) { if (disk_get_params(drive, &diskinf...

...terators self-destroy after finishing. They can be explicitly allocated through pi_new() (although this was exported mostly thinking about com32/lib) and removed through pi_del(); pi_next() moves iterator further. Partiter compiles cleanly with -Wextra -Wconversion -pedantic 2h) chain.c changes - find_by_guid() had small bug (took address of address of struct holding disk guid to compare) - find_by_{guid,label,disk} greately simplified due to extra data available from iterators - in main() - lba_fs takes clear precedence over regular partition number - changes necessary to include new iterator code...

This is a bit updated set of chain.c32 changes that simplifies a few things (and in partiter part), fixes few minor issues and adds a few new features. Details are in the following commits, below is the summary and pull details at the end. Shao - any chance to peek over them ? Most of those are relatively simple changes and well tested, though of course something might have slipped my attention.

This small set fixes few bugs, improves gpt handling (under buggy conditions) and implements strict flag with more fine grained control which should fix issues with sanity checks against disk sizes. If this set is allright I'd want to do what I mentioned in older discussion with Ady - backport missing patches from 6.x to 5.x and 4.x so all versions have up to date chain version. Michal