diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-07-25 00:13:27 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-07-25 00:13:27 +0200 |
commit | 503a07cab24a1e58099a04970babd2b761469449 (patch) | |
tree | f96b01fd405adcbcbeed0086389da27bd1a07ccc /debianutils | |
parent | b2d95147c989448f23cc59c63b83e2d89f0bd9cd (diff) | |
download | busybox-w32-503a07cab24a1e58099a04970babd2b761469449.tar.gz busybox-w32-503a07cab24a1e58099a04970babd2b761469449.tar.bz2 busybox-w32-503a07cab24a1e58099a04970babd2b761469449.zip |
Apply post-1.17.0 fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'debianutils')
-rw-r--r-- | debianutils/mktemp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/debianutils/mktemp.c b/debianutils/mktemp.c index c40211476..2c4e19670 100644 --- a/debianutils/mktemp.c +++ b/debianutils/mktemp.c | |||
@@ -50,7 +50,8 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv) | |||
50 | opts = getopt32(argv, "dqtp:", &path); | 50 | opts = getopt32(argv, "dqtp:", &path); |
51 | 51 | ||
52 | chp = argv[optind] ? argv[optind] : xstrdup("tmp.XXXXXX"); | 52 | chp = argv[optind] ? argv[optind] : xstrdup("tmp.XXXXXX"); |
53 | chp = concat_path_file(path, chp); | 53 | if (chp[0] != '/' || (opts & 8)) |
54 | chp = concat_path_file(path, chp); | ||
54 | 55 | ||
55 | if (opts & 1) { /* -d */ | 56 | if (opts & 1) { /* -d */ |
56 | if (mkdtemp(chp) == NULL) | 57 | if (mkdtemp(chp) == NULL) |