From nobody Wed Mar 1 18:18:32 2023 X-Original-To: dev-commits-src-all@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 4PRjCr4C2Jz3v9rJ; Wed, 1 Mar 2023 18:18:32 +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 4PRjCr3htBz44mn; Wed, 1 Mar 2023 18:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677694712; 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=ZG3cDdPCG+nKwAyXno/zpP4bDsH0y6JUlHwNJt/h4R8=; b=cGGAqDAF5G3jfKCFyb6ztKn8OY1U5AU3Uhd5Fo5weRxsKdPb9L9I5gm9AhxJaMZIc/UL8O 00ADk7PpV34EC7U720IP9mFFZ+qe3E6QldlxV5vKEmt+dcW3xLBrtSBG4HJx5Nhidrd4Pn FGvRC2uV23kHziBU/ddCBJxblM1bAjVwjjg1jhAsceANi/3+Ry9W+uPIotfORbw5kev6Ow 36HAVnguKwDIyP7uxGRQ058+Vb/85zpcNtLqGOJw2/sT1zqpTpI1Qn/VOLY0Tn5hVi563t /rdyROfh5gmu2Veqiptok2iFdhYilzbXnDj1IXOXbLLrlaVkHKBtrSdIHtZOhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677694712; 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=ZG3cDdPCG+nKwAyXno/zpP4bDsH0y6JUlHwNJt/h4R8=; b=Qvh3I2Cq21W8WF6kU9VpAtDGEyJRCpKhzDIrXQrL46x70XBy0vhawN7pgFMwT6dzLCfJWU LE7ReGpyrbfQh8Qcgy+VCm+UARVh5t2pFO9KvV66ZXVwZcGF8nK859AkGgvukYXRmrzNO/ WWCwdC0bEEkrNZO9Lus+CMVi51+gziQQPYPlZ4cMtCSlslycN4hCL3fkmxqxzVvKbZAE5V XnkC6ggyTWArw0plfaEiFd8gjK3tStzVeAxplzbDozjFyFn5NDeGBfrUy2XM3M1bbjiGUF Xx9dhYbVt3Goldp1d50yZKTrUsKLWMIzql0GE7brI3DWSo6Yl6Upcw9J4jfACA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677694712; a=rsa-sha256; cv=none; b=cWE2CY8A6eJFHeX3ttciXpCdGH9G42V1wFuNJlHIYKFxYJ7Z7HaPCb1Km2kwh1vNnlyf+B Fc3cgSsBJDFAn6evuKVMWhJ4k/eYHgke2hqLFQg8WpFGkTTdKOjljcX+DcH5qbG4TLZY4b ec8OtDxbH2b+jPS291ky2O2XBtmJL6tBwlbQCF14O2jj2azqLuuEjY2FLMHeAsxrhgOnKE H5i7+vgDuRBKIYCMvVFDBcqf54flvd5d5svzksyStAebPR4I9b51936MsdT9TiajwjEm9k QnQk6bk93C7sAEoRkYGyGaVHuAvCM+fMLK7Q/zP7At7ckarxLNcoTb4GRKLrbQ== 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 4PRjCr2mjDzkqc; Wed, 1 Mar 2023 18:18:32 +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 321IIW3P067570; Wed, 1 Mar 2023 18:18:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321IIWHi067569; Wed, 1 Mar 2023 18:18:32 GMT (envelope-from git) Date: Wed, 1 Mar 2023 18:18:32 GMT Message-Id: <202303011818.321IIWHi067569@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: b2b294f27cf4 - main - uuidgen: add -c for compact uuid List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2b294f27cf4618d6f7510007b41882860a080b9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=b2b294f27cf4618d6f7510007b41882860a080b9 commit b2b294f27cf4618d6f7510007b41882860a080b9 Author: Baptiste Daroussin AuthorDate: 2023-02-28 10:29:51 +0000 Commit: Baptiste Daroussin CommitDate: 2023-03-01 18:16:25 +0000 uuidgen: add -c for compact uuid It generates the uuid string but without the hyphen MFC After: 3 days Reviews by: tcberner Differential Revision: https://reviews.freebsd.org/D38820 --- bin/uuidgen/uuidgen.1 | 5 ++++- bin/uuidgen/uuidgen.c | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/bin/uuidgen/uuidgen.1 b/bin/uuidgen/uuidgen.1 index 83326e3a189a..75fd02703175 100644 --- a/bin/uuidgen/uuidgen.1 +++ b/bin/uuidgen/uuidgen.1 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 23, 2012 +.Dd March 1, 2024 .Dt UUIDGEN 1 .Os .Sh NAME @@ -34,6 +34,7 @@ .Nm .Op Fl 1 .Op Fl r +.Op Fl c .Op Fl n Ar count .Op Fl o Ar filename .Sh DESCRIPTION @@ -53,6 +54,8 @@ instructs to not generate them in batch, but one at a time. .It Fl r This option controls creation of random UUID (version 4). +.It Fl c +This options contols creation of compact UUID (without hyphen). .It Fl n This option controls the number of identifiers generated. By default, multiple identifiers are generated in batch. diff --git a/bin/uuidgen/uuidgen.c b/bin/uuidgen/uuidgen.c index 061907f57109..6dcfdde92a5f 100644 --- a/bin/uuidgen/uuidgen.c +++ b/bin/uuidgen/uuidgen.c @@ -46,6 +46,31 @@ usage(void) exit(1); } +static void +uuid_to_compact_string(const uuid_t *u, char **s, uint32_t *status) +{ + uuid_t nil; + + if (status != NULL) + *status = uuid_s_ok; + + if (s == NULL) + return; + + if (u == NULL) { + u = &nil; + uuid_create_nil(&nil, NULL); + } + + asprintf(s, "%08x%04x%04x%02x%02x%02x%02x%02x%02x%02x%02x", + u->time_low, u->time_mid, u->time_hi_and_version, + u->clock_seq_hi_and_reserved, u->clock_seq_low, u->node[0], + u->node[1], u->node[2], u->node[3], u->node[4], u->node[5]); + + if (*s == NULL && status != NULL) + *status = uuid_s_no_memory; +} + static int uuidgen_v4(struct uuid *store, int count) { @@ -85,16 +110,20 @@ main(int argc, char *argv[]) uuid_t *store, *uuid; char *p; int ch, count, i, iterate, status, version; + void (*tostring)(const uuid_t *, char **, uint32_t *) = uuid_to_string; count = -1; /* no count yet */ fp = stdout; /* default output file */ iterate = 0; /* not one at a time */ version = 1; /* create uuid v1 by default */ - while ((ch = getopt(argc, argv, "1rn:o:")) != -1) + while ((ch = getopt(argc, argv, "1crn:o:")) != -1) switch (ch) { case '1': iterate = 1; break; + case 'c': + tostring = uuid_to_compact_string; + break; case 'r': version = 4; break; @@ -162,7 +191,7 @@ main(int argc, char *argv[]) uuid = store; while (count--) { - uuid_to_string(uuid++, &p, &status); + tostring(uuid++, &p, &status); if (status != uuid_s_ok) err(1, "cannot stringify a UUID"); fprintf(fp, "%s\n", p);