Bug fixes

diff --git a/read.c b/read.c
index 7cb1c7f83b08a36601027eb5bac2bfbf083dd0ed..e7fe958e829d49aee48424bcc66edc31e2e428b6 100644 (file)
--- a/read.c
+++ b/read.c
@@ -386,79 +386,85 @@ static int read_lbuf (struct linebuf *lbuf, int set_default) {
             
             }
             
-            if (isspace ((int) *p)) {
-                p = skip_whitespace (p);
-            } else if (*p == '"' || *p == '\'') {
+            if (*p == '(' || *skip_whitespace (p) == '(') {
             
-                fprintf (stderr, "%s: *** missing separator (%s must be followed by whitespace).  Stop.\n", program_name, ifneq ? "ifneq" : "ifeq");
-                exit (EXIT_FAILURE);
-            
-            }
-            
-            if (*p == '"' || *p == '\'') {
-            
-                ch = *p++;
-                arg1 = p;
+                arg1 = skip_whitespace (p + 1);
                 
-                while (*p != ch) {
+                if (!(comma = strchr (p, ',')) || !(q = strrchr (p, ')')) || q < comma) {
+                    goto ifeq_invalid_syntax;
+                }
                 
-                    if (*p == '\0') {
-                        goto ifeq_invalid_syntax;
-                    }
-                    
-                    p++;
+                *comma = '\0';
+                *q = '\0';
                 
+                for (q = comma; q > p && isspace ((int) *(q - 1));) {
+                    *--q = '\0';
                 }
                 
-                *p = '\0';
-                p = skip_whitespace (p + 1);
-                
-                if (*p != '"' && *p != '\'') {
-                    goto ifeq_invalid_syntax;
+                for (p = comma + 1; isspace ((int) *p);) {
+                    p++;
                 }
                 
-                ch = *p++;
                 arg2 = p;
                 
-                while (*p != ch) {
-                
-                    if (*p == '\0') {
-                        goto ifeq_invalid_syntax;
-                    }
-                    
+                while (*p != '\0') {
                     p++;
-                
                 }
-                
-                *p++ = '\0';
             
-            } else if (*p == '(') {
+            } else {
             
-                arg1 = ++p;
+                ch = *p;
                 
-                if (!(comma = strchr (p, ',')) || !(q = strrchr (p, ')')) || q < comma) {
+                if (!*(p = skip_whitespace (p))) {
                     goto ifeq_invalid_syntax;
                 }
                 
-                *comma = '\0';
-                *q = '\0';
+                if (!isspace ((int) ch)) {
                 
-                for (q = comma; q > p && isspace ((int) *(q - 1));) {
-                    *--q = '\0';
-                }
+                    fprintf (stderr, "%s: *** missing separator (%s must be followed by whitespace).  Stop.\n", program_name, ifneq ? "ifneq" : "ifeq");
+                    exit (EXIT_FAILURE);
                 
-                for (p = comma + 1; isspace ((int) *p);) {
-                    p++;
                 }
                 
-                arg2 = p;
+                if (*p == '"' || *p == '\'') {
+                
+                    ch = *p++;
+                    arg1 = p;
+                    
+                    while (*p != ch) {
+                    
+                        if (*p == '\0') {
+                            goto ifeq_invalid_syntax;
+                        }
+                        
+                        p++;
+                    
+                    }
+                    
+                    *p = '\0';
+                    p = skip_whitespace (p + 1);
+                    
+                    if (*p != '"' && *p != '\'') {
+                        goto ifeq_invalid_syntax;
+                    }
+                    
+                    ch = *p++;
+                    arg2 = p;
+                    
+                    while (*p != ch) {
+                    
+                        if (*p == '\0') {
+                            goto ifeq_invalid_syntax;
+                        }
+                        
+                        p++;
+                    
+                    }
+                    
+                    *p++ = '\0';
                 
-                while (*p != '\0') {
-                    p++;
                 }
             
-            } else {
-                goto ifeq_invalid_syntax;
             }
             
             p = skip_whitespace (p);