Kaydet (Commit) 9617ece1 authored tarafından Ivo Hinkelmann's avatar Ivo Hinkelmann

INTEGRATION: CWS dmake411 (1.2.6); FILE MERGED

2007/09/19 00:34:34 vq 1.2.6.2: #i81252# Add a new SHELLCMDQUOTE control macro.
2007/09/02 10:44:26 vq 1.2.6.1: #i67911# Wait with the deletion of temporary files until the target is
completely made.
üst ac748672
/* RCS $Id: runargv.c,v 1.2 2007-01-18 09:37:39 vg Exp $ /* RCS $Id: runargv.c,v 1.3 2007-10-15 15:46:20 ihi Exp $
-- --
-- SYNOPSIS -- SYNOPSIS
-- Invoke a sub process. -- Invoke a sub process.
...@@ -60,6 +60,8 @@ static int _running ANSI((CELLPTR)); ...@@ -60,6 +60,8 @@ static int _running ANSI((CELLPTR));
/* iz71422 changed the parameters for runargv but it (and the rest of /* iz71422 changed the parameters for runargv but it (and the rest of
* qssl) got *NOT* fixed. */ * qssl) got *NOT* fixed. */
iz81252 changed the parameters for Pack_argv() and runargv() but this file
did not get fixed!
PUBLIC int PUBLIC int
runargv(target, ignore, group, last, shell, cmd) runargv(target, ignore, group, last, shell, cmd)
CELLPTR target; CELLPTR target;
...@@ -214,7 +216,6 @@ int status; ...@@ -214,7 +216,6 @@ int status;
Current_target = NIL(CELL); Current_target = NIL(CELL);
if ( _procs[i].pr_target->ce_attr & A_ERROR ) { if ( _procs[i].pr_target->ce_attr & A_ERROR ) {
Unlink_temp_files( _procs[i].pr_target );
_procs[i].pr_last = TRUE; _procs[i].pr_last = TRUE;
goto ABORT_REMAINDER_OF_RECIPE; goto ABORT_REMAINDER_OF_RECIPE;
} }
...@@ -232,7 +233,6 @@ int status; ...@@ -232,7 +233,6 @@ int status;
if( _proc_cnt == Max_proc ) Wait_for_child( FALSE, -1 ); if( _proc_cnt == Max_proc ) Wait_for_child( FALSE, -1 );
} }
else { else {
Unlink_temp_files( _procs[i].pr_target );
Handle_result(status,_procs[i].pr_ignore,_abort_flg,_procs[i].pr_target); Handle_result(status,_procs[i].pr_ignore,_abort_flg,_procs[i].pr_target);
ABORT_REMAINDER_OF_RECIPE: ABORT_REMAINDER_OF_RECIPE:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment