[BACK]Return to var.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / make

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

version 1.9, 1998/07/23 18:49:05 version 1.10, 1998/12/05 00:06:29
Line 1236 
Line 1236 
     Boolean       addSpace;         /* TRUE if need to add a space to the      Boolean       addSpace;         /* TRUE if need to add a space to the
                                      * buffer before adding the trimmed                                       * buffer before adding the trimmed
                                      * word */                                       * word */
     char **av;                      /* word list [first word does not count] */      char **av;                      /* word list */
       char *as;                       /* word list memory */
     int ac, i;      int ac, i;
   
     buf = Buf_Init (0);      buf = Buf_Init (0);
     addSpace = FALSE;      addSpace = FALSE;
   
     av = brk_string(str, &ac, FALSE);      av = brk_string(str, &ac, FALSE, &as);
   
     for (i = 1; i < ac; i++)      for (i = 0; i < ac; i++)
         addSpace = (*modProc)(av[i], addSpace, buf, datum);          addSpace = (*modProc)(av[i], addSpace, buf, datum);
   
       free(as);
       free(av);
     Buf_AddByte (buf, '\0');      Buf_AddByte (buf, '\0');
     str = (char *)Buf_GetAll (buf, (int *)NULL);      str = (char *)Buf_GetAll (buf, (int *)NULL);
     Buf_Destroy (buf, FALSE);      Buf_Destroy (buf, FALSE);
Line 1261 
Line 1264 
  *      uninterpreted) and 2) unescaped $'s that aren't before   *      uninterpreted) and 2) unescaped $'s that aren't before
  *      the delimiter (expand the variable substitution).   *      the delimiter (expand the variable substitution).
  *      Return the expanded string or NULL if the delimiter was missing   *      Return the expanded string or NULL if the delimiter was missing
  *      If pattern is specified, handle escaped ampersants, and replace   *      If pattern is specified, handle escaped ampersands, and replace
  *      unescaped ampersands with the lhs of the pattern.   *      unescaped ampersands with the lhs of the pattern.
  *   *
  * Results:   * Results:
Legend:
Removed from v.1.9  
changed lines
  Added in v.1.10