diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-10-15 14:46:20 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-10-15 14:46:20 +0000 |
| commit | 9617ece1a706bc226973f58afe689cb6d2ba0f20 (patch) | |
| tree | c771e582ea7af779f3f787936742c06f4a8ea865 | |
| parent | ac74867238ff0efa33223258b8d5e847a8771056 (diff) | |
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.
| -rw-r--r-- | dmake/qssl/runargv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dmake/qssl/runargv.c b/dmake/qssl/runargv.c index 3140d40f9eb3..c0e602ac9f3f 100644 --- a/dmake/qssl/runargv.c +++ b/dmake/qssl/runargv.c @@ -1,4 +1,4 @@ -/* 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 -- Invoke a sub process. @@ -60,6 +60,8 @@ static int _running ANSI((CELLPTR)); /* iz71422 changed the parameters for runargv but it (and the rest of * qssl) got *NOT* fixed. */ +iz81252 changed the parameters for Pack_argv() and runargv() but this file +did not get fixed! PUBLIC int runargv(target, ignore, group, last, shell, cmd) CELLPTR target; @@ -214,7 +216,6 @@ int status; Current_target = NIL(CELL); if ( _procs[i].pr_target->ce_attr & A_ERROR ) { - Unlink_temp_files( _procs[i].pr_target ); _procs[i].pr_last = TRUE; goto ABORT_REMAINDER_OF_RECIPE; } @@ -232,7 +233,6 @@ int status; if( _proc_cnt == Max_proc ) Wait_for_child( FALSE, -1 ); } else { - Unlink_temp_files( _procs[i].pr_target ); Handle_result(status,_procs[i].pr_ignore,_abort_flg,_procs[i].pr_target); ABORT_REMAINDER_OF_RECIPE: |