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

Deprecate the FreeBSD make's ":U" (to-upper case) and ":L" (to-lower case)

Browse Source 
modifiers for ":tu" and ":tl" from OSF's ODE, which made its way into
NetBSD's make, which is the source for the Portable Berkeley Make.

Submitted by:	Simon Gerraty <sjg@juniper.net>
This commit is contained in:
David E. O'Brien 2012-05-30 22:23:08 +00:00
parent 614304eccc
commit d81f04d7fa
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=236338
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.bin/make/Makefile
View File

@ -15,7 +15,7 @@ NO_SHARED?= YES
.endif
# Version has the RYYYYMMDDX format, where R is from RELENG_<R>
CFLAGS+=-DMAKE_VERSION=\"5201111300\"
CFLAGS+=-DMAKE_VERSION=\"10201120530\"
# There is no obvious performance improvement currently.
# CFLAGS+=-DUSE_KQUEUE

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

@ -902,6 +902,7 @@ Replaces each word in the variable with its suffix.
Replaces each word in the variable with everything but the last component.
.It Cm :L
Converts variable to lower-case letters.
(deprecated)
.It Cm :M Ns Ar pattern
Select only those words that match the rest of the modifier.
The standard shell wildcard characters
@ -993,8 +994,13 @@ to be replaced in
.Ar new_string .
.It Cm :T
Replaces each word in the variable with its last component.
.It Cm :tl
Converts variable to lower-case letters.
.It Cm :tu
Converts variable to upper-case letters.
.It Cm :U
Converts variable to upper-case letters.
(deprecated)
.It Cm :u
Remove adjacent duplicate words (like
.Xr uniq 1 ) .
@ -1742,6 +1748,19 @@ is set to the same value as
.Va .MAKE ;
support for this may be removed in the future.
.Pp
The use of the
.Cm :L
and
.Cm :U
modifiers are deprecated
in
.Fx 10.0
and the more portable (among Pmake decedents)
.Cm :tl
and
.Cm :tu
should be used instead.
.Pp
Most of the more esoteric features of
.Nm
should probably be avoided for greater compatibility.

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

@ -1746,6 +1746,19 @@ ParseModifier(VarParser *vp, char startc, Var *v, Boolean *freeResult)
case 'C':
newStr = modifier_C(vp, value, v);
break;
case 't':
/* :tl :tu for OSF ODE & NetBSD make compatibility */
switch (vp->ptr[1]) {
case 'l':
vp->ptr++;
goto mod_lower;
break;
case 'u':
vp->ptr++;
goto mod_upper;
break;
}
/* FALLTHROUGH */
default:
if (vp->ptr[1] != endc && vp->ptr[1] != ':') {
#ifdef SUNSHCMD
@ -1774,6 +1787,7 @@ ParseModifier(VarParser *vp, char startc, Var *v, Boolean *freeResult)
switch (vp->ptr[0]) {
case 'L':
mod_lower:
{
const char *cp;
Buffer *buf;
@ -1799,6 +1813,7 @@ ParseModifier(VarParser *vp, char startc, Var *v, Boolean *freeResult)
vp->ptr++;
break;
case 'U':
mod_upper:
{
const char *cp;
Buffer *buf;