[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.16 and 1.17

version 1.16, 1999/12/06 22:24:32 version 1.17, 1999/12/06 22:27:37
Line 2 
Line 2 
 /*      $NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $        */  /*      $NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $        */
   
 /*  /*
    * Copyright (c) 1999 Marc Espie.
    *
    * Extensive code modifications for the OpenBSD project.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
    * are met:
    * 1. Redistributions of source code must retain the above copyright
    *    notice, this list of conditions and the following disclaimer.
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in the
    *    documentation and/or other materials provided with the distribution.
    *
    * THIS SOFTWARE IS PROVIDED BY THE OPENBSD PROJECT AND CONTRIBUTORS
    * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OPENBSD
    * PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
    * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
    * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
    * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
    * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    */
   
   /*
  * Copyright (c) 1988, 1989, 1990, 1993   * Copyright (c) 1988, 1989, 1990, 1993
  *      The Regents of the University of California.  All rights reserved.   *      The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1989 by Berkeley Softworks   * Copyright (c) 1989 by Berkeley Softworks
Line 128 
Line 155 
  * The four contexts are searched in the reverse order from which they are   * The four contexts are searched in the reverse order from which they are
  * listed.   * listed.
  */   */
 GNode          *VAR_GLOBAL;   /* variables from the makefile */  GNode           *VAR_GLOBAL;    /* variables from the makefile */
 GNode          *VAR_CMD;      /* variables defined on the command-line */  GNode           *VAR_CMD;       /* variables defined on the command-line */
   static GNode    *VAR_ENV;       /* variables read from env */
   
 static Lst      allVars;      /* List of all variables */  static Lst      allVars;      /* List of all variables */
   
Line 143 
Line 171 
     int           flags;        /* miscellaneous status flags */      int           flags;        /* miscellaneous status flags */
 #define VAR_IN_USE      1           /* Variable's value currently being used.  #define VAR_IN_USE      1           /* Variable's value currently being used.
                                      * Used to avoid recursion */                                       * Used to avoid recursion */
 #define VAR_FROM_ENV    2           /* Variable comes from the environment */  
 #define VAR_JUNK        4           /* Variable is a junk variable that  #define VAR_JUNK        4           /* Variable is a junk variable that
                                      * should be destroyed when done with                                       * should be destroyed when done with
                                      * it. Used by Var_Parse for undefined,                                       * it. Used by Var_Parse for undefined,
Line 177 
Line 204 
   
 static int VarCmp __P((ClientData, ClientData));  static int VarCmp __P((ClientData, ClientData));
 static Var *VarFind __P((char *, GNode *, int));  static Var *VarFind __P((char *, GNode *, int));
 static void VarAdd __P((char *, char *, GNode *));  static Var *VarAdd __P((char *, char *, GNode *));
 static void VarDelete __P((ClientData));  static void VarDelete __P((ClientData));
 static Boolean VarHead __P((char *, Boolean, Buffer, ClientData));  static Boolean VarHead __P((char *, Boolean, Buffer, ClientData));
 static Boolean VarTail __P((char *, Boolean, Buffer, ClientData));  static Boolean VarTail __P((char *, Boolean, Buffer, ClientData));
Line 235 
Line 262 
  *      NIL if the variable does not exist.   *      NIL if the variable does not exist.
  *   *
  * Side Effects:   * Side Effects:
  *      None   *      Caches env variables in the VAR_ENV context.
  *-----------------------------------------------------------------------   *-----------------------------------------------------------------------
  */   */
 static Var *  static Var *
Line 247 
Line 274 
                                  * FIND_CMD set means to look in the VAR_CMD                                   * FIND_CMD set means to look in the VAR_CMD
                                  * context also.                                   * context also.
                                  * FIND_ENV set means to look in the                                   * FIND_ENV set means to look in the
                                  * environment */                                   * environment/VAR_ENV context.  */
 {  {
     LstNode             var;      LstNode             var;
     Var                 *v;      Var                 *v;
Line 292 
Line 319 
      * look for it in VAR_CMD, VAR_GLOBAL and the environment, in that order,       * look for it in VAR_CMD, VAR_GLOBAL and the environment, in that order,
      * depending on the FIND_* flags in 'flags'       * depending on the FIND_* flags in 'flags'
      */       */
     var = Lst_Find (ctxt->context, (ClientData)name, VarCmp);      var = Lst_Find(ctxt->context, (ClientData)name, VarCmp);
   
     if ((var == NILLNODE) && (flags & FIND_CMD) && (ctxt != VAR_CMD)) {      if ((var == NILLNODE) && (flags & FIND_CMD) && (ctxt != VAR_CMD))
         var = Lst_Find (VAR_CMD->context, (ClientData)name, VarCmp);          var = Lst_Find (VAR_CMD->context, (ClientData)name, VarCmp);
     }  
     if (!checkEnvFirst && (var == NILLNODE) && (flags & FIND_GLOBAL) &&      if (!checkEnvFirst && (var == NILLNODE) && (flags & FIND_GLOBAL) &&
         (ctxt != VAR_GLOBAL))          (ctxt != VAR_GLOBAL)) {
     {  
         var = Lst_Find (VAR_GLOBAL->context, (ClientData)name, VarCmp);          var = Lst_Find (VAR_GLOBAL->context, (ClientData)name, VarCmp);
     }      }
     if ((var == NILLNODE) && (flags & FIND_ENV)) {      if ((var == NILLNODE) && (flags & FIND_ENV)) {
         char *env;          var = Lst_Find(VAR_ENV->context, (ClientData)name, VarCmp);
           if (var == NILLNODE) {
               char *env;
   
         if ((env = getenv (name)) != NULL) {              if ((env = getenv(name)) != NULL)
             size_t      len;                  return VarAdd(name, env, VAR_ENV);
   
             v = (Var *) emalloc(sizeof(Var));  
             v->name = estrdup(name);  
   
             len = strlen(env);  
   
             v->val = Buf_Init(len);  
             Buf_AddChars(v->val, len, env);  
   
             v->flags = VAR_FROM_ENV;  
             return (v);  
         } else if (checkEnvFirst && (flags & FIND_GLOBAL) &&  
                    (ctxt != VAR_GLOBAL))  
         {  
             var = Lst_Find (VAR_GLOBAL->context, (ClientData)name, VarCmp);  
             if (var == NILLNODE) {  
                 return ((Var *) NIL);  
             } else {  
                 return ((Var *)Lst_Datum(var));  
             }  
         } else {  
             return((Var *)NIL);  
         }          }
     } else if (var == NILLNODE) {      }
       if (var == NILLNODE && checkEnvFirst && (flags & FIND_GLOBAL) &&
                      (ctxt != VAR_GLOBAL))
               var = Lst_Find(VAR_GLOBAL->context, (ClientData)name, VarCmp);
       if (var == NILLNODE)
         return ((Var *) NIL);          return ((Var *) NIL);
     } else {      else
         return ((Var *) Lst_Datum (var));          return ((Var *) Lst_Datum (var));
     }  
 }  }
   
 /*-  /*-
Line 343 
Line 351 
  *      Add a new variable of name name and value val to the given context   *      Add a new variable of name name and value val to the given context
  *   *
  * Results:   * Results:
  *      None   *      The added variable
  *   *
  * Side Effects:   * Side Effects:
  *      The new variable is placed at the front of the given context   *      The new variable is placed at the front of the given context
Line 351 
Line 359 
  *      safely be freed.   *      safely be freed.
  *-----------------------------------------------------------------------   *-----------------------------------------------------------------------
  */   */
 static void  static Var *
 VarAdd (name, val, ctxt)  VarAdd(name, val, ctxt)
     char           *name;       /* name of variable to add */      char           *name;       /* name of variable to add */
     char           *val;        /* value to set it to */      char           *val;        /* value to set it to */
     GNode          *ctxt;       /* context in which to set it */      GNode          *ctxt;       /* context in which to set it */
Line 375 
Line 383 
     if (DEBUG(VAR)) {      if (DEBUG(VAR)) {
         printf("%s:%s = %s\n", ctxt->name, name, val);          printf("%s:%s = %s\n", ctxt->name, name, val);
     }      }
       return v;
 }  }
   
   
Line 473 
Line 482 
      */       */
     v = VarFind (name, ctxt, 0);      v = VarFind (name, ctxt, 0);
     if (v == (Var *) NIL) {      if (v == (Var *) NIL) {
         VarAdd (name, val, ctxt);          (void)VarAdd(name, val, ctxt);
     } else {      } else {
         Buf_Discard(v->val, Buf_Size(v->val));          Buf_Discard(v->val, Buf_Size(v->val));
         Buf_AddChars(v->val, strlen(val), val);          Buf_AddChars(v->val, strlen(val), val);
Line 484 
Line 493 
     }      }
     /*      /*
      * Any variables given on the command line are automatically exported       * Any variables given on the command line are automatically exported
      * to the environment (as per POSIX standard)       * to the environment (as per POSIX standard).
        * We put them into the env cache directly.
        * (Note that additions to VAR_CMD occur very early, so VAR_ENV is
        * actually empty at this point).
      */       */
     if (ctxt == VAR_CMD) {      if (ctxt == VAR_CMD) {
         setenv(name, val, 1);          setenv(name, val, 1);
           (void)VarAdd(name, val, VAR_ENV);
     }      }
 }  }
   
Line 524 
Line 537 
     v = VarFind (name, ctxt, (ctxt == VAR_GLOBAL) ? FIND_ENV : 0);      v = VarFind (name, ctxt, (ctxt == VAR_GLOBAL) ? FIND_ENV : 0);
   
     if (v == (Var *) NIL) {      if (v == (Var *) NIL) {
         VarAdd (name, val, ctxt);          (void)VarAdd(name, val, ctxt);
     } else {      } else {
         Buf_AddChar(v->val, ' ');          Buf_AddChar(v->val, ' ');
         Buf_AddChars(v->val, strlen(val), val);          Buf_AddChars(v->val, strlen(val), val);
Line 534 
Line 547 
                    Buf_GetAll(v->val, NULL));                     Buf_GetAll(v->val, NULL));
         }          }
   
         if (v->flags & VAR_FROM_ENV) {  
             /*  
              * If the original variable came from the environment, we  
              * have to install it in the global context (we could place  
              * it in the environment, but then we should provide a way to  
              * export other variables...)  
              */  
             v->flags &= ~VAR_FROM_ENV;  
             Lst_AtFront(ctxt->context, (ClientData)v);  
         }  
     }      }
 }  }
   
Line 569 
Line 572 
   
     v = VarFind(name, ctxt, FIND_CMD|FIND_GLOBAL|FIND_ENV);      v = VarFind(name, ctxt, FIND_CMD|FIND_GLOBAL|FIND_ENV);
   
     if (v == (Var *)NIL) {      if (v == (Var *)NIL)
         return(FALSE);          return FALSE;
     } else if (v->flags & VAR_FROM_ENV) {      else
         free(v->name);          return TRUE;
         Buf_Destroy(v->val, TRUE);  
         free((char *)v);  
     }  
     return(TRUE);  
 }  }
   
 /*-  /*-
Line 603 
Line 602 
     *frp = NULL;      *frp = NULL;
     if (v != (Var *) NIL) {      if (v != (Var *) NIL) {
         char *p = Buf_GetAll(v->val, NULL);          char *p = Buf_GetAll(v->val, NULL);
         if (v->flags & VAR_FROM_ENV) {  
             Buf_Destroy(v->val, FALSE);  
             free((Address) v);  
             *frp = p;  
         }  
         return p;          return p;
     } else {      } else
         return ((char *) NULL);          return NULL;
     }  
 }  }
   
 /*-  /*-
Line 2106 
Line 2099 
         *tstr = endc;          *tstr = endc;
     }      }
   
     if (v->flags & VAR_FROM_ENV) {      if (v->flags & VAR_JUNK) {
         Boolean   destroy = FALSE;  
   
         if (str != Buf_GetAll(v->val, NULL)) {  
             destroy = TRUE;  
         } else {  
             /*  
              * Returning the value unmodified, so tell the caller to free  
              * the thing.  
              */  
             *freePtr = TRUE;  
         }  
         Buf_Destroy(v->val, destroy);  
         free((Address)v);  
     } else if (v->flags & VAR_JUNK) {  
         /*          /*
          * Perform any free'ing needed and set *freePtr to FALSE so the caller           * Perform any free'ing needed and set *freePtr to FALSE so the caller
          * doesn't try to free a static pointer.           * doesn't try to free a static pointer.
Line 2375 
Line 2354 
 void  void
 Var_Init ()  Var_Init ()
 {  {
     VAR_GLOBAL = Targ_NewGN ("Global");      VAR_GLOBAL = Targ_NewGN("Global");
     VAR_CMD = Targ_NewGN ("Command");      VAR_CMD = Targ_NewGN("Command");
       VAR_ENV = Targ_NewGN("Environment");
     allVars = Lst_Init(FALSE);      allVars = Lst_Init(FALSE);
   
 }  }
Legend:
Removed from v.1.16  
changed lines
  Added in v.1.17