git: 3a4e049c3814 - main - efitable: Fixup getopt args to reflect guid use.

The branch main has been updated by gordon:

URL: https://cgit.FreeBSD.org/src/commit/?id=3a4e049c38143980e472b2926abde3c7549530c4

commit 3a4e049c38143980e472b2926abde3c7549530c4
Author:     Gordon Tetlow <gordon@FreeBSD.org>
AuthorDate: 2026-06-20 02:59:49 +0000
Commit:     Gordon Tetlow <gordon@FreeBSD.org>
CommitDate: 2026-06-20 18:14:56 +0000

    efitable: Fixup getopt args to reflect guid use.
    
    Correct the manpage to reflect the preference for GUID vs UUID.
    Take the long version of --guid for the -g option.
    Sort the argument list while we are touching it.
    
    Reviewed by:    imp
    MFC after:      1 week
    MFC to:         stable/15
    Event:          BSDCan 2026
    Differential Revision:  https://reviews.freebsd.org/D57695
---
 usr.sbin/efitable/efitable.8 | 6 +++---
 usr.sbin/efitable/efitable.c | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/usr.sbin/efitable/efitable.8 b/usr.sbin/efitable/efitable.8
index 52949abcb853..f0785d3ba7cf 100644
--- a/usr.sbin/efitable/efitable.8
+++ b/usr.sbin/efitable/efitable.8
@@ -32,7 +32,7 @@
 .Nd dump UEFI tables
 .Sh SYNOPSIS
 .Nm
-.Op Fl u Ar uuid | Fl t Ar name
+.Op Fl g Ar guid | Fl t Ar name
 .Op Fl -libxo
 .Sh DESCRIPTION
 This program prints data from
@@ -49,6 +49,8 @@ in a selection of different human and machine readable formats.
 See
 .Xr xo_options 7
 for details on command line arguments.
+.It Fl g Ar guid | Fl -guid Ar guid
+Specify the GUID of the table to print.
 .It Fl t Ar name | Fl -table Ar name
 Specify the name of the table to print.
 Currently supported tables:
@@ -61,8 +63,6 @@ EFI Memory Attributes Table
 .It Cm prop
 EFI Properties Table
 .El
-.It Fl u Ar uuid | Fl -uuid Ar uuid
-Specify the UUID of the table to print.
 .El
 .Sh HISTORY
 The
diff --git a/usr.sbin/efitable/efitable.c b/usr.sbin/efitable/efitable.c
index a506b4dea311..b9e3d424398a 100644
--- a/usr.sbin/efitable/efitable.c
+++ b/usr.sbin/efitable/efitable.c
@@ -75,8 +75,9 @@ main(int argc, char **argv)
 	bool table_set = false;
 	bool uuid_set = false;
 	struct option longopts[] = {
-		{ "uuid",  required_argument, NULL, 'u' },
+		{ "guid",  required_argument, NULL, 'g' },
 		{ "table", required_argument, NULL, 't' },
+		{ "uuid",  required_argument, NULL, 'u' },
 		{ NULL,    0,                 NULL,  0  }
 	};