summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-05-22 12:34:33 -0400
committerRich Felker <dalias@aerifal.cx>2011-05-22 12:34:33 -0400
commit19892bf0a740062cf51b84c27f53f7c0f3120b53 (patch)
tree6f166ed32a679e80e108435640f99046784006aa
parentc5025bfabefe952507cf333ea89854d6ba612549 (diff)
downloadmusl-19892bf0a740062cf51b84c27f53f7c0f3120b53.tar.gz
musl-19892bf0a740062cf51b84c27f53f7c0f3120b53.tar.bz2
musl-19892bf0a740062cf51b84c27f53f7c0f3120b53.tar.xz
musl-19892bf0a740062cf51b84c27f53f7c0f3120b53.zip
fix brk/sbrk behavior to match the real legacy functions
-rw-r--r--src/linux/brk.c2
-rw-r--r--src/linux/sbrk.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/linux/brk.c b/src/linux/brk.c
index 9f63c5a8..d91ee5a9 100644
--- a/src/linux/brk.c
+++ b/src/linux/brk.c
@@ -2,5 +2,5 @@
int brk(void *end)
{
- return -(syscall(SYS_brk, end) == -1);
+ return -(syscall(SYS_brk, end) != (unsigned long)end);
}
diff --git a/src/linux/sbrk.c b/src/linux/sbrk.c
index b2943a92..5fab74be 100644
--- a/src/linux/sbrk.c
+++ b/src/linux/sbrk.c
@@ -3,5 +3,7 @@
void *sbrk(ptrdiff_t inc)
{
- return (void *)syscall(SYS_brk, syscall(SYS_brk, 0)+inc);
+ unsigned long cur = syscall(SYS_brk, 0);
+ if (inc && syscall(SYS_brk, cur+inc) != cur+inc) return (void *)-1;
+ return (void *)cur;
}