blob: 026806449c4e6c1208909ef92f6f180aa44b6c72 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
--- ./apps/kinfocenter/base/info_fbsd.cpp.orig 2009-04-15 14:25:24.000000000 +0400
+++ ./apps/kinfocenter/base/info_fbsd.cpp 2009-09-22 21:33:38.000000000 +0400
@@ -211,28 +211,17 @@
FILE *pipe;
QFile *pcicontrol;
QString s, cmd;
+ QTextStream *t;
QTreeWidgetItem *olditem= NULL;
pcicontrol = new QFile("/usr/sbin/pciconf");
if (!pcicontrol->exists()) {
+ QStringList list;
+ list << i18n("Could not find any programs with which to query your system's PCI information");
+ new QTreeWidgetItem(tree, list);
delete pcicontrol;
- pcicontrol = new QFile("/usr/X11R6/bin/scanpci");
- if (!pcicontrol->exists()) {
- delete pcicontrol;
- pcicontrol = new QFile("/usr/X11R6/bin/pcitweak");
- if (!pcicontrol->exists()) {
- QStringList list;
- list << i18n("Could not find any programs with which to query your system's PCI information");
- new QTreeWidgetItem(tree, list);
- delete pcicontrol;
- return true;
- } else {
- cmd = "/usr/X11R6/bin/pcitweak -l 2>&1";
- }
- } else {
- cmd = "/usr/X11R6/bin/scanpci";
- }
+ return true;
} else {
cmd = "/usr/sbin/pciconf -l -v 2>&1";
}
@@ -247,8 +236,19 @@
/* This prints out a list of all the pci devies, perhaps eventually we could
parse it as opposed to schlepping it into a listbox */
+ t = new QTextStream(pipe, QIODevice::ReadOnly);
+
+ while (true) {
+ s = t->readLine();
+ if (s.isEmpty() )
+ break;
+ QStringList list;
+ list << s;
+ new QTreeWidgetItem(tree, list);
+ }
+
+ delete t;
pclose(pipe);
- GetInfo_ReadfromPipe(tree, cmd.toLatin1(), true);
}
if (!tree->topLevelItemCount()) {
|
