Changeset 35 for trunk/src/kmk/cond.c

Timestamp:

Mar 18, 2003, 4:58:49 AM (22 years ago)

Author:

bird

Message:

emx is kind of working again...

File:

• trunk/src/kmk/cond.c (modified) (14 diffs)

trunk/src/kmk/cond.c

@@ -236 +236 @@
             Buf_AddBytes(buf, strlen(cp2), (Byte *)cp2);
             if (doFree) {
-                free(cp2);
+                efree(cp2);
             }
             cp += len;
@@ -383 +383 @@
     if (path != (char *)NULL) {
         result = TRUE;
-        free(path);
+        efree(path);
     } else {
         result = FALSE;
@@ -529 +529 @@
                 t = EndOfFile;
                 break;
+
+            #ifdef NMAKE
+            case '[':
+                //@todo execute this command!!!
+                t = False;
+                condExpr += strlen(condExpr);
+                break;
+            #endif
+
+
+            #ifdef NMAKE
+            case '"':
+            #endif
             case '$': {
                 char    *lhs;
@@ -535 +548 @@
                 int     varSpecLen;
                 Boolean doFree;
+                #ifdef NMAKE
+                Boolean fQuoted = (*condExpr == '"');
+                if (fQuoted)
+                    condExpr++;
+                #endif
 
                 /*
@@ -542 +560 @@
                 t = Err;
                 lhs = Var_Parse(condExpr, VAR_CMD, doEval,&varSpecLen,&doFree);
+                #ifdef NMAKE
+                if (lhs == var_Error)
+                {
+                    //@todo check if actually parsed correctly.
+                    doFree = 0;
+                }
+                #else
                 if (lhs == var_Error) {
                     /*
@@ -549 +574 @@
                     return(Err);
                 }
+                #endif
                 condExpr += varSpecLen;
 
+                #ifdef NMAKE
+                if (    (fQuoted && *condExpr != '"')
+                    ||  (!fQuoted && !isspace((unsigned char) *condExpr) && strchr("!=><", *condExpr) == NULL)
+                    )
+                #else
                 if (!isspace((unsigned char) *condExpr) &&
-                    strchr("!=><", *condExpr) == NULL) {
+                    strchr("!=><", *condExpr) == NULL)
+                #endif
+                {
                     Buffer buf;
                     char *cp;
@@ -562 +595 @@
 
                     if (doFree)
-                        free(lhs);
-
-                    for (;*condExpr && !isspace((unsigned char) *condExpr);
-                         condExpr++)
+                        efree(lhs);
+
+                    #ifdef NMAKE
+                    for (;*condExpr && (fQuoted ? *condExpr != '"' : !isspace((unsigned char) *condExpr)); condExpr++)
+                    #else
+                    for (;*condExpr && !isspace((unsigned char) *condExpr); condExpr++)
+                    #endif
                         Buf_AddByte(buf, (Byte)*condExpr);
 
@@ -578 +614 @@
                  * Skip whitespace to get to the operator
                  */
+                #ifdef NMAKE
+                if (fQuoted && *condExpr == '"')
+                    condExpr++;
+                #endif
                 while (isspace((unsigned char) *condExpr))
                     condExpr++;
@@ -653 +693 @@
                                 Buf_AddBytes(buf, strlen(cp2), (Byte *)cp2);
                                 if (freeIt) {
-                                    free(cp2);
+                                    efree(cp2);
                                 }
                                 cp += len - 1;
@@ -682 +722 @@
                         t = strcmp(lhs, string) ? True : False;
                     }
-                    free(string);
+                    efree(string);
                     if (rhs == condExpr) {
                         if (!qt && *cp == ')')
@@ -709 +749 @@
                             if (*CondCvtArg(string, &right) != '\0') {
                                 if (freeIt)
-                                    free(string);
+                                    efree(string);
                                 goto do_string_compare;
                             }
                             if (freeIt)
-                                free(string);
+                                efree(string);
                             if (rhs == condExpr)
                                 condExpr += len;
@@ -771 +811 @@
 error:
                 if (doFree)
-                    free(lhs);
+                    efree(lhs);
                 break;
             }
@@ -851 +891 @@
                         }
                         if (doFree) {
-                            free(val);
+                            efree(val);
                         }
                         /*
@@ -898 +938 @@
                      (invert ? False : True) :
                      (invert ? True : False));
-                free(arg);
+                efree(arg);
                 break;
             }