From 9933273c5b7b6e0471d9195e8c2facb795b795ae Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Fri, 3 Jul 2015 15:17:25 -0500 Subject: [PATCH] Probe for fork() instead of relying on a distro-specific #define. --- lib/portability.c | 15 ++++++++++++++- scripts/genconfig.sh | 6 ++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/lib/portability.c b/lib/portability.c index 4da49dd69..78e500b1f 100644 --- a/lib/portability.c +++ b/lib/portability.c @@ -6,7 +6,20 @@ #include "toys.h" -#if !defined(__uClinux__) +// We can't fork() on nommu systems, and vfork() requires an exec() or exit() +// before resuming the parent (because they share a heap until then). And no, +// we can't implement our own clone() call that does the equivalent of fork() +// because nommu heaps use physical addresses so if we copy the heap all our +// pointers are wrong. (You need an mmu in order to map two heaps to the same +// address range without interfering with each other.) In the absence of +// a portable way to tell malloc() to start a new heap without freeing the old +// one, you pretty much need the exec().) + +// So we exec ourselves (via /proc/self/exe, if anybody knows a way to +// re-exec self without depending on the filesystem, I'm all ears), +// and use the arguments to signal reentry. + +#if CFG_TOYBOX_FORK pid_t xfork(void) { pid_t pid = fork(); diff --git a/scripts/genconfig.sh b/scripts/genconfig.sh index 313c7c70e..031e97e04 100755 --- a/scripts/genconfig.sh +++ b/scripts/genconfig.sh @@ -83,6 +83,12 @@ EOF #error nope #endif EOF + + # nommu support + probesymbol TOYBOX_FORK << EOF + #include + int main(int argc, char *argv[]) { return fork(); } +EOF } genconfig()