search for: 13dec84

...>status < 0) goto bail; /* last update */ @@ -663,7 +663,7 @@ int manglepe_fixchs(struct part_iter *miter) } } - if (pi_errored(iter)) + if (iter->status < 0) goto bail; /* last update */ diff --git a/com32/chain/partiter.h b/com32/chain/partiter.h index 13dec84..d01a650 100644 --- a/com32/chain/partiter.h +++ b/com32/chain/partiter.h @@ -42,7 +42,7 @@ /* status */ -enum {PI_OK, PI_DONE, PI_INSANE, PI_ERRLOAD}; +enum {PI_ERRLOAD = -31, PI_INSANE, PI_OK = 0, PI_DONE}; /* flags */ @@ -103,11 +103,6 @@ extern const struct itertype * const typeraw;...

...*/ - ret = pi_dos_ctor(iter, di, flags, mbr); - } -bail: - if (ret < 0) - free(iter); - free(mbr); - free(gpth); - free(gptl); - - return iter; -} - -/* vim: set ts=8 sts=4 sw=4 noet: */ diff --git a/com32/chain/partiter.h b/com32/chain/partiter.h deleted file mode 100644 index 13dec84..0000000 --- a/com32/chain/partiter.h +++ /dev/null @@ -1,124 +0,0 @@ -/* ----------------------------------------------------------------------- * - * - * Copyright 2003-2009 H. Peter Anvin - All Rights Reserved - * Copyright 2009-2010 Intel Corporation; author: H. Peter Anvin - * Copyright...

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

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.