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

mktemp: don't double up on trailing slashes for -t paths

Browse Source 
This is a minor cosmetic change; re-organize slightly to set tmpdir to
_PATH_TMP if we didn't otherwise have a tmpdir candidate, then check the
trailing char before appending another slash.

While we're here, remove some bogus whitespace and add a test case for
this change.

Obtained from:	https://github.com/apple-oss-distributions/shell_cmds
Sponsored by:	Klara, Inc.
This commit is contained in:
Kyle Evans 2022-11-02 15:29:16 -05:00
parent 5cc5c9254d
commit a6346c02f6
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/mktemp/mktemp.c
View File

@ -120,6 +120,7 @@ main(int argc, char **argv)
if (tflag) {
const char *envtmp;
size_t len;
envtmp = NULL;
@ -131,7 +132,10 @@ main(int argc, char **argv)
if (envtmp != NULL)
tmpdir = envtmp;
if (tmpdir == NULL)
asprintf(&name, "%s%s.XXXXXXXXXX", _PATH_TMP, prefix);
tmpdir = _PATH_TMP;
len = strlen(tmpdir);
if (len > 0 && tmpdir[len - 1] == '/')
asprintf(&name, "%s%s.XXXXXXXXXX", tmpdir, prefix);
else
asprintf(&name, "%s/%s.XXXXXXXXXX", tmpdir, prefix);
/* if this fails, the program is in big trouble already */
@ -142,7 +146,7 @@ main(int argc, char **argv)
errx(1, "cannot generate template");
}
}
/* generate all requested files */
while (name != NULL || argc > 0) {
if (name == NULL) {

14
usr.bin/mktemp/tests/mktemp_test.sh
View File

@ -109,10 +109,24 @@ tmpdir_pflag_noarg_body()
atf_check -o match:"^$tmpdir/foo\..+$" cat tmpname
}
atf_test_case tmpdir_tflag_oneslash
tmpdir_tflag_oneslash_body()
{
tmpdir="$PWD"
# Provided a trailing slash, we shouldn't end up with two trailing
# slashes.
atf_check -o save:tmpname \
env TMPDIR="$tmpdir/" mktemp -t foo
atf_check -o match:"^$tmpdir/foo\..+$" cat tmpname
}
atf_init_test_cases()
{
atf_add_test_case tmpdir_env
atf_add_test_case tmpdir_pflag
atf_add_test_case tmpdir_pflag_dir
atf_add_test_case tmpdir_pflag_noarg
atf_add_test_case tmpdir_tflag_oneslash
}