Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/debianutils/mktemp.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/debianutils/mktemp.c (modified) (3 diffs)

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

@@ -32 +32 @@
  */
 
+//usage:#define mktemp_trivial_usage
+//usage:       "[-dt] [-p DIR] [TEMPLATE]"
+//usage:#define mktemp_full_usage "\n\n"
+//usage:       "Create a temporary file with name based on TEMPLATE and print its name.\n"
+//usage:       "TEMPLATE must end with XXXXXX (e.g. [/dir/]nameXXXXXX).\n"
+//usage:       "Without TEMPLATE, -t tmp.XXXXXX is assumed.\n"
+//usage:     "\n    -d  Make directory, not file"
+//usage:     "\n    -q  Fail silently on errors"
+//usage:     "\n    -t  Prepend base directory name to TEMPLATE"
+//usage:     "\n    -p DIR  Use DIR as a base directory (implies -t)"
+//usage:     "\n    -u  Do not create anything; print a name"
+//usage:     "\n"
+//usage:     "\nBase directory is: -p DIR, else $TMPDIR, else /tmp"
+//usage:
+//usage:#define mktemp_example_usage
+//usage:       "$ mktemp /tmp/temp.XXXXXX\n"
+//usage:       "/tmp/temp.mWiLjM\n"
+//usage:       "$ ls -la /tmp/temp.mWiLjM\n"
+//usage:       "-rw-------    1 andersen andersen        0 Apr 25 17:10 /tmp/temp.mWiLjM\n"
 
 #include "libbb.h"
@@ -41 +60 @@
     char *chp;
     unsigned opts;
+    enum {
+        OPT_d = 1 << 0,
+        OPT_q = 1 << 1,
+        OPT_t = 1 << 2,
+        OPT_p = 1 << 3,
+        OPT_u = 1 << 4,
+    };
 
     path = getenv("TMPDIR");
@@ -46 +72 @@
         path = "/tmp";
 
-    /* -q and -t are ignored */
     opt_complementary = "?1"; /* 1 argument max */
-    opts = getopt32(argv, "dqtp:", &path);
+    opts = getopt32(argv, "dqtp:u", &path);
 
-    chp = argv[optind] ? argv[optind] : xstrdup("tmp.XXXXXX");
-    if (!strchr(chp, '/') || (opts & 8))
+    chp = argv[optind];
+    if (!chp) {
+        /* GNU coreutils 8.4:
+         * bare "mktemp" -> "mktemp -t tmp.XXXXXX"
+         */
+        chp = xstrdup("tmp.XXXXXX");
+        opts |= OPT_t;
+    }
+#if 0
+    /* Don't allow directory separator in template */
+    if ((opts & OPT_t) && bb_basename(chp) != chp) {
+        errno = EINVAL;
+        goto error;
+    }
+#endif
+    if (opts & (OPT_t|OPT_p))
         chp = concat_path_file(path, chp);
 
-    if (opts & 1) { /* -d */
+    if (opts & OPT_u) {
+        chp = mktemp(chp);
+        if (chp[0] == '\0')
+            goto error;
+    } else if (opts & OPT_d) {
         if (mkdtemp(chp) == NULL)
-            return EXIT_FAILURE;
+            goto error;
     } else {
         if (mkstemp(chp) < 0)
-            return EXIT_FAILURE;
+            goto error;
     }
-
     puts(chp);
-
     return EXIT_SUCCESS;
+ error:
+    if (opts & OPT_q)
+        return EXIT_FAILURE;
+    /* don't use chp as it gets mangled in case of error */
+    bb_perror_nomsg_and_die();
 }