Import NetBSD mktemp

diff --git a/commands/Makefile b/commands/Makefile
index a52473970e73f1e684fbdebd9be7091a20dfc196..97c96af06d72052efa24b24283cfecbca7f9eafd 100644 (file)
--- a/commands/Makefile
+++ b/commands/Makefile
@@ -33,7 +33,7 @@ SUBDIR=       add_route arp ash at \
        unstack update uud uue version vol wc \
        whereis which who write writeisofs fetch \
        xargs yes zdump zmodem pkgin_cd \
-       mktemp worldstone updateboot update_bootcfg
+       worldstone updateboot update_bootcfg
 
 .if ${MACHINE_ARCH} == "i386"
 SUBDIR+=       atnormalize dosread fdisk loadfont \

diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 468adfc79611b4969857c480dd5b3e6a922ab07b..f2db6633d8365d6904abd6269b92c4e243c6dd76 100644 (file)
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -3,7 +3,7 @@
 .include <bsd.own.mk>
 
 # NetBSD imports
-SUBDIR= login indent m4 make stat tic sed mkdep uniq seq du man \
+SUBDIR= login indent m4 make mktemp stat tic sed mkdep uniq seq du man \
        apropos chpass newgrp passwd bzip2 bzip2recover gzip su genassym \
        ldd/elf32 .WAIT ldd
 

diff --git a/commands/mktemp/Makefile b/usr.bin/mktemp/Makefile
similarity index 100%
rename from commands/mktemp/Makefile
rename to usr.bin/mktemp/Makefile

diff --git a/commands/mktemp/mktemp.1 b/usr.bin/mktemp/mktemp.1
similarity index 100%
rename from commands/mktemp/mktemp.1
rename to usr.bin/mktemp/mktemp.1

diff --git a/commands/mktemp/mktemp.c b/usr.bin/mktemp/mktemp.c
similarity index 99%
rename from commands/mktemp/mktemp.c
rename to usr.bin/mktemp/mktemp.c
index b0ea03605880538c85f4bf52a46fdd3aecaf3c76..34a88dbfd3784508b6eed4d4b1f16c30ed61df7d 100644 (file)
--- a/commands/mktemp/mktemp.c
+++ b/usr.bin/mktemp/mktemp.c
@@ -49,11 +49,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#if 0
 #if defined(__RCSID) && !defined(__lint)
 __RCSID("$NetBSD: mktemp.c,v 1.11 2009/08/15 20:02:28 christos Exp $");
 #endif /* !__lint */
-#endif
 
 static void usage(void) __dead;
 
@@ -81,7 +79,7 @@ main(int argc, char **argv)
                case 'p':
                        tmpdir = optarg;
                        break;
-
+                       
                case 'q':
                        qflag++;
                        break;
@@ -120,7 +118,7 @@ main(int argc, char **argv)
        } else if (argc < 1) {
                usage();
        }
-
+               
        /* generate all requested files */
        while (name != NULL || argc > 0) {
                if (name == NULL) {