[BACK]Return to cond.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / usr.bin / make

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/usr.bin/make/cond.c between version 1.71 and 1.72

version 1.71, 2015/12/02 00:28:24 version 1.72, 2016/01/09 00:55:17
Line 289  CondGetArg(char **linePtr, char **argPtr
Line 289  CondGetArg(char **linePtr, char **argPtr
             int         len;              int         len;
             void        *freeIt;              void        *freeIt;
   
             cp2 = Var_Parse(cp, VAR_CMD, TRUE, TRUE, &len, &freeIt);              cp2 = Var_Parse(cp, VAR_CMD, TRUE, TRUE, FALSE, &len, &freeIt);
             Buf_AddBytes(&buf, strlen(cp2), cp2);              Buf_AddBytes(&buf, strlen(cp2), cp2);
             if (freeIt)              if (freeIt)
                 free(freeIt);                  free(freeIt);
Line 575  CondGetString(Boolean doEval, Boolean *q
Line 575  CondGetString(Boolean doEval, Boolean *q
         case '$':          case '$':
             /* if we are in quotes, then an undefined variable is ok */              /* if we are in quotes, then an undefined variable is ok */
             str = Var_Parse(condExpr, VAR_CMD, (qt ? 0 : doEval),              str = Var_Parse(condExpr, VAR_CMD, (qt ? 0 : doEval),
                             TRUE, &len, freeIt);                              TRUE, FALSE, &len, freeIt);
             if (str == var_Error) {              if (str == var_Error) {
                 if (*freeIt) {                  if (*freeIt) {
                     free(*freeIt);                      free(*freeIt);
Line 827  get_mpt_arg(char **linePtr, char **argPt
Line 827  get_mpt_arg(char **linePtr, char **argPt
     /* We do all the work here and return the result as the length */      /* We do all the work here and return the result as the length */
     *argPtr = NULL;      *argPtr = NULL;
   
     val = Var_Parse(cp - 1, VAR_CMD, FALSE, TRUE, &length, &freeIt);      val = Var_Parse(cp - 1, VAR_CMD, FALSE, TRUE, FALSE, &length, &freeIt);
     /*      /*
      * Advance *linePtr to beyond the closing ). Note that       * Advance *linePtr to beyond the closing ). Note that
      * we subtract one because 'length' is calculated from 'cp - 1'.       * we subtract one because 'length' is calculated from 'cp - 1'.

Legend:
Removed from v.1.71  
changed lines
  Added in v.1.72

CVSweb <webmaster@jp.NetBSD.org>