* Various bug fixes.

1 files changed, 40 insertions, 34 deletions

diff --git a/read.c b/read.c
index 1b340ac4..3cbd3925 100644
--- a/read.c
+++ b/read.c
@@ -806,7 +806,7 @@ read_makefile (filename, flags)
                          entirely consistent, since we do an unconditional
                          expand below once we know we don't have a
                          target-specific variable. */
-                      (void)variable_expand_string(pend, lb_next, -1);
+                      (void)variable_expand_string(pend, lb_next, (long)-1);
                       lb_next += strlen(lb_next);
                       p2 = variable_buffer + p2_off;
                       cmdleft = variable_buffer + cmd_off + 1;
@@ -921,7 +921,7 @@ read_makefile (filename, flags)
           if (*lb_next != '\0')
             {
               unsigned int l = p2 - variable_buffer;
-              (void)variable_expand_string(p2 + plen, lb_next, -1);
+              (void)variable_expand_string(p2 + plen, lb_next, (long)-1);
               p2 = variable_buffer + l;
 
               /* Look for a semicolon in the expanded line.  */
@@ -1305,10 +1305,12 @@ conditional_line (line, flocp)
 	      if (*line == '(')
 		++count;
 	      else if (*line == ')')
-		if (count <= 0)
-		  break;
-		else
-		  --count;
+		{
+		  if (count <= 0)
+		    break;
+		  else
+		    --count;
+		}
 	    }
 	}
       else
@@ -1554,35 +1556,38 @@ record_files (filenames, pattern, pattern_percent, deps, cmds_started,
       this = nextf != 0 ? copy_dep_chain (deps) : deps;
 
       if (pattern != 0)
-	/* If this is an extended static rule:
-	   `targets: target%pattern: dep%pattern; cmds',
-	   translate each dependency pattern into a plain filename
-	   using the target pattern and this target's name.  */
-	if (!pattern_matches (pattern, pattern_percent, name))
-	  {
-	    /* Give a warning if the rule is meaningless.  */
-	    error (flocp,"target `%s' doesn't match the target pattern", name);
-	    this = 0;
-	  }
-	else
-	  {
-	    /* We use patsubst_expand to do the work of translating
-	       the target pattern, the target's name and the dependencies'
-	       patterns into plain dependency names.  */
-	    char *buffer = variable_expand ("");
+	{
+	  /* If this is an extended static rule:
+	     `targets: target%pattern: dep%pattern; cmds',
+	     translate each dependency pattern into a plain filename
+	     using the target pattern and this target's name.  */
+	  if (!pattern_matches (pattern, pattern_percent, name))
+	    {
+	      /* Give a warning if the rule is meaningless.  */
+	      error (flocp,
+		     "target `%s' doesn't match the target pattern", name);
+	      this = 0;
+	    }
+	  else
+	    {
+	      /* We use patsubst_expand to do the work of translating
+		 the target pattern, the target's name and the dependencies'
+		 patterns into plain dependency names.  */
+	      char *buffer = variable_expand ("");
 
-	    for (d = this; d != 0; d = d->next)
-	      {
-		char *o;
-		char *percent = find_percent (d->name);
-		if (percent == 0)
-		  continue;
-		o = patsubst_expand (buffer, name, pattern, d->name,
-				     pattern_percent, percent);
-		free (d->name);
-		d->name = savestring (buffer, o - buffer);
-	      }
-	  }
+	      for (d = this; d != 0; d = d->next)
+		{
+		  char *o;
+		  char *percent = find_percent (d->name);
+		  if (percent == 0)
+		    continue;
+		  o = patsubst_expand (buffer, name, pattern, d->name,
+				       pattern_percent, percent);
+		  free (d->name);
+		  d->name = savestring (buffer, o - buffer);
+		}
+	    }
+	}
 
       if (!two_colon)
 	{
@@ -2344,6 +2349,7 @@ get_next_mword (buffer, delim, startp, length)
         case '\\':
           switch (*p)
             {
+            case ':':
             case ';':
             case '=':
             case '\\':