h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-09 00:31:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Second part of improved execve errors - this patch makes the memory limits nicely formated (e.g. 128kB instead of 136549 bytes).

Browse Source 
darcs-hash:20071015095108-75c98-51c2ea6ab6edba5d1885eb5938f039054da775e2.gz
This commit is contained in:
liljencrantz
2007-10-15 19:51:08 +10:00
parent 4163040e56
commit dd02e96712
4 changed files with 71 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
exec.c
View File

@@ -503,7 +503,13 @@ static void launch_process( process_t *p )
{
size_t sz = 0;
char **p;
string_buffer_t sz1;
string_buffer_t sz2;
sb_init( &sz1 );
sb_init( &sz2 );
for(p=argv; *p; p++)
{
sz += strlen(*p)+1;
@@ -514,18 +520,25 @@ static void launch_process( process_t *p )
sz += strlen(*p)+1;
}
sb_format_size( &sz1, sz );
#ifdef ARG_MAX
sb_format_size( &sz2, ARG_MAX );
debug( 0,
L"The total size of the argument and environment lists (%d bytes) exceeds the system limit of %d bytes.",
sz,
ARG_MAX );
L"The total size of the argument and environment lists (%ls) exceeds the system limit of %ls.",
(wchar_t *)sz1.buff,
(wchar_t *)sz2.buff);
#else
debug( 0,
L"The total size of the argument and environment lists (%d bytes) exceeds the system limit.",
sz );
L"The total size of the argument and environment lists (%ls) exceeds the system limit.",
(wchar_t *)sz1.buff);
#endif
debug( 0,
L"Please try running the command again with fewer arguments.");
sb_destroy( &sz1 );
sb_destroy( &sz2 );
exit(1);
break;