From: Robert Pengelly <robertapengelly@hotmail.com>
Date: Sun, 23 Mar 2025 20:19:41 +0000 (+0000)
Subject: Make ifeq(arg,arg) fail to match GNUMake
X-Git-Url: https://git.candlhat.org/?a=commitdiff_plain;h=f92b7c2830818357d784e9b05e0ba42bfa011f75;p=xmake.git

Make ifeq(arg,arg) fail to match GNUMake
---

diff --git a/read.c b/read.c
index 2ebbadf..50a254e 100644
--- a/read.c
+++ b/read.c
@@ -388,27 +388,45 @@ static int read_lbuf (struct linebuf *lbuf, int set_default) {
             
             if (*p == '(' || *skip_whitespace (p) == '(') {
             
-                arg1 = skip_whitespace (skip_whitespace (p) + 1);
+                q = skip_whitespace (skip_whitespace (p) + 1);
                 
-                if (!(comma = strchr (p, ',')) || !(q = strrchr (p, ')')) || q < comma) {
-                    goto ifeq_invalid_syntax;
-                }
-                
-                *comma = '\0';
-                *q = '\0';
+                if ((comma = strrchr (p, ','))) {
                 
-                for (q = comma; q > p && isspace ((int) *(q - 1));) {
-                    *--q = '\0';
-                }
+                    if (!isspace ((int) *p)) {
+                    
+                        fprintf (stderr, "%s: *** missing separator (%s must be followed by whitespace). Stop.\n", program_name, ifneq ? "ifneq" : "ifeq");
+                        exit (EXIT_FAILURE);
+                    
+                    }
+                    
+                    arg1 = p = q;
+                    
+                    if (!(q = strrchr (p, ')')) || q < comma) {
+                        goto ifeq_invalid_syntax;
+                    }
+                    
+                    *comma = '\0';
+                    *q = '\0';
+                    
+                    for (q = comma; q > p && isspace ((int) *(q - 1));) {
+                        *--q = '\0';
+                    }
+                    
+                    for (p = comma + 1; isspace ((int) *p);) {
+                        p++;
+                    }
+                    
+                    arg2 = p;
+                    
+                    while (*p != '\0') {
+                        p++;
+                    }
                 
-                for (p = comma + 1; isspace ((int) *p);) {
-                    p++;
-                }
+                } else {
                 
-                arg2 = p;
+                    fprintf (stderr, "%s: currently only ifeq (arg,arg) is supported\n", program_name);
+                    exit (EXIT_FAILURE);
                 
-                while (*p != '\0') {
-                    p++;
                 }
             
             } else {