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

Allow the input line to be NULL, and teach strnsubst() that NULL means to use

Browse Source 
a nil-string.
This commit is contained in:
Juli Mallett 2002-05-30 19:24:08 +00:00
parent e9217a0b8a
commit 986d829b8f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=97619
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.bin/xargs/strnsubst.c
View File

@ -24,6 +24,8 @@ void strnsubst(char **, const char *, const char *, size_t);
* maxsize bytes large. It does not free the string pointed to by str, it
* is up to the calling program to be sure that the original contents of
* str as well as the new contents are handled in an appropriate manner.
* If replstr is NULL, then that internally is changed to a nil-string, so
* that we can still pretend to do somewhat meaningful substitution.
* No value is returned.
*/
void
@ -38,6 +40,9 @@ strnsubst(char **str, const char *match, const char *replstr, size_t maxsize)
if (s2 == NULL)
err(1, "calloc");
if (replstr == NULL)
replstr = "";
if (match == NULL || replstr == NULL || maxsize == strlen(s1)) {
strlcpy(s2, s1, maxsize);
goto done;

6
usr.bin/xargs/xargs.c
View File

@ -454,10 +454,10 @@ prerun(int argc, char **argv)
free(tmp2);
/*
* Free the input line buffer, and create a new dummy.
* Free the input line buffer, if we have one.
*/
free(inpline);
inpline = strdup("");
if (inpline != NULL)
free(inpline);
}
static void