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

Make str_concat handle NULL arguments properly (a-la how ODE-2.3.6 make does).

Browse Source 
Submitted by:	jmallett
Inspired by:	CMU BUILDTOOLS4 coredumping, ODE-2.3.6 make(1)
This commit is contained in:
obrien 2002-04-13 10:13:39 +00:00
parent 5d90ef30b0
commit 8e40ecb049
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
usr.bin/make/str.c
View File

@ -96,31 +96,32 @@ str_concat(s1, s2, flags)
char *result;
/* get the length of both strings */
len1 = strlen(s1);
len2 = strlen(s2);
len1 = s1 == NULL ? 0 : strlen(s1);
len2 = s2 == NULL ? 0 : strlen(s2);
/* allocate length plus separator plus EOS */
result = emalloc((u_int)(len1 + len2 + 2));
/* copy first string into place */
memcpy(result, s1, len1);
if (len1)
memcpy(result, s1, len1);
/* add separator character */
if (flags & STR_ADDSPACE) {
result[len1] = ' ';
++len1;
} else if (flags & STR_ADDSLASH) {
result[len1] = '/';
++len1;
if (len1 && len2) {
if (flags & STR_ADDSPACE)
result[len1++] = ' ';
else if (flags & STR_ADDSLASH)
result[len1++] = '/';
}
/* copy second string plus EOS into place */
memcpy(result + len1, s2, len2 + 1);
if (len2)
memcpy(result + len1, s2, len2 + 1);
/* free original strings */
if (flags & STR_DOFREE) {
(void)free(__DECONST(void *, s1));
(void)free(__DECONST(void *, s2));
(void)efree(__DECONST(void *, s1));
(void)efree(__DECONST(void *, s2));
}
return(result);
}