 @@ -1,14 +1,14 @@
-/*	$NetBSD: cond.c,v 1.131 2020/09/11 16:22:15 rillig Exp $	*/
+/*	$NetBSD: cond.c,v 1.132 2020/09/11 16:23:47 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -60,34 +60,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: cond.c,v 1.131 2020/09/11 16:22:15 rillig Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.132 2020/09/11 16:23:47 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)cond.c	8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: cond.c,v 1.131 2020/09/11 16:22:15 rillig Exp $");
+__RCSID("$NetBSD: cond.c,v 1.132 2020/09/11 16:23:47 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /* Handling of conditionals in a makefile.
+ *
  * Interface:
  *	Cond_Eval 	Evaluate the conditional in the passed line.
+ *
  *	Cond_EvalExpression
  *			Evaluate the conditional in the passed line, which
  *			is either the argument of one of the .if directives
  *			or the condition in a :?true:false variable modifier.
 @@ -545,27 +545,27 @@ EvalNotEmpty(CondParser *par, const char
     /* Otherwise action default test ... */
     return par->if_info->defProc(strlen(lhs), lhs) != par->if_info->doNot;
+}
 /* Evaluate a comparison, such as "${VAR} == 12345". */
 static Token
 EvalComparison(const char *lhs, Boolean lhsQuoted, const char *op,
 	       const char *rhs, Boolean rhsQuoted)
+{
     double left, right;
     if (rhsQuoted || lhsQuoted) {
 	do_string_compare:
-	if (((*op != '!') && (*op != '=')) || (op[1] != '=')) {
+	if ((*op != '!' && *op != '=') || op[1] != '=') {
 	    Parse_Error(PARSE_WARNING,
 			"String comparison operator should be either == or !=");
 	    return TOK_ERROR;
+	}
 	if (DEBUG(COND)) {
 	    fprintf(debug_file, "lhs = \"%s\", rhs = \"%s\", op = %.2s\n",
 		    lhs, rhs, op);
+	}
 	return (*op == '=') == (strcmp(lhs, rhs) == 0);
+    }
     /*
 @@ -573,74 +573,59 @@ EvalComparison(const char *lhs, Boolean
      * lhs and the rhs to a double and compare the two.
      */
     if (!TryParseNumber(lhs, &left) || !TryParseNumber(rhs, &right))
 	goto do_string_compare;
     if (DEBUG(COND)) {
 	fprintf(debug_file, "left = %f, right = %f, op = %.2s\n", left,
 		right, op);
+    }
     switch (op[0]) {
     case '!':
 	if (op[1] != '=') {
-	    Parse_Error(PARSE_WARNING,
+	    Parse_Error(PARSE_WARNING, "Unknown operator");
 			"Unknown operator");
 	    return TOK_ERROR;
+	}
 	return left != right;
     case '=':
 	if (op[1] != '=') {
-	    Parse_Error(PARSE_WARNING,
+	    Parse_Error(PARSE_WARNING, "Unknown operator");
 			"Unknown operator");
 	    return TOK_ERROR;
+	}
 	return left == right;
     case '<':
-	if (op[1] == '=') {
+	return op[1] == '=' ? left <= right : left < right;
 	    return left <= right;
 	} else {
 	    return left < right;
     case '>':
-	if (op[1] == '=') {
+	return op[1] == '=' ? left >= right : left > right;
 	    return left >= right;
 	} else {
 	    return left > right;
+    }
     return TOK_ERROR;
+}
 /* Parse a comparison condition such as:
+ *
  *	0
  *	${VAR:Mpattern}
  *	${VAR} == value
  *	${VAR:U0} < 12345
  */
 static Token
 CondParser_Comparison(CondParser *par, Boolean doEval)
+{
-    Token t;
+    Token t = TOK_ERROR;
-    const char *lhs;
+    const char *lhs, *op, *rhs;
-    const char *rhs;
+    void *lhsFree, *rhsFree;
-    const char *op;
+    Boolean lhsQuoted, rhsQuoted;
     void *lhsFree;
     void *rhsFree;
     Boolean lhsQuoted;
     Boolean rhsQuoted;
     t = TOK_ERROR;
     rhs = NULL;
     lhsFree = rhsFree = NULL;
     lhsQuoted = rhsQuoted = FALSE;
     /*
      * Parse the variable spec and skip over it, saving its
      * value in lhs.
      */
     lhs = CondParser_String(par, doEval, lhsStrict, &lhsQuoted, &lhsFree);
     if (!lhs)
 	goto done;
     CondParser_SkipWhitespace(par);
 @@ -660,33 +645,32 @@ CondParser_Comparison(CondParser *par, B
 	    par->p += 2;
 	} else {
 	    par->p += 1;
+	}
 	break;
     default:
         t = doEval ? EvalNotEmpty(par, lhs, lhsQuoted) : TOK_FALSE;
 	goto done;
+    }
     CondParser_SkipWhitespace(par);
     if (par->p[0] == '\0') {
-	Parse_Error(PARSE_WARNING,
+	Parse_Error(PARSE_WARNING, "Missing right-hand-side of operator");
 		    "Missing right-hand-side of operator");
 	goto done;
+    }
     rhs = CondParser_String(par, doEval, FALSE, &rhsQuoted, &rhsFree);
-    if (!rhs)
+    if (rhs == NULL)
 	goto done;
     if (!doEval) {
 	t = TOK_FALSE;
 	goto done;
+    }
     t = EvalComparison(lhs, lhsQuoted, op, rhs, rhsQuoted);
 done:
     free(lhsFree);
     free(rhsFree);
     return t;