 @@ -1,14 +1,14 @@
-.\" $NetBSD: mktemp.1,v 1.17 2006/09/19 19:01:44 wiz Exp $
+.\" $NetBSD: mktemp.1,v 1.18 2009/08/15 20:02:28 christos Exp $
 .\" From: $FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.5 1999/08/28 01:04:13 peter Exp $
 .\" From: $OpenBSD: mktemp.1,v 1.8 1998/03/19 06:13:37 millert Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 @@ -21,35 +21,36 @@
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.5 1999/08/28 01:04:13 peter Exp $
 .\"
-.Dd January 12, 2006
+.Dd August 15, 2009
 .Dt MKTEMP 1
 .Os
 .Sh NAME
 .Nm mktemp
 .Nd make temporary file name (unique)
 .Sh SYNOPSIS
 .Nm mktemp
 .Op Fl dqu
 .Op Fl p Ar tmpdir
 .Bro
 .Fl t Ar prefix
 .No |
 .Ar template ...
 .Brc
 .Sh DESCRIPTION
 The
 .Nm
 utility takes each of the given file name templates and overwrites a
 portion of it to create a file name.
 This file name is unique and suitable for use by the application.
 The template may be any file name with some number of
 .Ql X Ns s
 @@ -79,26 +80,29 @@ flag is given) and the filename is print
 If the
 .Fl t Ar prefix
 option is given,
 .Nm
 will generate a template string based on the
 .Ar prefix
 and the
 .Ev TMPDIR
 environment variable, if set.
 The default location if
 .Ev TMPDIR
 is not set is
 .Pa /tmp .
 The default location of the temporary directory can be overriden with the
 .Fl p Ar tmpdir
 option.
 The template string created will consist of the
 .Ar prefix
 followed by a
 .So . Sc
 and an eight character unique letter combination.
 .Ql X Ns s
 in the
 .Ar prefix
 string will be treated as literal.
 If an additional
 .Ar template
 argument is passed, a second file will be created.
 Care should be taken to ensure that it is appropriate to use an

 @@ -1,14 +1,14 @@
-/* $NetBSD: mktemp.c,v 1.10 2007/12/15 19:44:52 perry Exp $ */
+/* $NetBSD: mktemp.c,v 1.11 2009/08/15 20:02:28 christos Exp $ */
 /*-
  * Copyright (c) 1994, 1995, 1996, 1998 Peter Wemm <peter@netplex.com.au>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -40,93 +40,103 @@
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <err.h>
 #include <paths.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: mktemp.c,v 1.10 2007/12/15 19:44:52 perry Exp $");
+__RCSID("$NetBSD: mktemp.c,v 1.11 2009/08/15 20:02:28 christos Exp $");
 #endif /* !__lint */
 static void usage(void) __dead;
 int
 main(int argc, char **argv)
+{
 	int c, fd, ret;
 	char *tmpdir;
 	const char *prefix;
 	char *name;
 	int dflag, qflag, tflag, uflag;
 	setprogname(*argv);
 	ret = dflag = qflag = tflag = uflag = 0;
 	tmpdir = NULL;
 	prefix = "mktemp";
 	name = NULL;
-	while ((c = getopt(argc, argv, "dqt:u")) != -1)
+	while ((c = getopt(argc, argv, "dp:qt:u")) != -1)
 		switch (c) {
 		case 'd':
 			dflag++;
 			break;
 		case 'p':
 			tmpdir = optarg;
 			break;
 		case 'q':
 			qflag++;
 			break;
 		case 't':
 			prefix = optarg;
 			tflag++;
 			break;
 		case 'u':
 			uflag++;
 			break;
 		default:
 			usage();
+		}
 	argc -= optind;
 	argv += optind;
 	if (tflag) {
-		tmpdir = getenv("TMPDIR");
+		if (tmpdir == NULL)
 			tmpdir = getenv("TMPDIR");
 		if (tmpdir == NULL)
 			(void)asprintf(&name, "%s%s.XXXXXXXX", _PATH_TMP,
 			    prefix);
 		else
 			(void)asprintf(&name, "%s/%s.XXXXXXXX", tmpdir, prefix);
 		/* if this fails, the program is in big trouble already */
 		if (name == NULL) {
 			if (qflag)
 				return 1;
 			else
 				errx(1, "Cannot generate template");
+		}
 	} else if (argc < 1) {
 		usage();
+	}
 	/* generate all requested files */
 	while (name != NULL || argc > 0) {
 		if (name == NULL) {
-			name = strdup(argv[0]);
+			if (tmpdir)
 				(void)asprintf(&name, "%s/%s",
 				    tmpdir, argv[0]);
 			else
 				name = strdup(argv[0]);
 			argv++;
 			argc--;
+		}
 		if (dflag) {
 			if (mkdtemp(name) == NULL) {
 				ret = 1;
 				if (!qflag)
 					warn("mkdtemp failed on %s", name);
 			} else {
 				(void)printf("%s\n", name);
 				if (uflag)
 					(void)rmdir(name);
 @@ -145,17 +155,17 @@ main(int argc, char **argv)
+			}
+		}
 		if (name)
 			free(name);
 		name = NULL;
+	}
 	return ret;
+}
 static void
 usage(void)
+{
 	(void)fprintf(stderr,
-		"Usage: %s [-dqu] {-t prefix | template ...}\n",
+	    "Usage: %s [-dqu] [-p <tmpdir>] {-t prefix | template ...}\n",
-		getprogname());
+	    getprogname());
 	exit (1);
+}