diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:19:57 +1000 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:19:57 +1000 |
| commit | ec71cb6575290eb6ad716e4f620db445d8e1bcd3 (patch) | |
| tree | 219a5dba000e0ad98ff563bc6f7d45d274d3a178 /debianutils | |
| parent | b5139d7cd8982d9b683cb1babf0bd759076aaab0 (diff) | |
| parent | 6814cbc9288601840aedb372e2bd84dab76ffa43 (diff) | |
| download | busybox-w32-ec71cb6575290eb6ad716e4f620db445d8e1bcd3.tar.gz busybox-w32-ec71cb6575290eb6ad716e4f620db445d8e1bcd3.tar.bz2 busybox-w32-ec71cb6575290eb6ad716e4f620db445d8e1bcd3.zip | |
Merge branch 'origin/master' (early part)
Diffstat (limited to 'debianutils')
| -rw-r--r-- | debianutils/Config.src | 1 | ||||
| -rw-r--r-- | debianutils/mktemp.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/debianutils/Config.src b/debianutils/Config.src index 838d8f00c..cbc09b5ce 100644 --- a/debianutils/Config.src +++ b/debianutils/Config.src | |||
| @@ -83,4 +83,3 @@ config WHICH | |||
| 83 | print out their pathnames. | 83 | print out their pathnames. |
| 84 | 84 | ||
| 85 | endmenu | 85 | endmenu |
| 86 | |||
diff --git a/debianutils/mktemp.c b/debianutils/mktemp.c index 2c4e19670..7ce9f1096 100644 --- a/debianutils/mktemp.c +++ b/debianutils/mktemp.c | |||
| @@ -50,7 +50,7 @@ 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 | if (chp[0] != '/' || (opts & 8)) | 53 | if (!strchr(chp, '/') || (opts & 8)) |
| 54 | chp = concat_path_file(path, chp); | 54 | chp = concat_path_file(path, chp); |
| 55 | 55 | ||
| 56 | if (opts & 1) { /* -d */ | 56 | if (opts & 1) { /* -d */ |