summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/boot/Makefile.version2
-rw-r--r--usr/src/boot/sys/boot/efi/loader/devicename.c29
-rw-r--r--usr/src/boot/sys/boot/i386/libi386/devicename.c264
3 files changed, 149 insertions, 146 deletions
diff --git a/usr/src/boot/Makefile.version b/usr/src/boot/Makefile.version
index ce9a4e112c..782a9fa9c1 100644
--- a/usr/src/boot/Makefile.version
+++ b/usr/src/boot/Makefile.version
@@ -33,4 +33,4 @@ LOADER_VERSION = 1.1
# Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes.
# The version is processed from left to right, the version number can only
# be increased.
-BOOT_VERSION = $(LOADER_VERSION)-2017.6.10.1
+BOOT_VERSION = $(LOADER_VERSION)-2017.6.11.1
diff --git a/usr/src/boot/sys/boot/efi/loader/devicename.c b/usr/src/boot/sys/boot/efi/loader/devicename.c
index 64a417dacc..72588b08f5 100644
--- a/usr/src/boot/sys/boot/efi/loader/devicename.c
+++ b/usr/src/boot/sys/boot/efi/loader/devicename.c
@@ -1,4 +1,4 @@
-/*-
+/*
* Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
@@ -26,16 +26,13 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#include <stand.h>
#include <string.h>
#include <sys/disklabel.h>
#include <sys/param.h>
#include <bootstrap.h>
-#ifdef EFI_ZFS_BOOT
#include <libzfs.h>
-#endif
#include <efi.h>
#include <efilib.h>
@@ -99,7 +96,7 @@ efi_parsedev(struct devdesc **dev, const char *devspec, const char **path)
/* look for a device that matches */
for (i = 0; devsw[i] != NULL; i++) {
dv = devsw[i];
- if (!strncmp(devspec, dv->dv_name, strlen(dv->dv_name)))
+ if (strncmp(devspec, dv->dv_name, strlen(dv->dv_name)) == 0)
break;
}
if (devsw[i] == NULL)
@@ -107,24 +104,21 @@ efi_parsedev(struct devdesc **dev, const char *devspec, const char **path)
np = devspec + strlen(dv->dv_name);
-#ifdef EFI_ZFS_BOOT
if (dv->dv_type == DEVT_ZFS) {
int err;
- idev = malloc(sizeof(struct zfs_devdesc));
+ idev = malloc(sizeof (struct zfs_devdesc));
if (idev == NULL)
return (ENOMEM);
- err = zfs_parsedev((struct zfs_devdesc*)idev, np, path);
+ err = zfs_parsedev((struct zfs_devdesc *)idev, np, path);
if (err != 0) {
free(idev);
return (err);
}
cp = strchr(np + 1, ':');
- } else
-#endif
- {
- idev = malloc(sizeof(struct devdesc));
+ } else {
+ idev = malloc(sizeof (struct devdesc));
if (idev == NULL)
return (ENOMEM);
@@ -147,7 +141,7 @@ efi_parsedev(struct devdesc **dev, const char *devspec, const char **path)
}
if (path != NULL)
- *path = (*cp == 0) ? cp : cp + 1;
+ *path = (*cp == '\0') ? cp : cp + 1;
if (dev != NULL)
*dev = idev;
else
@@ -161,17 +155,16 @@ efi_fmtdev(void *vdev)
struct devdesc *dev = (struct devdesc *)vdev;
static char buf[SPECNAMELEN + 1];
- switch(dev->d_type) {
-#ifdef EFI_ZFS_BOOT
+ switch (dev->d_type) {
case DEVT_ZFS:
return (zfs_fmtdev(dev));
-#endif
case DEVT_NONE:
- strcpy(buf, "(no device)");
+ strlcpy(buf, "(no device)", sizeof (buf));
break;
default:
- sprintf(buf, "%s%d:", dev->d_dev->dv_name, dev->d_unit);
+ snprintf(buf, sizeof (buf), "%s%d:", dev->d_dev->dv_name,
+ dev->d_unit);
break;
}
diff --git a/usr/src/boot/sys/boot/i386/libi386/devicename.c b/usr/src/boot/sys/boot/i386/libi386/devicename.c
index c7705d7138..b692214b95 100644
--- a/usr/src/boot/sys/boot/i386/libi386/devicename.c
+++ b/usr/src/boot/sys/boot/i386/libi386/devicename.c
@@ -1,4 +1,4 @@
-/*-
+/*
* Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
* All rights reserved.
*
@@ -25,46 +25,45 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#include <stand.h>
#include <string.h>
+#include <sys/param.h>
#include "bootstrap.h"
#include "disk.h"
#include "libi386.h"
#include "../zfs/libzfs.h"
-static int i386_parsedev(struct i386_devdesc **dev, const char *devspec, const char **path);
+static int i386_parsedev(struct i386_devdesc **, const char *, const char **);
-/*
- * Point (dev) at an allocated device specifier for the device matching the
- * path in (devspec). If it contains an explicit device specification,
+/*
+ * Point dev at an allocated device specifier for the device matching the
+ * path in devspec. If it contains an explicit device specification,
* use that. If not, use the default device.
*/
int
i386_getdev(void **vdev, const char *devspec, const char **path)
{
- struct i386_devdesc **dev = (struct i386_devdesc **)vdev;
- int rv;
-
- /*
- * If it looks like this is just a path and no
- * device, go with the current device.
- */
- if ((devspec == NULL) ||
- (devspec[0] == '/') ||
- (strchr(devspec, ':') == NULL)) {
-
- if (((rv = i386_parsedev(dev, getenv("currdev"), NULL)) == 0) &&
- (path != NULL))
- *path = devspec;
- return(rv);
- }
-
- /*
- * Try to parse the device name off the beginning of the devspec
- */
- return(i386_parsedev(dev, devspec, path));
+ struct i386_devdesc **dev = (struct i386_devdesc **)vdev;
+ int rv;
+
+ /*
+ * If it looks like this is just a path and no
+ * device, go with the current device.
+ */
+ if ((devspec == NULL) ||
+ (devspec[0] == '/') || (strchr(devspec, ':') == NULL)) {
+
+ rv = i386_parsedev(dev, getenv("currdev"), NULL);
+ if (rv == 0 && path != NULL)
+ *path = devspec;
+ return (rv);
+ }
+
+ /*
+ * Try to parse the device name off the beginning of the devspec
+ */
+ return (i386_parsedev(dev, devspec, path));
}
/*
@@ -79,113 +78,123 @@ i386_getdev(void **vdev, const char *devspec, const char **path)
* For disk-type devices, the syntax is:
*
* disk<unit>[s<slice>][<partition>]:
- *
+ *
*/
static int
i386_parsedev(struct i386_devdesc **dev, const char *devspec, const char **path)
{
- struct i386_devdesc *idev;
- struct devsw *dv;
- int i, unit, err;
- 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))) {
- dv = devsw[i];
- break;
+ struct i386_devdesc *idev;
+ struct devsw *dv;
+ int i, unit, err;
+ 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++) {
+ dv = devsw[i];
+ if (strncmp(devspec, dv->dv_name, strlen(dv->dv_name)) == 0)
+ break;
}
- }
- if (dv == NULL)
- return(ENOENT);
- idev = malloc(sizeof(struct i386_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:
- err = disk_parsedev((struct disk_devdesc *)idev, np, path);
- if (err != 0)
- goto fail;
- break;
-
- case DEVT_CD:
- case DEVT_NET:
- unit = 0;
-
- if (*np && (*np != ':')) {
- unit = strtol(np, &cp, 0); /* get unit number if present */
- if (cp == np) {
- err = EUNIT;
- goto fail;
- }
- } else {
+ if (devsw[i] == NULL)
+ return (ENOENT);
+
+ np = devspec + strlen(dv->dv_name);
+ idev = NULL;
+ err = 0;
+
+ switch (dv->dv_type) {
+ case DEVT_NONE:
+ break;
+
+ case DEVT_DISK:
+ idev = malloc(sizeof (struct i386_devdesc));
+ if (idev == NULL)
+ return (ENOMEM);
+
+ err = disk_parsedev((struct disk_devdesc *)idev, np, path);
+ if (err != 0)
+ goto fail;
+ break;
+
+ case DEVT_ZFS:
+ idev = malloc(sizeof (struct zfs_devdesc));
+ if (idev == NULL)
+ return (ENOMEM);
+
+ err = zfs_parsedev((struct zfs_devdesc *)idev, np, path);
+ if (err != 0)
+ goto fail;
+ break;
+
+ default:
+ idev = malloc(sizeof (struct devdesc));
+ if (idev == NULL)
+ return (ENOMEM);
+
+ unit = 0;
cp = (char *)np;
+
+ if (*np && (*np != ':')) {
+ /* get unit number if present */
+ unit = strtol(np, &cp, 0);
+ if (cp == np) {
+ err = EUNIT;
+ goto fail;
+ }
+ }
+ if (*cp && (*cp != ':')) {
+ err = EINVAL;
+ goto fail;
+ }
+
+ idev->d_unit = unit;
+ if (path != NULL)
+ *path = (*cp == '\0') ? cp : cp + 1;
+ break;
}
- if (*cp && (*cp != ':')) {
- err = EINVAL;
- goto fail;
- }
- idev->d_unit = unit;
- if (path != NULL)
- *path = (*cp == 0) ? cp : cp + 1;
- break;
- case DEVT_ZFS:
- err = zfs_parsedev((struct zfs_devdesc *)idev, np, path);
- if (err != 0)
- goto fail;
- break;
- default:
- err = EINVAL;
- goto fail;
- }
- idev->d_dev = dv;
- idev->d_type = dv->dv_type;
- if (dev == NULL) {
+ idev->d_dev = dv;
+ idev->d_type = dv->dv_type;
+
+ if (dev != NULL)
+ *dev = idev;
+ else
+ free(idev);
+ return (0);
+
+fail:
free(idev);
- } else {
- *dev = idev;
- }
- return(0);
-
- fail:
- free(idev);
- return(err);
+ return (err);
}
char *
i386_fmtdev(void *vdev)
{
- struct i386_devdesc *dev = (struct i386_devdesc *)vdev;
- static char buf[128]; /* XXX device length constant? */
-
- switch(dev->d_type) {
- case DEVT_NONE:
- strcpy(buf, "(no device)");
- break;
-
- case DEVT_CD:
- case DEVT_NET:
- sprintf(buf, "%s%d:", dev->d_dev->dv_name, dev->d_unit);
- break;
-
- case DEVT_DISK:
- return (disk_fmtdev(vdev));
-
- case DEVT_ZFS:
- return(zfs_fmtdev(vdev));
- }
- return(buf);
+ struct i386_devdesc *dev = (struct i386_devdesc *)vdev;
+ static char buf[SPECNAMELEN + 1];
+
+ switch (dev->d_type) {
+ case DEVT_NONE:
+ strlcpy(buf, "(no device)", sizeof (buf));
+ break;
+
+ case DEVT_DISK:
+ return (disk_fmtdev(vdev));
+
+ case DEVT_ZFS:
+ return (zfs_fmtdev(vdev));
+
+ default:
+ snprintf(buf, sizeof (buf), "%s%d:", dev->d_dev->dv_name,
+ dev->d_unit);
+ break;
+ }
+ return (buf);
}
@@ -195,12 +204,13 @@ i386_fmtdev(void *vdev)
int
i386_setcurrdev(struct env_var *ev, int flags, const void *value)
{
- struct i386_devdesc *ncurr;
- int rv;
-
- if ((rv = i386_parsedev(&ncurr, value, NULL)) != 0)
- return(rv);
- free(ncurr);
- env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL);
- return(0);
+ struct i386_devdesc *ncurr;
+ int rv;
+
+ if ((rv = i386_parsedev(&ncurr, value, NULL)) != 0)
+ return (rv);
+
+ free(ncurr);
+ env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL);
+ return (0);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-28 08:24:09 +0000