From 67d9ea5a81c8083875ac7420d7e6a62766b48b6f Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Thu, 12 Feb 2015 16:41:59 -0600 Subject: Fix bug introduced by last commit (print template instead of toybuf). Also, xstrdup() the unmodified template because changing the environment string could make the changed version show up in "ps". --- toys/lsb/mktemp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/toys/lsb/mktemp.c b/toys/lsb/mktemp.c index f756ffe6..cc426656 100644 --- a/toys/lsb/mktemp.c +++ b/toys/lsb/mktemp.c @@ -40,11 +40,14 @@ void mktemp_main(void) if (!TT.tmpdir) TT.tmpdir = getenv("TMPDIR"); if (!TT.tmpdir) TT.tmpdir = "/tmp"; - if (!strchr(template, '/')) template = xmprintf("%s/%s", TT.tmpdir, template); + template = strchr(template, '/') ? xstrdup(template) + : xmprintf("%s/%s", TT.tmpdir, template); if (d_flag ? !mkdtemp(template) : mkstemp(template) == -1) { if (toys.optflags & FLAG_q) toys.exitval = 1; else perror_exit("Failed to create %s %s/%s", d_flag ? "directory" : "file", TT.tmpdir, template); - } else xputs(toybuf); + } else xputs(template); + + if (CFG_TOYBOX_FREE) free(template); } -- cgit v1.2.3