boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 00:52:16 +00:00
Code Issues Projects Releases Wiki Activity

Minor stylistic changes. Removed some minor code duplication.

Browse Source 
[SVN r78862]
This commit is contained in:
Jurko Gospodnetić
2012-06-09 07:28:42 +00:00
parent c851e03de3
commit fc6a60ee1e
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/engine/execunix.c
View File

@@ -348,29 +348,24 @@ int read_descriptor( int i, int s )
int len;
char buffer[BUFSIZ];
while ( 0 < ( ret = fread( buffer, sizeof(char), BUFSIZ-1, cmdtab[ i ].stream[ s ] ) ) )
while ( 0 < ( ret = fread( buffer, sizeof(char), BUFSIZ-1, cmdtab[ i ].stream[ s ] ) ) )
{
buffer[ret] = 0;
if ( !cmdtab[ i ].buffer[ s ] )
buffer[ ret ] = 0;
if ( !cmdtab[ i ].buffer[ s ] )
{
/* Never been allocated. */
if (ret <= globs.max_buf || 0 == globs.max_buf) {
cmdtab[ i ].buf_size[ s ] = ret + 1;
cmdtab[ i ].buffer[ s ] = (char*)BJAM_MALLOC_ATOMIC( ret + 1 );
memcpy( cmdtab[ i ].buffer[ s ], buffer, ret + 1 );
}
else {
if ( ret > globs.max_buf && 0 != globs.max_buf ) {
ret = globs.max_buf;
buffer[ret] = 0;
cmdtab[ i ].buf_size[ s ] = ret + 1;
cmdtab[ i ].buffer[ s ] = (char*)BJAM_MALLOC_ATOMIC( ret + 1 );
memcpy( cmdtab[ i ].buffer[ s ], buffer, ret + 1);
buffer[ ret ] = 0;
}
cmdtab[ i ].buf_size[ s ] = ret + 1;
cmdtab[ i ].buffer[ s ] = (char*)BJAM_MALLOC_ATOMIC( ret + 1 );
memcpy( cmdtab[ i ].buffer[ s ], buffer, ret + 1 );
}
else
{
/* Previously allocated. */
if (cmdtab[ i ].buf_size[ s ] < globs.max_buf || 0 == globs.max_buf) {
if ( cmdtab[ i ].buf_size[ s ] < globs.max_buf || 0 == globs.max_buf ) {
char * tmp = cmdtab[ i ].buffer[ s ];
len = cmdtab[ i ].buf_size[ s ];
cmdtab[ i ].buf_size[ s ] = len + ret + 1;
@@ -382,7 +377,7 @@ int read_descriptor( int i, int s )
}
}
return feof(cmdtab[ i ].stream[ s ]);
return feof( cmdtab[ i ].stream[ s ] );
}