summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@kolpackov.net>2009-10-07 09:34:42 +0000
committerBoris Kolpackov <boris@kolpackov.net>2009-10-07 09:34:42 +0000
commitbaee33eb0fb4b8bb84fb5bf428c99f5da4372be4 (patch)
tree995275fd144d1f554486ac21a779d77cffeb92e1
parentbd2d124f275cec912d33ec1463ba66e799518340 (diff)
downloadgunmake-baee33eb0fb4b8bb84fb5bf428c99f5da4372be4.tar.gz
Minor fix and code rework.
-rw-r--r--ChangeLog7
-rw-r--r--commands.c25
-rw-r--r--read.c1
3 files changed, 21 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 4937521..3519538 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-07 Boris Kolpackov <boris@codesynthesis.com>
+
+ * read.c (do_undefine): Free the expanded variable name.
+
+ * commands.c (dep_hash_cmp, set_file_variables): Move the order-only
+ to normal upgrade logic from dep_hash_cmp to set_file_variables.
+
2009-10-06 Boris Kolpackov <boris@codesynthesis.com>
* dep.h (uniquize_deps): Remove.
diff --git a/commands.c b/commands.c
index 8a7bb6c..19cb7b4 100644
--- a/commands.c
+++ b/commands.c
@@ -57,16 +57,7 @@ dep_hash_cmp (const void *x, const void *y)
{
struct dep *dx = (struct dep *) x;
struct dep *dy = (struct dep *) y;
- int cmp = strcmp (dep_name (dx), dep_name (dy));
-
- /* If the names are the same but ignore_mtimes are not equal, one of these
- is an order-only prerequisite and one isn't. That means that we should
- remove the one that isn't and keep the one that is. */
-
- if (!cmp && dx->ignore_mtime != dy->ignore_mtime)
- dx->ignore_mtime = dy->ignore_mtime = 0;
-
- return cmp;
+ return strcmp (dep_name (dx), dep_name (dy));
}
/* Set FILE's automatic variables up. */
@@ -74,7 +65,7 @@ dep_hash_cmp (const void *x, const void *y)
void
set_file_variables (struct file *file)
{
- const struct dep *d;
+ struct dep *d;
const char *at, *percent, *star, *less;
#ifndef NO_ARCHIVES
@@ -252,7 +243,7 @@ set_file_variables (struct file *file)
/* Make sure that no dependencies are repeated in $^, $?, and $|. It
would be natural to combine the next two loops but we can't do it
because of a situation where we have two dep entries, the first
- is order-only and the second is normal (see dep_hash_cmp). */
+ is order-only and the second is normal (see below). */
hash_init (&dep_hash, 500, dep_hash_1, dep_hash_2, dep_hash_cmp);
@@ -264,6 +255,16 @@ set_file_variables (struct file *file)
slot = hash_find_slot (&dep_hash, d);
if (HASH_VACANT (*slot))
hash_insert_at (&dep_hash, d, slot);
+ else
+ {
+ /* Check if the two prerequisites have different ignore_mtime.
+ If so then we need to "upgrade" one that is order-only. */
+
+ struct dep* hd = (struct dep*) *slot;
+
+ if (d->ignore_mtime != hd->ignore_mtime)
+ d->ignore_mtime = hd->ignore_mtime = 0;
+ }
}
for (d = file->deps; d != 0; d = d->next)
diff --git a/read.c b/read.c
index 3a022d6..aa27701 100644
--- a/read.c
+++ b/read.c
@@ -1341,6 +1341,7 @@ do_undefine (char *name, enum variable_origin origin, struct ebuffer *ebuf)
p[1] = '\0';
undefine_variable_global (name, p - name + 1, origin);
+ free (var);
}
/* Execute a `define' directive.