D3391.id7968.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3391.id7968.diff
View Options

	Index: usr.sbin/pciconf/pathnames.h
	===================================================================
	--- usr.sbin/pciconf/pathnames.h
	+++ usr.sbin/pciconf/pathnames.h
	@@ -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"
	Index: usr.sbin/pciconf/pciconf.8
	===================================================================
	--- usr.sbin/pciconf/pciconf.8
	+++ usr.sbin/pciconf/pciconf.8
	@@ -282,6 +282,8 @@
	write a longword (four bytes).
	.Sh ENVIRONMENT
	The PCI vendor/device information database is normally read from
	+.Pa /usr/local/share/pciids/pci.ids
	+if not found then
	.Pa /usr/share/misc/pci_vendors .
	This path can be overridden by setting the environment variable
	.Ev PCICONF_VENDOR_DATABASE .
	Index: usr.sbin/pciconf/pciconf.c
	===================================================================
	--- usr.sbin/pciconf/pciconf.c
	+++ usr.sbin/pciconf/pciconf.c
	@@ -549,9 +549,12 @@
	*/
	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;