diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-10-15 14:39:23 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-10-15 14:39:23 +0000 |
| commit | fbc0d5cc3e3eb91a046913eccc69c2143349c524 (patch) | |
| tree | 9690b46002776d0c5e5b91ec48f93024fa7b2baa /dmake | |
| parent | bf1dc2eceb0fbe7cd9be6e57fff65d8ce94cea8f (diff) | |
INTEGRATION: CWS dmake411 (1.9.4); FILE MERGED
2007/09/19 00:34:30 vq 1.9.4.2: #i81252# Add a new SHELLCMDQUOTE control macro.
2007/07/05 21:17:13 vq 1.9.4.1: #i79200# Remove unneeded error on defined or DEFINED after .IF expression.
Diffstat (limited to 'dmake')
| -rw-r--r-- | dmake/getinp.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/dmake/getinp.c b/dmake/getinp.c index 280021935d2e..d736f50320a2 100644 --- a/dmake/getinp.c +++ b/dmake/getinp.c @@ -1,4 +1,4 @@ -/* RCS $Id: getinp.c,v 1.9 2007-06-12 06:05:42 obo Exp $ +/* RCS $Id: getinp.c,v 1.10 2007-10-15 15:39:23 ihi Exp $ -- -- SYNOPSIS -- Handle reading of input. @@ -309,7 +309,7 @@ int keep; Swap_on_exec = TRUE; #endif Wait_for_completion = TRUE; - Do_cmnd(cmnd, FALSE, TRUE, Current_target, A_DEFAULT, TRUE); + Do_cmnd(&cmnd, FALSE, TRUE, Current_target, A_DEFAULT, TRUE); #if defined(MSDOS) Swap_on_exec = FALSE; #endif @@ -540,17 +540,9 @@ _handle_conditional( opcode, tg ) else cst++; - lhs = DmStrSpn( expr, " \t" ); - if( !*lhs ) lhs = NIL(char); - - /* Don't support C-style define keyword */ - if ( (lop = DmStrStr(lhs, "defined" )) != NIL(char) ) - Fatal( ".IF do not support defined " ); - if ( (lop = DmStrStr(lhs, "DEFINED" )) != NIL(char) ) - Fatal( ".IF do not support defined " ); - lhs = expr; - SCAN_WHITE( lhs ); + SCAN_WHITE( lhs ); + /* Parse the expression and get its logical result */ if ( ((lop = DmStrStr(lhs, "||" )) != NIL(char)) || ((lop = DmStrStr(lhs, "&&" )) != NIL(char)) ) result = parse_complex_expression( lhs, &expr_end, opcode ); |