svn commit: r287746 - stable/10/usr.sbin/pciconf

[Baptiste Daroussin]

Author: bapt
Date: Sun Sep 13 07:15:45 2015
New Revision: 287746
URL: https://svnweb.freebsd.org/changeset/base/287746

Log:
  MFC: r287522
  
  Prefer pciids database from ports if present
  
  Given the pciids database on ports is updated more often than the one in base
  prefer this version if present, otherwise read the one from base.
  
  Relnotes:	yes
  Differential Revision:	https://reviews.freebsd.org/D3391

Modified:
  stable/10/usr.sbin/pciconf/pathnames.h
  stable/10/usr.sbin/pciconf/pciconf.8
  stable/10/usr.sbin/pciconf/pciconf.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/pciconf/pathnames.h
==============================================================================
--- stable/10/usr.sbin/pciconf/pathnames.h	Sun Sep 13 07:15:14 2015	(r287745)
+++ stable/10/usr.sbin/pciconf/pathnames.h	Sun Sep 13 07:15:45 2015	(r287746)
@@ -1,3 +1,4 @@
 /* $FreeBSD$ */
 #define	_PATH_DEVPCI	"/dev/pci"
 #define	_PATH_PCIVDB	"/usr/share/misc/pci_vendors"
+#define	_PATH_LPCIVDB	"/usr/local/share/pciids/pci.ids"

Modified: stable/10/usr.sbin/pciconf/pciconf.8
==============================================================================
--- stable/10/usr.sbin/pciconf/pciconf.8	Sun Sep 13 07:15:14 2015	(r287745)
+++ stable/10/usr.sbin/pciconf/pciconf.8	Sun Sep 13 07:15:45 2015	(r287746)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 20, 2014
+.Dd September 06, 2015
 .Dt PCICONF 8
 .Os
 .Sh NAME
@@ -281,7 +281,9 @@ indicates a halfword (two-byte) operatio
 The default is to read or
 write a longword (four bytes).
 .Sh ENVIRONMENT
-The PCI vendor/device information database is normally read from
+PCI vendor and device information is read from
+.Pa /usr/local/share/pciids/pci.ids .
+If that file is not present, it is read from
 .Pa /usr/share/misc/pci_vendors .
 This path can be overridden by setting the environment variable
 .Ev PCICONF_VENDOR_DATABASE .

Modified: stable/10/usr.sbin/pciconf/pciconf.c
==============================================================================
--- stable/10/usr.sbin/pciconf/pciconf.c	Sun Sep 13 07:15:14 2015	(r287745)
+++ stable/10/usr.sbin/pciconf/pciconf.c	Sun Sep 13 07:15:45 2015	(r287746)
@@ -542,9 +542,12 @@ load_vendors(void)
 	 */
 	TAILQ_INIT(&pci_vendors);
 	if ((dbf = getenv("PCICONF_VENDOR_DATABASE")) == NULL)
+		dbf = _PATH_LPCIVDB;
+	if ((db = fopen(dbf, "r")) == NULL) {
 		dbf = _PATH_PCIVDB;
-	if ((db = fopen(dbf, "r")) == NULL)
-		return(1);
+		if ((db = fopen(dbf, "r")) == NULL)
+			return(1);
+	}
 	cv = NULL;
 	cd = NULL;
 	error = 0;