Changeset 30 for trunk/src/kmk/var.c

Timestamp:

Nov 30, 2002, 7:53:42 AM (23 years ago)

Author:

bird

Message:

Basic nmake emulation.

File:

• trunk/src/kmk/var.c (modified) (7 diffs)

trunk/src/kmk/var.c

@@ -183 +183 @@
 static Boolean VarSuffix __P((char *, Boolean, Buffer, ClientData));
 static Boolean VarRoot __P((char *, Boolean, Buffer, ClientData));
+#ifdef NMAKE
+static Boolean VarBase __P((char *, Boolean, Buffer, ClientData));
+#endif
 static Boolean VarMatch __P((char *, Boolean, Buffer, ClientData));
 #ifdef SYSVVARSUB
@@ -795 +798 @@
     return (dummy ? TRUE : TRUE);
 }
+
+#ifdef NMAKE
+/*-
+ *-----------------------------------------------------------------------
+ * VarBase --
+ *      Remove the head and suffix of the given word and place the result
+ *      in the given buffer.
+ *
+ * Results:
+ *      TRUE if characters were added to the buffer (a space needs to be
+ *      added to the buffer before the next word).
+ *
+ * Side Effects:
+ *      The trimmed word is added to the buffer.
+ *
+ *-----------------------------------------------------------------------
+ */
+static Boolean
+VarBase (word, addSpace, buf, dummy)
+    char          *word;        /* Word to trim */
+    Boolean       addSpace;     /* TRUE if need to stick a space in the
+                                 * buffer before adding the tail */
+    Buffer        buf;          /* Buffer in which to store it */
+    ClientData    dummy;
+{
+    register char *slash;
+
+    if (addSpace) {
+        Buf_AddByte (buf, (Byte)' ');
+    }
+
+    slash = strrchr (word, '/');
+    if (slash != (char *)NULL) {
+        register char *dot;
+        *slash++ = '\0';
+        dot = strrchr (slash, '.');
+        if (dot)
+        {
+            *dot = '\0';
+            Buf_AddBytes (buf, strlen(slash), (Byte *)slash);
+            *dot = '.';
+        }
+        else
+            Buf_AddBytes (buf, strlen(slash), (Byte *)slash);
+        slash[-1] = '/';
+    } else {
+        register char *dot;
+        dot = strrchr (slash, '.');
+        if (dot)
+        {
+            *dot = '\0';
+            Buf_AddBytes (buf, strlen(slash), (Byte *)slash);
+            *dot = '.';
+        }
+        else
+            Buf_AddBytes (buf, strlen(slash), (Byte *)slash);
+    }
+    return (dummy ? TRUE : TRUE);
+}
+
+#endif
 
 /*-
@@ -1496 +1560 @@
     dynamic = FALSE;
     start = str;
+//debugkso: fprintf(stderr, "var: str=%s\n", str);
 
     if (str[1] != '(' && str[1] != '{') {
@@ -1590 +1655 @@
         v = VarFind (str, ctxt, FIND_ENV | FIND_GLOBAL | FIND_CMD);
         if ((v == (Var *)NIL) && (ctxt != VAR_CMD) && (ctxt != VAR_GLOBAL) &&
+#ifdef NMAKE
+            (vlen == 2) && (str[1] == 'F' || str[1] == 'D' || str[1] == 'B' || str[1] == 'R'))
+#else
             (vlen == 2) && (str[1] == 'F' || str[1] == 'D'))
+#endif
         {
             /*
@@ -1622 +1691 @@
                         val = (char *)Buf_GetAll(v->val, (int *)NULL);
 
+#ifdef NMAKE
+                        switch (str[1])
+                        {
+                        case 'D': val = VarModify(val, VarHead, (ClientData)0); break;
+                        case 'B': val = VarModify(val, VarBase, (ClientData)0); break;
+                        case 'R': val = VarModify(val, VarRoot, (ClientData)0); break;
+                        default:  val = VarModify(val, VarTail, (ClientData)0); break;
+                        }
+#else
                         if (str[1] == 'D') {
                             val = VarModify(val, VarHead, (ClientData)0);
@@ -1627 +1705 @@
                             val = VarModify(val, VarTail, (ClientData)0);
                         }
+#endif
                         /*
                          * Resulting string is dynamically allocated, so
@@ -1643 +1722 @@
 
         if (v == (Var *)NIL) {
+//debugkso: fprintf(stderr, "\tv == (Var *)NIL vlen=%d str=%s\n", vlen, str);
+
             if (((vlen == 1) ||
                  (((vlen == 2) && (str[1] == 'F' ||
+#ifdef NMAKE
+                                         str[1] == 'D' || str[1] == 'B' || str[1] == 'R')))) &&
+#else
                                          str[1] == 'D')))) &&
+#endif
                 ((ctxt == VAR_CMD) || (ctxt == VAR_GLOBAL)))
             {