From fa59c178f03c119aa6efcc36df05280a6e381ae3 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Sun, 20 Sep 2015 17:43:56 -0700 Subject: [PATCH] Drop dependency on minimal as we port to Impactor. --- .gitmodules | 3 --- ldid.cpp | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++-- minimal | 1 - 3 files changed, 52 insertions(+), 6 deletions(-) delete mode 160000 minimal diff --git a/.gitmodules b/.gitmodules index f360e2a..c00b2da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "minimal"] - path = minimal - url = git://git.saurik.com/minimal.git [submodule "libplist"] path = libplist url = http://git.libimobiledevice.org/libplist.git diff --git a/ldid.cpp b/ldid.cpp index 72a12fb..c712039 100644 --- a/ldid.cpp +++ b/ldid.cpp @@ -19,8 +19,8 @@ **/ /* }}} */ -#include "minimal/stdlib.h" - +#include +#include #include #include #include @@ -29,7 +29,10 @@ #include #include +#include #include +#include +#include #include #include @@ -38,6 +41,53 @@ #include +#define _assert___(line) \ + #line +#define _assert__(line) \ + _assert___(line) +#define _assert_(e) \ + throw __FILE__ "(" _assert__(__LINE__) "): _assert(" e ")" + +#define _assert(expr) \ + do if (!(expr)) { \ + fprintf(stderr, "%s(%u): _assert(%s); errno=%u\n", __FILE__, __LINE__, #expr, errno); \ + _assert_(#expr); \ + } while (false) + +#define _syscall(expr) ({ \ + __typeof__(expr) _value; \ + do if ((long) (_value = (expr)) != -1) \ + break; \ + else switch (errno) { \ + case EINTR: \ + continue; \ + default: \ + _assert(false); \ + } while (true); \ + _value; \ +}) + +#define _trace() \ + fprintf(stderr, "_trace(%s:%u): %s\n", __FILE__, __LINE__, __FUNCTION__) + +#define _not(type) \ + ((type) ~ (type) 0) + +#define _packed \ + __attribute__((packed)) + +template +struct Iterator_ { + typedef typename Type_::const_iterator Result; +}; + +#define _foreach(item, list) \ + for (bool _stop(true); _stop; ) \ + for (const __typeof__(list) &_list = (list); _stop; _stop = false) \ + for (Iterator_<__typeof__(list)>::Result _item = _list.begin(); _item != _list.end(); ++_item) \ + for (bool _suck(true); _suck; _suck = false) \ + for (const __typeof__(*_item) &item = *_item; _suck; _suck = false) + struct fat_header { uint32_t magic; uint32_t nfat_arch; diff --git a/minimal b/minimal deleted file mode 160000 index e327d27..0000000 --- a/minimal +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e327d27b214753a35b03a89886c82311c96353fa -- 2.50.0