Option DEVISCAN does not work on OpenBSD >= 4.8

[gbechis]

With OpenBSD 4.8 the format of sysctl hw.disknames has changed, a patch is needed to handle the new format.

[Christian Franke]

Did you test the patch with more than one device present?

The strtok(...":") from the patch destroys the saved state of the strtok(...",") from the outer loop:

  for (p = strtok(disknames, ","); p; p = strtok(NULL, ",")) { // <<-------
    if (strncmp(p, prefix, strlen(prefix))) {
      continue;
    }
+   for (u = strtok(p, ":"); u; u = strtok(NULL, ":"));        // <<-------
    mp[n] = (char *)malloc(strlen(net_dev_prefix) + strlen(p) + 2);

The following may work:

  for (p = strtok(disknames, ","); p; p = strtok(NULL, ",")) {
    if (strncmp(p, prefix, strlen(prefix))) {
      continue;
    }
+   char * u = strchr(p, ':');
+   if (u)
+     *u = 0;
    mp[n] = (char *)malloc(strlen(net_dev_prefix) + strlen(p) + 2);

[gbechis]

Your diff works, I will commit it to the OpenBSD source tree soon.

[Christian Franke]

r3207.