diff options
| author | Christopher Faylor <me@cgf.cx> | 2002-08-07 02:05:53 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2002-08-07 02:05:53 +0400 |
| commit | e851d2fe43cebc6028959f9bcb0e457f88e115da (patch) | |
| tree | 2e3f147155c8bf047439df24bfa3a6092ec4e596 | |
| parent | 32438c512a0a2c26f5ba9c6a3a7437ba2b6b24cc (diff) | |
Conrad Scott <conrad.scott@dsl.pipex.com
* cygheap.cc (_csbrk): Allocate some slop initially. Don't erroneously add
sbrk amount to returned value in initial case.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/cygheap.cc | 4 | ||||
| -rw-r--r-- | winsup/cygwin/shared.cc | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 723b5b482..4d6a7238b 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,4 +1,10 @@ 2002-08-06 Christopher Faylor <cgf@redhat.com> + Conrad Scott <conrad.scott@dsl.pipex.com + + * cygheap.cc (_csbrk): Allocate some slop initially. Don't erroneously + add sbrk amount to returned value in initial case. + +2002-08-06 Christopher Faylor <cgf@redhat.com> * spawn.cc (spawn_guts): Don't set mount_h here. * sigproc.cc (init_child_info): Set it here instead. diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc index edd77fcf3..976618bf7 100644 --- a/winsup/cygwin/cygheap.cc +++ b/winsup/cygwin/cygheap.cc @@ -177,8 +177,8 @@ _csbrk (int sbs) { init_cheap (); cygheap_max = cygheap; - (void) _csbrk ((int) pagetrunc (4095 + sbs + sizeof (*cygheap))); - prebrk = (char *) (cygheap + 1) + sbs; + (void) _csbrk (sbs + sizeof (*cygheap) + (2 * system_info.dwPageSize)); + prebrk = (char *) (cygheap + 1); } else { diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc index dd8e67c63..7585d6364 100644 --- a/winsup/cygwin/shared.cc +++ b/winsup/cygwin/shared.cc @@ -29,7 +29,7 @@ details. */ shared_info NO_COPY *cygwin_shared = NULL; mount_info NO_COPY *mount_table = NULL; -HANDLE cygwin_mount_h; +HANDLE NO_COPY cygwin_mount_h; char * __stdcall shared_name (const char *str, int num) |