Fold PRT_menuid_to_guid() into PRT_desc_to_guid() so

interactive editor and -R use the same logic to find a GUID.

Allows interactive editor's 'edit' to accept GPT partition
names and menu descriptions as partition id's.

Author: krw

sbin/fdisk/cmd.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.c,v 1.182 2025/06/17 16:24:55 krw Exp $	*/
+/*	$OpenBSD: cmd.c,v 1.183 2025/06/20 12:06:07 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -656,7 +656,7 @@ ask_uuid(const struct uuid *olduuid)
 			goto done;
 		}
 
-		guid = PRT_menuid_to_guid(hex_octet(lbuf));
+		guid = PRT_desc_to_guid(lbuf);
 		if (guid == NULL)
 			guid = lbuf;
 

sbin/fdisk/gpt.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: gpt.c,v 1.102 2025/06/17 11:21:48 krw Exp $	*/
+/*	$OpenBSD: gpt.c,v 1.103 2025/06/20 12:06:07 krw Exp $	*/
 /*
  * Copyright (c) 2015 Markus Muller <[email protected]>
  * Copyright (c) 2015 Kenneth R Westerback <[email protected]>
@@ -374,8 +374,7 @@ GPT_recover_partition(const char *line1, const char *line2, const char *line3)
 				break;
 			type[i - 1] = '\0';
 		}
-		if ((p = PRT_desc_to_guid(type)) == NULL &&
-		    (p = PRT_menuid_to_guid(hex_octet(type))) == NULL)
+		if ((p = PRT_desc_to_guid(type)) == NULL)
 			return -1;
 		uuid_from_string(p, &type_uuid, &status);
 		if (status != uuid_s_ok)

sbin/fdisk/part.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: part.c,v 1.170 2025/06/18 13:00:21 krw Exp $	*/
+/*	$OpenBSD: part.c,v 1.171 2025/06/20 12:06:07 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -1123,35 +1123,32 @@ PRT_uuid_to_menudflt(const struct uuid *uuid)
 	return dflt;
 }
 
-const char *
-PRT_menuid_to_guid(const int menuid)
-{
-	unsigned int		i;
-
-	for (i = 0; i < nitems(menu_items); i++) {
-		if (gpt_item(i) == 0 && menu_items[i].mi_menuid == menuid)
-			return menu_items[i].mi_guid;
-	}
-
-	return NULL;
-}
-
+/*
+ * Accept gt_desc, gt_guid, mi_name or mi_menuid and return the
+ * associated GUID. Or NULL if none found.
+ */
 const char *
 PRT_desc_to_guid(const char *desc)
 {
+	char			octet[3];
 	unsigned int		i;
+	int			menuid = -1;
 
 	for (i = 0; i < nitems(gpt_types); i++) {
-		if (gpt_types[i].gt_desc == NULL)
-			continue;
-		if (strcasecmp(gpt_types[i].gt_desc, desc) == 0)
+		if (gpt_types[i].gt_desc &&
+		    strcasecmp(gpt_types[i].gt_desc, desc) == 0)
 			return gpt_types[i].gt_guid;
 		if (strcasecmp(gpt_types[i].gt_guid, desc) == 0)
 			return gpt_types[i].gt_guid;
 	}
+
+	if (strlcpy(octet, desc, sizeof(octet)) < sizeof(octet))
+		menuid = hex_octet(octet);
+
 	for (i = 0; i < nitems(menu_items); i++) {
 		if (gpt_item(i) == 0 &&
-		    strcasecmp(menu_items[i].mi_name, desc) == 0)
+		    (strcasecmp(menu_items[i].mi_name, desc) == 0 ||
+		     menu_items[i].mi_menuid == menuid))
 			return menu_items[i].mi_guid;
 	}
 

sbin/fdisk/part.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: part.h,v 1.49 2025/06/17 16:24:55 krw Exp $	*/
+/*	$OpenBSD: part.h,v 1.50 2025/06/20 12:06:07 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -39,7 +39,6 @@ void		 PRT_print_part(const int, const struct prt *, const char *);
 void		 PRT_print_parthdr(void);
 const char	*PRT_uuid_to_desc(const struct uuid *);
 char		*PRT_uuid_to_menudflt(const struct uuid *);
-const char	*PRT_menuid_to_guid(const int);
 const char	*PRT_desc_to_guid(const char *);
 int		 PRT_protected_uuid(const struct uuid *);
 void		 PRT_lba_to_chs(const struct prt *, struct chs *, struct chs *);