From 6336eba8f45fc6de5fa1bf4d418f35d06e59c789 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sat, 10 Sep 2005 01:37:20 +0000 Subject: * heap.cc (heap_init): Be slightly more aggressive when trying to allocate heap. Change fatal error to avoid confusion with cygheap. * spawn.cc (linebuf::finish): New function. (linebuf::add): Cosmetic change. (spawn_guts): Only avoid building windows command line if the program being executed was actually mounted with -X. Don't return E2BIG if we hit the 32K size and we're executing a detected cygwin program. Just silently truncate the windows command line, instead. --- winsup/cygwin/heap.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/heap.cc') diff --git a/winsup/cygwin/heap.cc b/winsup/cygwin/heap.cc index 9f86f9911..739b59711 100644 --- a/winsup/cygwin/heap.cc +++ b/winsup/cygwin/heap.cc @@ -73,11 +73,11 @@ heap_init () MEM_RESERVE, PAGE_READWRITE); if (p) break; - if ((reserve_size -= page_const) <= allocsize) + if ((reserve_size -= page_const) < allocsize) break; } if (!p) - api_fatal ("couldn't allocate cygwin heap, %E, base %p, top %p, " + api_fatal ("couldn't allocate heap, %E, base %p, top %p, " "reserve_size %d, allocsize %d, page_const %d", cygheap->user_heap.base, cygheap->user_heap.top, reserve_size, allocsize, page_const); -- cgit v1.2.3