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

Implement the O modifier. The O modifier sorts the words in a

Browse Source 
variable. The implementation is based upon the patch sent to
arch@, but modified to be compatible with NetBSD. The modifier
that does a reverse sort has been dropped for now, but the
ability to add one later has been preserved.
This commit is contained in:
Marcel Moolenaar 2003-09-18 03:15:57 +00:00
parent 417a26a154
commit e964232cd5
1 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -606,6 +606,48 @@ VarModify (char *str, Boolean (*modProc)(const char *, Boolean, Buffer, void *),
return (str);
}
/*-
*-----------------------------------------------------------------------
* VarSortWords --
* Sort the words in the string.
*
* Input:
* str String whose words should be sorted
* cmp A comparison function to control the ordering
*
* Results:
* A string containing the words sorted
*
* Side Effects:
* None.
*
*-----------------------------------------------------------------------
*/
static char *
VarSortWords(char *str, int (*cmp)(const void *, const void *))
{
Buffer buf;
char **av;
int ac, i;
buf = Buf_Init(0);
av = brk_string(str, &ac, FALSE);
qsort((void*)(av + 1), ac - 1, sizeof(char*), cmp);
for (i = 1; i < ac; i++) {
Buf_AddBytes(buf, strlen(av[i]), (Byte *)av[i]);
Buf_AddByte(buf, (Byte)((i < ac - 1) ? ' ' : '\0'));
}
str = (char *)Buf_GetAll(buf, (int *)NULL);
Buf_Destroy(buf, FALSE);
return (str);
}
static int
SortIncreasing(const void *l, const void *r)
{
return (strcmp(*(const char* const*)l, *(const char* const*)r));
}
/*-
*-----------------------------------------------------------------------
* VarGetPattern --
@ -1114,7 +1156,7 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, int *lengthPtr, Boolean *freePtr)
DEBUGF(VAR, ("Applying :%c to \"%s\"\n", *tstr, str));
switch (*tstr) {
case 'U':
case 'U':
if (tstr[1] == endc || tstr[1] == ':') {
Buffer buf;
buf = Buf_Init(MAKE_BSIZE);
@ -1448,6 +1490,14 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, int *lengthPtr, Boolean *freePtr)
free(pattern.matches);
break;
}
case 'O':
if (tstr[1] == endc || tstr[1] == ':') {
newStr = VarSortWords(str, SortIncreasing);
cp = tstr + 1;
termc = *cp;
break;
}
/* FALLTHROUGH */
case 'Q':
if (tstr[1] == endc || tstr[1] == ':') {
newStr = VarQuote (str);