git: 910de60a7e43 - main - stand/userboot: Move to using common devparse()

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=910de60a7e43c593b5126b2f1ee468c089c8116e

commit 910de60a7e43c593b5126b2f1ee468c089c8116e
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-11-30 22:09:05 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2022-11-30 22:30:32 +0000

    stand/userboot: Move to using common devparse()
    
    We no longer need to have to hand-code this for each boot loader since
    devparse() handles them all with dv_parsedev().
    
    Sponsored by:           Netflix
    Differential Revision:  https://reviews.freebsd.org/D37342
---
 stand/userboot/userboot/devicename.c | 119 +----------------------------------
 1 file changed, 3 insertions(+), 116 deletions(-)

diff --git a/stand/userboot/userboot/devicename.c b/stand/userboot/userboot/devicename.c
index c8b46e7f590c..e6d7e9706c18 100644
--- a/stand/userboot/userboot/devicename.c
+++ b/stand/userboot/userboot/devicename.c
@@ -34,13 +34,6 @@ __FBSDID("$FreeBSD$");
 #include "disk.h"
 #include "libuserboot.h"
 
-#if defined(USERBOOT_ZFS_SUPPORT)
-#include "libzfs.h"
-#endif
-
-static int userboot_parsedev(struct devdesc **dev, const char *devspec,
-    const char **path);
-
 /*
  * Point (dev) at an allocated device specifier for the device matching the
  * path in (devspec). If it contains an explicit device specification,
@@ -60,7 +53,7 @@ userboot_getdev(void **vdev, const char *devspec, const char **path)
 	    (devspec[0] == '/') ||
 	    (strchr(devspec, ':') == NULL)) {
 
-		rv = userboot_parsedev(dev, getenv("currdev"), NULL);
+		rv = devparse(dev, getenv("currdev"), NULL);
 		if (rv == 0 && path != NULL)
 			*path = devspec;
 		return (rv);
@@ -69,115 +62,9 @@ userboot_getdev(void **vdev, const char *devspec, const char **path)
 	/*
 	 * Try to parse the device name off the beginning of the devspec
 	 */
-	return (userboot_parsedev(dev, devspec, path));
+	return (devparse(dev, devspec, path));
 }
 
-/*
- * Point (dev) at an allocated device specifier matching the string version
- * at the beginning of (devspec).  Return a pointer to the remaining
- * text in (path).
- *
- * In all cases, the beginning of (devspec) is compared to the names
- * of known devices in the device switch, and then any following text
- * is parsed according to the rules applied to the device type.
- *
- * For disk-type devices, the syntax is:
- *
- * disk<unit>[s<slice>][<partition>]:
- *
- */
-static int
-userboot_parsedev(struct devdesc **dev, const char *devspec,
-    const char **path)
-{
-	struct devdesc *idev;
-	struct devsw *dv;
-	int i, unit, err;
-	const char *cp;
-	const char *np;
-
-	/* minimum length check */
-	if (strlen(devspec) < 2)
-		return (EINVAL);
-
-	/* look for a device that matches */
-	for (i = 0, dv = NULL; devsw[i] != NULL; i++) {
-		if (strncmp(devspec, devsw[i]->dv_name,
-		    strlen(devsw[i]->dv_name)) == 0) {
-			dv = devsw[i];
-			break;
-		}
-	}
-	if (dv == NULL)
-		return (ENOENT);
-	idev = malloc(sizeof(struct disk_devdesc));
-	err = 0;
-	np = (devspec + strlen(dv->dv_name));
-
-	switch (dv->dv_type) {
-	case DEVT_NONE:			/* XXX what to do here?  Do we care? */
-		break;
-
-	case DEVT_DISK:
-		free(idev);
-		err = disk_parsedev(&idev, np, path);
-		if (err != 0)
-			goto fail;
-		break;
-
-	case DEVT_CD:
-	case DEVT_NET:
-		unit = 0;
-
-		if (*np && (*np != ':')) {
-			/* get unit number if present */
-			unit = strtol(np, (char **)&cp, 0);
-			if (cp == np) {
-				err = EUNIT;
-				goto fail;
-			}
-		} else {
-			cp = np;
-		}
-		if (*cp && (*cp != ':')) {
-			err = EINVAL;
-			goto fail;
-		}
-
-		idev->d_unit = unit;
-		if (path != NULL)
-			*path = (*cp == 0) ? cp : cp + 1;
-		break;
-
-	case DEVT_ZFS:
-#if defined(USERBOOT_ZFS_SUPPORT)
-		free(idev);
-		err = zfs_parsedev(&idev, np, path);
-		if (err != 0)
-			goto fail;
-		break;
-#else
-		/* FALLTHROUGH */
-#endif
-
-	default:
-		err = EINVAL;
-		goto fail;
-	}
-	idev->d_dev = dv;
-	if (dev == NULL) {
-		free(idev);
-	} else {
-		*dev = idev;
-	}
-	return (0);
-
-fail:
-	free(idev);
-	return (err);
-}
-
-
 /*
  * Set currdev to suit the value being supplied in (value)
  */
@@ -187,7 +74,7 @@ userboot_setcurrdev(struct env_var *ev, int flags, const void *value)
 	struct devdesc *ncurr;
 	int rv;
 
-	if ((rv = userboot_parsedev(&ncurr, value, NULL)) != 0)
+	if ((rv = devparse(&ncurr, value, NULL)) != 0)
 		return (rv);
 	free(ncurr);