From nobody Mon Mar 06 08:05:03 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 4PVWMg6cYZz3wZxQ; Mon, 6 Mar 2023 08:05:03 +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 4PVWMg6Bgqz3y7s; Mon, 6 Mar 2023 08:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678089903; 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=qWI5va198miP/5UKMeYcU2si+0KfQiHGjgmT78H+h4g=; b=tfvo4U+sQzgHKemCBfFAg6DTyTtl0NLjC3vUCuz0jG3iI84UeRwxPZ0nbYHuQnZ7VpHQpQ SIBCzTedMY5v7MFU+lvweuzd/Ueuf8IuqVcTD25CdShkPkuV5mxrOgT1D140AVdnuwjPYc ERIjI28qxHwsS5AplVEkp9o31Kv7H7syLIrfP1ZY8vTWvsXb+1Gnel3I0RVLZcbyf2Bj5u L4rTm4RPHI7Sz6WdIm6Hii7CiUfcUu58dOHWcVaY48xd/GE17ZzZ3FNc0ylVAT9UoFioTR R/ukTWOqYjNrwqsj/Sp60aIFoKM2EAURRYn2CMj2fGGOfgK4Qy0y156Fcd3RlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678089903; 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=qWI5va198miP/5UKMeYcU2si+0KfQiHGjgmT78H+h4g=; b=dbyzLUQFlr7eMtOBN+ZBCYb6JyJ1uUu1iyYMvxG0o1DKtEIix8lN5pYmUIPyObFLO91DnQ MIwgjCg603iBLGdxOtHVqZIRp4DytDrEvTg8S97fHPN5VW54mnRRyEGQA04VqCP613/5M9 775Wxb3iw8+Rot5rferwYANmPRenr5oYS3L1DgNAqR1tjFhoTnIi6vKjF+MHihdpXIhoQj x8PxiGmofrg1Ic7JAGHOdqNP5bu9P2l13xeyrJo2EaXIsiLZ7bPZYb4jCOKbOpT6a/GAE8 tYS9uvIqs3bKajlZfd0HqcFIyuoU3bHI0hcYZH3tUewh0pSzJ0W0ASqKzTRY/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678089903; a=rsa-sha256; cv=none; b=UEHkyln79C2+dtN1WpWFHR14PCfhoM9vsvarhdkKcE6Gc571GOw6l7SM/nmB4bjEZ5rk5L uRN+OW9/XO+5B2vdIpGoyzog7QVa/lMWfvR1QlrCrki6y/0Wkub+vlQMLcVxqPKXxFBF3c nTZk9EpDEQHkUsJBqwNtmEvVRYtpTyvWBTkoWNDnt09YZWfu4foA9aMjxQvtacHKMPIGeI N88uQUszdG2Hsqq8ciJ+lblbCDkTcbtsifik7HCgjE7XTD2Wsa05t4oQOOfFBR6Y+fpuC6 ji2mVSBk3UIKKA+kIEZhOu3A1C3YY9XSOJfER2PlCDYcIk4K+B22YufzmqfL6Q== 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 4PVWMg5GhmzvH1; Mon, 6 Mar 2023 08:05:03 +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 326853CC086893; Mon, 6 Mar 2023 08:05:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326853RR086892; Mon, 6 Mar 2023 08:05:03 GMT (envelope-from git) Date: Mon, 6 Mar 2023 08:05:03 GMT Message-Id: <202303060805.326853RR086892@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 551a3a645645 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 551a3a645645e4652c33dc0fda11a57aa56ad4f2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=551a3a645645e4652c33dc0fda11a57aa56ad4f2 commit 551a3a645645e4652c33dc0fda11a57aa56ad4f2 Author: Baptiste Daroussin AuthorDate: 2023-02-28 10:29:51 +0000 Commit: Baptiste Daroussin CommitDate: 2023-03-06 08:04:42 +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 (cherry picked from commit b2b294f27cf4618d6f7510007b41882860a080b9) --- 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);