diff options
| author | Ken Foskey <waratah@openoffice.org> | 2002-10-11 12:42:49 +0000 |
|---|---|---|
| committer | Ken Foskey <waratah@openoffice.org> | 2002-10-11 12:42:49 +0000 |
| commit | bc95f59574c8d2535fa028e8a6af09f826725801 (patch) | |
| tree | 5d0d413043879f3fc13b8fe3ce0b3e9c2188de73 /dmake/expand.c | |
| parent | 68496a2957e2f4b7bb2b8a943236ea4859905bf2 (diff) | |
dmake: Implement fix for Lost child problem. Correct some checks for functions (assumed present) and also fix up all gcc warnings using -Wall.
Diffstat (limited to 'dmake/expand.c')
| -rw-r--r-- | dmake/expand.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/dmake/expand.c b/dmake/expand.c index 664aa03ddc09..b6321845800f 100644 --- a/dmake/expand.c +++ b/dmake/expand.c @@ -1,4 +1,4 @@ -/* RCS $Id: expand.c,v 1.1.1.1 2000-09-22 15:33:25 hr Exp $ +/* RCS $Id: expand.c,v 1.2 2002-10-11 13:42:42 waratah Exp $ -- -- SYNOPSIS -- Macro expansion code. @@ -321,7 +321,7 @@ char *src; * DIRECTORY_FLAG is set, then we want to keep the directory portion * othewise throw it away and blank out to the end of the token */ - if( (e = Basename(s)) != s) + if( (e = Basename(s)) != s) { if( !(mod & DIRECTORY_FLAG) ) { strcpy(s, e); e = s+(str.tk_str-e); @@ -330,6 +330,7 @@ char *src; } else s = e; + } /* search for the suffix, if there is none, treat it as a NULL suffix. * if no file name treat it as a NULL file name. same copy op as |