src/usr.bin/make/var.c - diff

Return to var.c CVS log

Up to [local] / src / usr.bin / make

Diff for /src/usr.bin/make/var.c between version 1.10 and 1.11

-version 1.10, 1998/12/05 00:06:29
+version 1.11, 1999/09/25 14:44:00
 Line 614
 Line 614
 Line 614
  /*-
   *-----------------------------------------------------------------------
+  * VarUppercase --
+  *      Place the Upper cased word 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 word is added to the buffer.
+  *
+  *-----------------------------------------------------------------------
+  */
+ static Boolean
+ VarUppercase (word, addSpace, buf, dummy)
+     char          *word;        /* Word to Upper Case */
+     Boolean       addSpace;     /* True if need to add a space to the buffer
+                                  * before sticking in the head */
+     Buffer        buf;          /* Buffer in which to store it */
+     ClientData    dummy;
+ {
+     size_t len = strlen(word);
+     if (addSpace) {
+         Buf_AddByte (buf, (Byte)' ');
+     }
+     while (len--) {
+         Buf_AddByte (buf, toupper(*word++));
+     }
+     return (TRUE);
+ }
+ /*-
+  *-----------------------------------------------------------------------
+  * VarLowercase --
+  *      Place the Lower cased word 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 word is added to the buffer.
+  *
+  *-----------------------------------------------------------------------
+  */
+ static Boolean
+ VarLowercase (word, addSpace, buf, dummy)
+     char          *word;        /* Word to Lower Case */
+     Boolean       addSpace;     /* True if need to add a space to the buffer
+                                  * before sticking in the head */
+     Buffer        buf;          /* Buffer in which to store it */
+     ClientData    dummy;
+ {
+     size_t len = strlen(word);
+     if (addSpace) {
+         Buf_AddByte (buf, (Byte)' ');
+     }
+     while (len--) {
+         Buf_AddByte (buf, tolower(*word++));
+     }
+     return (TRUE);
+ }
+ /*-
+  *-----------------------------------------------------------------------
   * VarHead --
   *      Remove the tail of the given word and place the result in the given
   *      buffer.
-Line 1893
+Line 1961
 Line 1893
 Line 1961
                  case 'R':
                      if (tstr[1] == endc || tstr[1] == ':') {
                          newStr = VarModify (str, VarRoot, (ClientData)0);
+                         cp = tstr + 1;
+                         termc = *cp;
+                         break;
+                     }
+                     /*FALLTHRU*/
+                 case 'U':
+                     if (tstr[1] == endc || tstr[1] == ':') {
+                         newStr = VarModify (str, VarUppercase, (ClientData)0);
+                         cp = tstr + 1;
+                         termc = *cp;
+                         break;
+                     }
+                     /*FALLTHRU*/
+                 case 'L':
+                     if (tstr[1] == endc || tstr[1] == ':') {
+                         newStr = VarModify (str, VarLowercase, (ClientData)0);
                          cp = tstr + 1;
                          termc = *cp;
                          break;