1 commit 2a59dc32aaf0681dec569f32a9d7ab88a379d34f
2 Author: psmith <psmith>
3 Date: Sat Aug 14 02:50:14 2010 +0000
5 - Fix the NEWS file to be accurate
6 - Add oneshell to $(.FEATURES) (forgot that!)
7 - Fix Savannah bug #30612: handling of archive references with >1 object
9 diff --git a/main.c b/main.c
10 index 9fe8090..782b0de 100644
13 @@ -1138,7 +1138,7 @@ main (int argc, char **argv, char **envp)
14 a macro and some compilers (MSVC) don't like conditionals in macros. */
16 const char *features = "target-specific order-only second-expansion"
17 - " else-if shortest-stem undefine"
18 + " else-if shortest-stem undefine oneshell"
22 diff --git a/read.c b/read.c
23 index a3ad88e..9dfd4ea 100644
26 @@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar,
28 /* This looks like the first element in an open archive group.
29 A valid group MUST have ')' as the last character. */
30 - const char *e = p + nlen;
35 @@ -3084,19 +3084,19 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar,
36 Go to the next item in the string. */
37 if (flags & PARSEFS_NOGLOB)
39 - NEWELT (concat (2, prefix, tp));
40 + NEWELT (concat (2, prefix, tmpbuf));
44 /* If we get here we know we're doing glob expansion.
45 TP is a string in tmpbuf. NLEN is no longer used.
46 We may need to do more work: after this NAME will be set. */
50 /* Expand tilde if applicable. */
52 + if (tmpbuf[0] == '~')
54 - tildep = tilde_expand (tp);
55 + tildep = tilde_expand (tmpbuf);
59 @@ -3152,7 +3152,10 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar,
62 /* We got a chain of items. Attach them. */
63 - (*newp)->next = found;
65 + (*newp)->next = found;
69 /* Find and set the new end. Massage names if necessary. */