Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/debianutils/mktemp.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/debianutils/mktemp.c (modified) (1 diff)

branches/2.2.9/mindi-busybox/debianutils/mktemp.c

@@ -7 +7 @@
  * Written by Daniel Jacobowitz <dan@debian.org>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+/* Coreutils 6.12 man page says:
+ *        mktemp [OPTION]... [TEMPLATE]
+ * Create a temporary file or directory, safely, and print its name. If
+ * TEMPLATE is not specified, use tmp.XXXXXXXXXX.
+ * -d, --directory
+ *        create a directory, not a file
+ * -q, --quiet
+ *        suppress diagnostics about file/dir-creation failure
+ * -u, --dry-run
+ *        do not create anything; merely print a name (unsafe)
+ * --tmpdir[=DIR]
+ *        interpret TEMPLATE relative to DIR. If DIR is not specified,
+ *        use  $TMPDIR if set, else /tmp.  With this option, TEMPLATE must
+ *        not be an absolute name. Unlike with -t, TEMPLATE may contain
+ *        slashes, but even here, mktemp still creates only the final com-
+ *        ponent.
+ * -p DIR use DIR as a prefix; implies -t [deprecated]
+ * -t     interpret TEMPLATE as a single file name component, relative  to
+ *        a  directory:  $TMPDIR, if set; else the directory specified via
+ *        -p; else /tmp [deprecated]
+ */
+
 
 #include "libbb.h"
 
-int mktemp_main(int argc, char **argv);
-int mktemp_main(int argc, char **argv)
+int mktemp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int mktemp_main(int argc UNUSED_PARAM, char **argv)
 {
-    unsigned long flags = getopt32(argv, "dqt");
+    const char *path;
     char *chp;
+    unsigned opts;
 
-    if (optind + 1 != argc)
-        bb_show_usage();
+    path = getenv("TMPDIR");
+    if (!path || path[0] == '\0')
+        path = "/tmp";
 
-    chp = argv[optind];
+    /* -q and -t are ignored */
+    opt_complementary = "?1"; /* 1 argument max */
+    opts = getopt32(argv, "dqtp:", &path);
 
-    if (flags & 4) {
-        char *dir = getenv("TMPDIR");
-        if (dir && *dir != '\0')
-            chp = concat_path_file(dir, chp);
-        else
-            chp = concat_path_file("/tmp/", chp);
-    }
+    chp = argv[optind] ? argv[optind] : xstrdup("tmp.XXXXXX");
+    if (!strchr(chp, '/') || (opts & 8))
+        chp = concat_path_file(path, chp);
 
-    if (flags & 1) {
+    if (opts & 1) { /* -d */
         if (mkdtemp(chp) == NULL)
             return EXIT_FAILURE;