| suff.c (281812) | suff.c (289842) |
|---|---|
| 1/* $NetBSD: suff.c,v 1.73 2014/09/07 20:55:34 joerg Exp $ */ | 1/* $NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $ */ |
| 2 3/* 4 * Copyright (c) 1988, 1989, 1990, 1993 5 * The Regents of the University of California. All rights reserved. 6 * 7 * This code is derived from software contributed to Berkeley by 8 * Adam de Boor. 9 * --- 54 unchanged lines hidden (view full) --- 64 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 65 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 66 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 67 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 68 * SUCH DAMAGE. 69 */ 70 71#ifndef MAKE_NATIVE | 2 3/* 4 * Copyright (c) 1988, 1989, 1990, 1993 5 * The Regents of the University of California. All rights reserved. 6 * 7 * This code is derived from software contributed to Berkeley by 8 * Adam de Boor. 9 * --- 54 unchanged lines hidden (view full) --- 64 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 65 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 66 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 67 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 68 * SUCH DAMAGE. 69 */ 70 71#ifndef MAKE_NATIVE |
| 72static char rcsid[] = "$NetBSD: suff.c,v 1.73 2014/09/07 20:55:34 joerg Exp $"; | 72static char rcsid[] = "$NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $"; |
| 73#else 74#include <sys/cdefs.h> 75#ifndef lint 76#if 0 77static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94"; 78#else | 73#else 74#include <sys/cdefs.h> 75#ifndef lint 76#if 0 77static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94"; 78#else |
| 79__RCSID("$NetBSD: suff.c,v 1.73 2014/09/07 20:55:34 joerg Exp $"); | 79__RCSID("$NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $"); |
| 80#endif 81#endif /* not lint */ 82#endif 83 84/*- 85 * suff.c -- 86 * Functions to maintain suffix lists and find implicit dependents 87 * using suffix transformation rules --- 1450 unchanged lines hidden (view full) --- 1538 if (strchr(cgn->name, '$') == NULL) { 1539 SuffExpandWildcards(cln, pgn); 1540 return; 1541 } 1542 1543 if (DEBUG(SUFF)) { 1544 fprintf(debug_file, "Expanding \"%s\"...", cgn->name); 1545 } | 80#endif 81#endif /* not lint */ 82#endif 83 84/*- 85 * suff.c -- 86 * Functions to maintain suffix lists and find implicit dependents 87 * using suffix transformation rules --- 1450 unchanged lines hidden (view full) --- 1538 if (strchr(cgn->name, '$') == NULL) { 1539 SuffExpandWildcards(cln, pgn); 1540 return; 1541 } 1542 1543 if (DEBUG(SUFF)) { 1544 fprintf(debug_file, "Expanding \"%s\"...", cgn->name); 1545 } |
| 1546 cp = Var_Subst(NULL, cgn->name, pgn, TRUE); | 1546 cp = Var_Subst(NULL, cgn->name, pgn, TRUE, TRUE); |
| 1547 1548 if (cp != NULL) { 1549 Lst members = Lst_Init(FALSE); 1550 1551 if (cgn->type & OP_ARCHV) { 1552 /* 1553 * Node was an archive(member) target, so we want to call 1554 * on the Arch module to find the nodes for us, expanding --- 36 unchanged lines hidden (view full) --- 1591 /* 1592 * Start of a variable spec -- contact variable module 1593 * to find the end so we can skip over it. 1594 */ 1595 char *junk; 1596 int len; 1597 void *freeIt; 1598 | 1547 1548 if (cp != NULL) { 1549 Lst members = Lst_Init(FALSE); 1550 1551 if (cgn->type & OP_ARCHV) { 1552 /* 1553 * Node was an archive(member) target, so we want to call 1554 * on the Arch module to find the nodes for us, expanding --- 36 unchanged lines hidden (view full) --- 1591 /* 1592 * Start of a variable spec -- contact variable module 1593 * to find the end so we can skip over it. 1594 */ 1595 char *junk; 1596 int len; 1597 void *freeIt; 1598 |
| 1599 junk = Var_Parse(cp, pgn, TRUE, &len, &freeIt); | 1599 junk = Var_Parse(cp, pgn, TRUE, TRUE, &len, &freeIt); |
| 1600 if (junk != var_Error) { 1601 cp += len - 1; 1602 } 1603 1604 if (freeIt) 1605 free(freeIt); 1606 } else if (*cp == '\\' && *cp != '\0') { 1607 /* --- 1047 unchanged lines hidden --- | 1600 if (junk != var_Error) { 1601 cp += len - 1; 1602 } 1603 1604 if (freeIt) 1605 free(freeIt); 1606 } else if (*cp == '\\' && *cp != '\0') { 1607 /* --- 1047 unchanged lines hidden --- |