rev |
line source |
gokhlayeh@7982
|
1 diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c
|
gokhlayeh@7982
|
2 --- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000
|
gokhlayeh@7982
|
3 +++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000
|
gokhlayeh@7982
|
4 @@ -1,3 +1,4 @@
|
gokhlayeh@7982
|
5 +
|
gokhlayeh@7982
|
6 /* Argument parsing and main program of GNU Make.
|
gokhlayeh@7982
|
7 Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
|
gokhlayeh@7982
|
8 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
|
gokhlayeh@7982
|
9 @@ -1138,7 +1139,7 @@
|
gokhlayeh@7982
|
10 a macro and some compilers (MSVC) don't like conditionals in macros. */
|
gokhlayeh@7982
|
11 {
|
gokhlayeh@7982
|
12 const char *features = "target-specific order-only second-expansion"
|
gokhlayeh@7982
|
13 - " else-if shortest-stem undefine"
|
gokhlayeh@7982
|
14 + " else-if shortest-stem undefine oneshell"
|
gokhlayeh@7982
|
15 #ifndef NO_ARCHIVES
|
gokhlayeh@7982
|
16 " archives"
|
gokhlayeh@7982
|
17 #endif
|
gokhlayeh@7982
|
18 diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c
|
gokhlayeh@7982
|
19 --- make-3.82-orig/read.c 2010-07-13 11:20:42.000000000 +1000
|
gokhlayeh@7982
|
20 +++ make-3.82-fix30612//read.c 2010-09-23 23:30:58.018855839 +1000
|
gokhlayeh@7982
|
21 @@ -3028,7 +3028,7 @@
|
gokhlayeh@7982
|
22 {
|
gokhlayeh@7982
|
23 /* This looks like the first element in an open archive group.
|
gokhlayeh@7982
|
24 A valid group MUST have ')' as the last character. */
|
gokhlayeh@7982
|
25 - const char *e = p + nlen;
|
gokhlayeh@7982
|
26 + const char *e = p;
|
gokhlayeh@7982
|
27 do
|
gokhlayeh@7982
|
28 {
|
gokhlayeh@7982
|
29 e = next_token (e);
|
gokhlayeh@7982
|
30 @@ -3084,19 +3084,19 @@
|
gokhlayeh@7982
|
31 Go to the next item in the string. */
|
gokhlayeh@7982
|
32 if (flags & PARSEFS_NOGLOB)
|
gokhlayeh@7982
|
33 {
|
gokhlayeh@7982
|
34 - NEWELT (concat (2, prefix, tp));
|
gokhlayeh@7982
|
35 + NEWELT (concat (2, prefix, tmpbuf));
|
gokhlayeh@7982
|
36 continue;
|
gokhlayeh@7982
|
37 }
|
gokhlayeh@7982
|
38
|
gokhlayeh@7982
|
39 /* If we get here we know we're doing glob expansion.
|
gokhlayeh@7982
|
40 TP is a string in tmpbuf. NLEN is no longer used.
|
gokhlayeh@7982
|
41 We may need to do more work: after this NAME will be set. */
|
gokhlayeh@7982
|
42 - name = tp;
|
gokhlayeh@7982
|
43 + name = tmpbuf;
|
gokhlayeh@7982
|
44
|
gokhlayeh@7982
|
45 /* Expand tilde if applicable. */
|
gokhlayeh@7982
|
46 - if (tp[0] == '~')
|
gokhlayeh@7982
|
47 + if (tmpbuf[0] == '~')
|
gokhlayeh@7982
|
48 {
|
gokhlayeh@7982
|
49 - tildep = tilde_expand (tp);
|
gokhlayeh@7982
|
50 + tildep = tilde_expand (tmpbuf);
|
gokhlayeh@7982
|
51 if (tildep != 0)
|
gokhlayeh@7982
|
52 name = tildep;
|
gokhlayeh@7982
|
53 }
|
gokhlayeh@7982
|
54 @@ -3152,7 +3152,11 @@
|
gokhlayeh@7982
|
55 else
|
gokhlayeh@7982
|
56 {
|
gokhlayeh@7982
|
57 /* We got a chain of items. Attach them. */
|
gokhlayeh@7982
|
58 - (*newp)->next = found;
|
gokhlayeh@7982
|
59 + if (*newp)
|
gokhlayeh@7982
|
60 + (*newp)->next = found;
|
gokhlayeh@7982
|
61 + else
|
gokhlayeh@7982
|
62 + *newp = found;
|
gokhlayeh@7982
|
63 +
|
gokhlayeh@7982
|
64
|
gokhlayeh@7982
|
65 /* Find and set the new end. Massage names if necessary. */
|
gokhlayeh@7982
|
66 while (1) |