From nobody Sun Nov 13 05:38:06 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N91SH0mfRz4hZXg; Sun, 13 Nov 2022 05:38:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N91SG7369z3JJd; Sun, 13 Nov 2022 05:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668317887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yv2iMORHBqfoVQhx2EpTT1oIAa/32nI7ZUxO66rDSso=; b=kYbnGidVMxHY4A2sQCFIT5YEu5DhbR4CuVs4zOUMPhresNzsS2KEL/pGWFzkO5LRCr7ptY EGLvgCMu3fDLpkhAU1hs+QzZJTi/GgiGjg82tZkJf1KPGEnS/ktiC0wdM1k7yIkc6ulAM2 j0eDP9yNx9wrUEATrHsdA4P4l9t45CGWl9UOSRwoE7+WaIyve+1OPoFgNZcCo7gvKlCjP/ sCuOBFcS8Q6FEhTJM0j7pjaIo0YBNidUvIjTkgvXf+fHBhAn3w1SqzCG6wfHCMMP7Su/Eb Dgb3gLNZQVBX8RFWQ8PoSM/fErgXrRIsOmI7zyt6dvw0CosUTi/ahvzR7KhbMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668317887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yv2iMORHBqfoVQhx2EpTT1oIAa/32nI7ZUxO66rDSso=; b=tx91aJSfgo4pojlu04ELrCNpVEQiGhqBDgSnI9uEkFcAo5j2BiFugQaZg30/Pmd6CDwJLh gY6hXFgE/f7W50fxPi6czNwsh53y+QKJY6AJY/M7xKwztmwyAzRssEQ6BzZ6dQcA7bCxOE FuHKOrcr452hxZVA5CV06kZXyuQJR7jTz9EQ85Gkt2cnvY93QPajyREyHgYcAXu5yb+aWC WZEMoYkNt4Mm4HCudeDrNQl6ZIOS0n4cXLSUYKdZMu8C+MflAZnJD8ZDpB2XAb6IlAZOOW kj+ZRH50OkQG98zWfAwR1ql0Frd7VYhSaLZ7wrWJUhO+vzs0DkJBwPEwUYWftg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668317887; a=rsa-sha256; cv=none; b=wAUi15PZJEsxZnyJRoJsXqA8mc8Wi20qWOYvCrjiinYV9lwc9/KOs98Gvph6aKTXpkU96i FG0GoW3dneslhS+rV8yASpMeFlSmkgA0sPXg6SRpaAWGfM79UAm2cvjdEBlPrR+Gsuq5N3 EyV0+LVKERapFROInG6tCjmQj7JEnTSVoE6Nf/EsVLWbh9sMkvrJlsWIXmjqQekDIQTWTG 0qUzkDxzE3VwGkbjKko9A8VZa8VFTRkR2hawXzcD1M2YD2amd93F8BrXEja8IHGp4FgUGP BGZiXD6PmEeOzpaDIpyUcWb5OO7YHXFr8EH8i/Loa67UOymYzw4tHmfDMae+8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N91SG5y4Kzqrv; Sun, 13 Nov 2022 05:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AD5c6dm096618; Sun, 13 Nov 2022 05:38:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AD5c6X8096617; Sun, 13 Nov 2022 05:38:06 GMT (envelope-from git) Date: Sun, 13 Nov 2022 05:38:06 GMT Message-Id: <202211130538.2AD5c6X8096617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 53310486d884 - stable/13 - mktemp: add some GNU-compatible long options List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 53310486d884157e13ad77e72d42511a2a005f37 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=53310486d884157e13ad77e72d42511a2a005f37 commit 53310486d884157e13ad77e72d42511a2a005f37 Author: Kyle Evans AuthorDate: 2022-10-31 03:55:46 +0000 Commit: Kyle Evans CommitDate: 2022-11-13 05:37:06 +0000 mktemp: add some GNU-compatible long options GNU maketemp has long options for -d, -q, and -u, so let's add these now for compatibility. Reviewed by: emaste, imp, wosch Sponsored by: Klara, Inc. (cherry picked from commit cfc57d7dbe5bff175ef6d508fecd6779c0a0d656) --- usr.bin/mktemp/mktemp.1 | 8 ++++---- usr.bin/mktemp/mktemp.c | 10 +++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/usr.bin/mktemp/mktemp.1 b/usr.bin/mktemp/mktemp.1 index c8d7f6232632..469d4f6097d0 100644 --- a/usr.bin/mktemp/mktemp.1 +++ b/usr.bin/mktemp/mktemp.1 @@ -28,7 +28,7 @@ .\" From: $OpenBSD: mktemp.1,v 1.8 1998/03/19 06:13:37 millert Exp $ .\" $FreeBSD$ .\" -.Dd December 30, 2005 +.Dd August 4, 2022 .Dt MKTEMP 1 .Os .Sh NAME @@ -132,9 +132,9 @@ be used instead. .Sh OPTIONS The available options are as follows: .Bl -tag -width indent -.It Fl d +.It Fl d , Fl -directory Make a directory instead of a file. -.It Fl q +.It Fl q , Fl -quiet Fail silently if an error occurs. This is useful if a script does not want error output to go to standard error. @@ -144,7 +144,7 @@ Generate a template (using the supplied and .Ev TMPDIR if set) to create a filename template. -.It Fl u +.It Fl u , Fl -dry-run Operate in .Dq unsafe mode. diff --git a/usr.bin/mktemp/mktemp.c b/usr.bin/mktemp/mktemp.c index 0b320e8c5c85..dc92de2961d0 100644 --- a/usr.bin/mktemp/mktemp.c +++ b/usr.bin/mktemp/mktemp.c @@ -37,6 +37,7 @@ */ #include +#include #include #include #include @@ -50,6 +51,13 @@ static const char rcsid[] = static void usage(void); +static const struct option long_opts[] = { + {"directory", no_argument, NULL, 'd'}, + {"quiet", no_argument, NULL, 'q'}, + {"dry-run", no_argument, NULL, 'u'}, + {NULL, no_argument, NULL, 0}, +}; + int main(int argc, char **argv) { @@ -63,7 +71,7 @@ main(int argc, char **argv) prefix = "mktemp"; name = NULL; - while ((c = getopt(argc, argv, "dqt:u")) != -1) + while ((c = getopt_long(argc, argv, "dqt:u", long_opts, NULL)) != -1) switch (c) { case 'd': dflag++;