Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/debianutils/mktemp.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

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

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

@@ -10 +10 @@
  */
 
-#include "busybox.h"
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
+#include "libbb.h"
 
+int mktemp_main(int argc, char **argv);
 int mktemp_main(int argc, char **argv)
 {
-    unsigned long flags = bb_getopt_ulflags(argc, argv, "dq");
+    unsigned long flags = getopt32(argv, "dqt");
+    char *chp;
 
     if (optind + 1 != argc)
         bb_show_usage();
 
+    chp = argv[optind];
+
+    if (flags & 4) {
+        char *dir = getenv("TMPDIR");
+        if (dir && *dir != '\0')
+            chp = concat_path_file(dir, chp);
+        else
+            chp = concat_path_file("/tmp/", chp);
+    }
+
     if (flags & 1) {
-        if (mkdtemp(argv[optind]) == NULL)
+        if (mkdtemp(chp) == NULL)
             return EXIT_FAILURE;
-    }
-    else {
-        if (mkstemp(argv[optind]) < 0)
+    } else {
+        if (mkstemp(chp) < 0)
             return EXIT_FAILURE;
     }
 
-    puts(argv[optind]);
+    puts(chp);
 
     return EXIT_SUCCESS;