D29620.1794120568.diff
No OneTemporary
Actions

Authored By

Unknown

Size

794 B

Referenced Files

None

Subscribers

None

D29620.1794120568.diff
View Options

	diff --git a/usr.sbin/efivar/efivar.c b/usr.sbin/efivar/efivar.c
	--- a/usr.sbin/efivar/efivar.c
	+++ b/usr.sbin/efivar/efivar.c
	@@ -118,15 +118,24 @@
	static void
	breakdown_name(char name, efi_guid_t guid, char **vname)
	{
	- char *cp;
	-
	- cp = strrchr(name, '-');
	- if (cp == NULL)
	- rep_errx(1, "Invalid name: %s", name);
	- *vname = cp + 1;
	- *cp = '\0';
	- if (efi_name_to_guid(name, guid) < 0)
	- rep_errx(1, "Invalid guid %s", name);
	+ char cp, ocp;
	+
	+ ocp = NULL;
	+ while (true) {
	+ cp = strrchr(name, '-');
	+ if (cp == NULL) {
	+ if (ocp != NULL)
	+ *ocp = '-';
	+ rep_errx(1, "Invalid guid in: %s", name);
	+ }
	+ if (ocp != NULL)
	+ *ocp = '-';
	+ *vname = cp + 1;
	+ *cp = '\0';
	+ ocp = cp;
	+ if (efi_name_to_guid(name, guid) >= 0)
	+ break;
	+ }
	}

	static uint8_t *