Page MenuHomeFreeBSD
Files F152937609

D3391.id8524.diff
No OneTemporary
Actions

D3391.id8524.diff
View Options

Index: head/usr.sbin/pciconf/pathnames.h
===================================================================
--- head/usr.sbin/pciconf/pathnames.h
+++ head/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: head/usr.sbin/pciconf/pciconf.8
===================================================================
--- head/usr.sbin/pciconf/pciconf.8
+++ head/usr.sbin/pciconf/pciconf.8
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd January 20, 2014
+.Dd September 06, 2015
.Dt PCICONF 8
.Os
.Sh NAME
@@ -281,7 +281,9 @@
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 .
Index: head/usr.sbin/pciconf/pciconf.c
===================================================================
--- head/usr.sbin/pciconf/pciconf.c
+++ head/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;

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 19, 4:58 AM (15 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31746943
Default Alt Text
D3391.id8524.diff (1 KB)

Event Timeline