[git commit master 1/1] mktemp: fix "mktemp /path/to/tempfile.XXXXXX"

Denys Vlasenko vda.linux at googlemail.com
Mon Jul 12 01:43:39 UTC 2010


commit: http://git.busybox.net/busybox/commit/?id=04a5d5ad15899161b0ea0e53e0551d12d0401ca3
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

function                                             old     new   delta
mktemp_main                                          152     167     +15

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 debianutils/mktemp.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debianutils/mktemp.c b/debianutils/mktemp.c
index c402114..2c4e196 100644
--- a/debianutils/mktemp.c
+++ b/debianutils/mktemp.c
@@ -50,7 +50,8 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv)
 	opts = getopt32(argv, "dqtp:", &path);
 
 	chp = argv[optind] ? argv[optind] : xstrdup("tmp.XXXXXX");
-	chp = concat_path_file(path, chp);
+	if (chp[0] != '/' || (opts & 8))
+		chp = concat_path_file(path, chp);
 
 	if (opts & 1) { /* -d */
 		if (mkdtemp(chp) == NULL)
-- 
1.7.1



More information about the busybox-cvs mailing list