wok-current annotate make/stuff/bug30612.patch @ rev 7254

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