d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6404f697a0
freebsd-skq/usr.bin/make/var.h

86 lines
3.4 KiB
C
Raw Normal View History

Split var.c into var.c and var_modify.c and move all the modification funcs to var_modify.c, for readability. constify some low hanging fruit (string manipulation functions) and the upper layers appropriately. No longer use the private strstr(3) implementation, while changing string code. Tested by: lots of successful make buildworld.
2002-10-28 23:33:57 +00:00
/*-
* Copyright (c) 2002 Juli Mallett.
* Copyright (c) 1988, 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Adam de Boor.
*
* 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.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
*
* $FreeBSD$
*/
Clean up include files and file including. Split nonints.h into pieces that get included just where they are needed. All headers include the headers that they need to compile (just with an empty .c file). Sort includes alphabetically where apropriate and fix some duplicate commenting for struct Job, struct GNode and struct Shell by removing one version and inlining the comments into the structure declaration (the comments have been somewhat outdated). This patch does not contain functional changes (checked with md5). Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-02-01 10:50:37 +00:00
#ifndef var_h_9cccafce
#define var_h_9cccafce
Convert several typedefs from beeing pointers to structs to be the structs itself. This will ease constification (think of what 'const Ptr foo' means if Ptr is a pointer to a struct). Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-02-02 07:36:18 +00:00
struct Buffer;
Move variable printing from main.c to var.c Submitted by: Max Okumoto <okumoto@ucsd.edu> (7.233)
2005-05-12 14:31:42 +00:00
struct GNode;
struct List;
Clean up include files and file including. Split nonints.h into pieces that get included just where they are needed. All headers include the headers that they need to compile (just with an empty .c file). Sort includes alphabetically where apropriate and fix some duplicate commenting for struct Job, struct GNode and struct Shell by removing one version and inlining the comments into the structure declaration (the comments have been somewhat outdated). This patch does not contain functional changes (checked with md5). Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-02-01 10:50:37 +00:00
Move the declaration of VAR_CMD and VAR_GLOBAL from globals.h to var.h Patch: 7.196 Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-05-10 11:58:52 +00:00
/* Variables defined in a global context, e.g in the Makefile itself */
extern struct GNode *VAR_GLOBAL;
/* Variables defined on the command line */
extern struct GNode *VAR_CMD;
Move declarations of variables belonging to the variable module from globals.h into var.h. Submitted by: Max Okumoto <okumoto@ucsd.edu> (7.209)
2005-05-10 14:16:40 +00:00
/*
* Value returned by Var_Parse when an error is encountered. It actually
* points to an empty string, so naive callers needn't worry about it.
*/
extern char var_Error[];
Move some global variables to the correct files. Submitted by: Max Okumoto <okumoto@ucsd.edu> (7.232)
2005-05-12 11:58:39 +00:00
/*
* TRUE if environment should be searched for all variables before
* the global context
*/
extern Boolean checkEnvFirst;
Move declarations of variables belonging to the variable module from globals.h into var.h. Submitted by: Max Okumoto <okumoto@ucsd.edu> (7.209)
2005-05-10 14:16:40 +00:00
/* Do old-style variable substitution */
extern Boolean oldVars;
Sort prototypes. Patch: 7.155 Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-03-22 08:01:04 +00:00
void Var_Append(const char *, const char *, struct GNode *);
void Var_Delete(const char *, struct GNode *);
Move some debugging code from targ.c to var.c where it actually belongs. Patch: 7.192 Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-05-10 08:14:26 +00:00
void Var_Dump(void);
Sort prototypes. Patch: 7.155 Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-03-22 08:01:04 +00:00
Boolean Var_Exists(const char *, struct GNode *);
Introduce a new pseudo-target .EXPORTVAR which allows to put a make macro into the environment of programs executed by make. This has approximately the same function as gmake's export directive. The form of a pseudo target was deliberately choosen to minimize work for POSIX compatibility (Makefiles are not allowed to use any targets starting with a dot and consisting only of uppercase letters except those specified in the standard when they want POSIX compatible behaviour, so such a Makefile can never contain .EXPORTVAR.) Change the handling of macros coming from the environment: instead of asking the environment for each variable we could not find otherwise put all the environment variables in a special variable environment just at start up. This has been tested on the ports cluster by kris. Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-05-06 18:30:06 +00:00
void Var_Init(char **);
Make make a little bit more POSIXish with regard to option parsing: take everything after -- as either a macro assignment or a target. Note that make still reorders arguments before --: anything starting with a dash is considered an option, anything which contains an equal sign is considered a macro assignment and everything else a target. This still is not POSIX with regard to the options, but it will probably not change because it has been make's behaviour for ages. Add a new function Var_Match() that correctly skips a macro call by just doing the same as Var_Subst() but without producing output. This will help making the parser more robust. Patches: 7.190,7.191 Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-05-10 08:06:13 +00:00
size_t Var_Match(const char [], struct GNode *);
Sort prototypes. Patch: 7.155 Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-03-22 08:01:04 +00:00
char *Var_Parse(const char *, struct GNode *, Boolean, size_t *, Boolean *);
Move variable printing from main.c to var.c Submitted by: Max Okumoto <okumoto@ucsd.edu> (7.233)
2005-05-12 14:31:42 +00:00
void Var_Print(struct Lst *, Boolean);
Sort prototypes. Patch: 7.155 Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-03-22 08:01:04 +00:00
void Var_Set(const char *, const char *, struct GNode *);
Replace a lot of Var_Set(..., VAR_GLOBAL) by Var_SetGlobal(). Submitted by: Max Okumoto <okumoto@ucsd.edu> (7.237)
2005-05-12 14:47:22 +00:00
void Var_SetGlobal(const char *, const char *);
Introduce a new pseudo-target .EXPORTVAR which allows to put a make macro into the environment of programs executed by make. This has approximately the same function as gmake's export directive. The form of a pseudo target was deliberately choosen to minimize work for POSIX compatibility (Makefiles are not allowed to use any targets starting with a dot and consisting only of uppercase letters except those specified in the standard when they want POSIX compatible behaviour, so such a Makefile can never contain .EXPORTVAR.) Change the handling of macros coming from the environment: instead of asking the environment for each variable we could not find otherwise put all the environment variables in a special variable environment just at start up. This has been tested on the ports cluster by kris. Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-05-06 18:30:06 +00:00
void Var_SetEnv(const char *, struct GNode *);
Split Var_Subst() into two functions: Var_SubstOnly() which substitutes only one variable and Var_Subst() which substitutes all. Split out the test whether a variable should not be expanded into match_var(). Make access to the input string consistently using str[]. Remove two unused functions: Var_GetTail() and Var_GetHead(). Patches: 7.184-7.189 Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-05-09 14:06:04 +00:00
struct Buffer *Var_Subst(const char *, struct GNode *, Boolean);
Var_SubstOnly() is only used to subsitute a variable from the global context (and only in one place to substitute the .for variable). Therefor there is no need to pass the context as a parameter. Patch: 7.197 Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-05-10 12:02:15 +00:00
struct Buffer *Var_SubstOnly(const char *, const char *, Boolean);
The caller of Var_Value() should not change the variable value. Make this clear by constifying the return value. Obtained from: DragonFlyBSD
2005-05-24 16:05:51 +00:00
const char *Var_Value(const char [], struct GNode *);
Split var.c into var.c and var_modify.c and move all the modification funcs to var_modify.c, for readability. constify some low hanging fruit (string manipulation functions) and the upper layers appropriately. No longer use the private strstr(3) implementation, while changing string code. Tested by: lots of successful make buildworld.
2002-10-28 23:33:57 +00:00
Clean up include files and file including. Split nonints.h into pieces that get included just where they are needed. All headers include the headers that they need to compile (just with an empty .c file). Sort includes alphabetically where apropriate and fix some duplicate commenting for struct Job, struct GNode and struct Shell by removing one version and inlining the comments into the structure declaration (the comments have been somewhat outdated). This patch does not contain functional changes (checked with md5). Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-02-01 10:50:37 +00:00
#endif /* var_h_9cccafce */
Reference in New Issue Copy Permalink