summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authoreadler <eadler@FreeBSD.org>2012-10-02 00:30:26 +0000
committereadler <eadler@FreeBSD.org>2012-10-02 00:30:26 +0000
commita0bfe4edc64ac8e7cca69aaf01caad11bba39724 (patch)
tree885dc1c108457c8850f23181b179ea861a357240 /usr.bin
parentee91325ae81019dff7b23143fd9360b610c9e0c5 (diff)
downloadFreeBSD-src-a0bfe4edc64ac8e7cca69aaf01caad11bba39724.zip
FreeBSD-src-a0bfe4edc64ac8e7cca69aaf01caad11bba39724.tar.gz
Implement the Sun/GNU extension of using a default
prefix when no arguments are supplied. Reviewed by: jilles Approved by: cperciva MFC after: 1 week
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/mktemp/mktemp.18
-rw-r--r--usr.bin/mktemp/mktemp.c7
2 files changed, 13 insertions, 2 deletions
diff --git a/usr.bin/mktemp/mktemp.1 b/usr.bin/mktemp/mktemp.1
index 6d6830c..3ec7585 100644
--- a/usr.bin/mktemp/mktemp.1
+++ b/usr.bin/mktemp/mktemp.1
@@ -99,6 +99,14 @@ Care should
be taken to ensure that it is appropriate to use an environment variable
potentially supplied by the user.
.Pp
+If no arguments are passed or if only the
+.Fl d
+flag is passed
+.Nm
+behaves as if
+.Fl t Li tmp
+was supplied.
+.Pp
Any number of temporary files may be created in a single invocation,
including one based on the internal template resulting from the
.Fl t
diff --git a/usr.bin/mktemp/mktemp.c b/usr.bin/mktemp/mktemp.c
index 72b89d6..277104f 100644
--- a/usr.bin/mktemp/mktemp.c
+++ b/usr.bin/mktemp/mktemp.c
@@ -87,6 +87,11 @@ main(int argc, char **argv)
argc -= optind;
argv += optind;
+ if (!tflag && argc < 1) {
+ tflag = 1;
+ prefix = "tmp";
+ }
+
if (tflag) {
tmpdir = getenv("TMPDIR");
if (tmpdir == NULL)
@@ -100,8 +105,6 @@ main(int argc, char **argv)
else
errx(1, "cannot generate template");
}
- } else if (argc < 1) {
- usage();
}
/* generate all requested files */
OpenPOWER on IntegriCloud