svn commit: r323863 - stable/11/usr.bin/ktrdump

[Mark Johnston]

Author: markj
Date: Thu Sep 21 12:37:12 2017
New Revision: 323863
URL: https://svnweb.freebsd.org/changeset/base/323863

Log:
  MFC r323439:
  Provide an error message if KTR symbols in a vmcore cannot be resolved.

Modified:
  stable/11/usr.bin/ktrdump/ktrdump.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/ktrdump/ktrdump.c
==============================================================================
--- stable/11/usr.bin/ktrdump/ktrdump.c	Thu Sep 21 12:31:51 2017	(r323862)
+++ stable/11/usr.bin/ktrdump/ktrdump.c	Thu Sep 21 12:37:12 2017	(r323863)
@@ -93,6 +93,7 @@ main(int ac, char **av)
 	char *p;
 	int version;
 	int entries;
+	int count;
 	int index, index2;
 	int parm;
 	int in;
@@ -162,8 +163,12 @@ main(int ac, char **av)
 	if ((kd = kvm_openfiles(Nflag ? execfile : NULL,
 	    Mflag ? corefile : NULL, NULL, O_RDONLY, errbuf)) == NULL)
 		errx(1, "%s", errbuf);
-	if (kvm_nlist(kd, nl) != 0 ||
-	    kvm_read(kd, nl[0].n_value, &version, sizeof(version)) == -1)
+	count = kvm_nlist(kd, nl);
+	if (count == -1)
+		errx(1, "%s", kvm_geterr(kd));
+	if (count > 0)
+		errx(1, "failed to resolve ktr symbols");
+	if (kvm_read(kd, nl[0].n_value, &version, sizeof(version)) == -1)
 		errx(1, "%s", kvm_geterr(kd));
 	if (version != KTR_VERSION)
 		errx(1, "ktr version mismatch");