Merge branch 'origin/master' (early part)

3 files changed, 14 insertions, 13 deletions

diff --git a/debianutils/Config.src b/debianutils/Config.src
index 9bce0498c..838d8f00c 100644
--- a/debianutils/Config.src
+++ b/debianutils/Config.src
@@ -5,6 +5,8 @@
 
 menu "Debian Utilities"
 
+INSERT
+
 config MKTEMP
         bool "mktemp"
         default y
diff --git a/debianutils/Kbuild.src b/debianutils/Kbuild.src
index bcf6126ad..da34e4e4f 100644
--- a/debianutils/Kbuild.src
+++ b/debianutils/Kbuild.src
@@ -5,6 +5,8 @@
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 lib-y:=
+
+INSERT
 lib-$(CONFIG_MKTEMP)            += mktemp.o
 lib-$(CONFIG_PIPE_PROGRESS)     += pipe_progress.o
 lib-$(CONFIG_RUN_PARTS)         += run_parts.o
diff --git a/debianutils/mktemp.c b/debianutils/mktemp.c
index 0dcb1e826..c40211476 100644
--- a/debianutils/mktemp.c
+++ b/debianutils/mktemp.c
@@ -39,23 +39,20 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv)
 {
         const char *path;
         char *chp;
-        unsigned opt;
+        unsigned opts;
 
+        path = getenv("TMPDIR");
+        if (!path || path[0] == '\0')
+                path = "/tmp";
+
+        /* -q and -t are ignored */
         opt_complementary = "?1"; /* 1 argument max */
-        opt = getopt32(argv, "dqtp:", &path);
-        chp = argv[optind] ? argv[optind] : xstrdup("tmp.XXXXXX");
+        opts = getopt32(argv, "dqtp:", &path);
 
-        if (opt & (4|8)) { /* -t and/or -p */
-                const char *dir = getenv("TMPDIR");
-                if (dir && *dir != '\0')
-                        path = dir;
-                else if (!(opt & 8)) /* no -p */
-                        path = "/tmp/";
-                /* else path comes from -p DIR */
-                chp = concat_path_file(path, chp);
-        }
+        chp = argv[optind] ? argv[optind] : xstrdup("tmp.XXXXXX");
+        chp = concat_path_file(path, chp);
 
-        if (opt & 1) { /* -d */
+        if (opts & 1) { /* -d */
                 if (mkdtemp(chp) == NULL)
                         return EXIT_FAILURE;
         } else {