d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add "-V '${VAR}'" variable expansion from Portable Berkeley Make.

Browse Source 
Submitted by:	Simon Gerraty <sjg@juniper.net>
This commit is contained in:
David E. O'Brien 2012-05-31 00:36:56 +00:00
parent 65403eb28f
commit b3dc6c07e2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=236346
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.bin/make/make.1
View File

@ -320,6 +320,11 @@ Do not build any targets.
Multiple instances of this option may be specified;
the variables will be printed one per line,
with a blank line for each null or undefined variable.
If
.Ar variable
contains a
.Sq Ic $
then the value will be expanded before printing.
.It Fl v
Be extra verbose.
Print any extra information.

14
usr.bin/make/var.c
View File

@ -2593,7 +2593,7 @@ void
Var_Print(Lst *vlist, Boolean expandVars)
{
LstNode *n;
const char *name;
char *name;
LST_FOREACH(n, vlist) {
name = Lst_Datum(n);
@ -2601,13 +2601,17 @@ Var_Print(Lst *vlist, Boolean expandVars)
char *value;
char *v;
v = emalloc(strlen(name) + 1 + 3);
sprintf(v, "${%s}", name);
if (*name == '$') {
v = name;
} else {
v = emalloc(strlen(name) + 1 + 3);
sprintf(v, "${%s}", name);
}
value = Buf_Peel(Var_Subst(v, VAR_GLOBAL, FALSE));
printf("%s\n", value);
free(v);
if (v != name)
free(v);
free(value);
} else {
const char *value = Var_Value(name, VAR_GLOBAL);