[patch] lspci.patch

lspci.patch (text/plain), 2.59 KB, created by Rafal Glazar on 2006-01-12 17:38:02 UTC

diff -Naur src.orig/hardware_info.h src/hardware_info.h
--- src.orig/hardware_info.h	2005-07-18 17:21:45.000000000 +0200
+++ src/hardware_info.h	2006-01-13 02:33:02.000000000 +0100
@@ -39,8 +39,10 @@
 Glib::ustring ethc2 = "";
 
 bool sbinpath = true;
+bool usrsbin = false;
 Glib::ustring lspci_path1 = "/sbin/lspci";
 Glib::ustring lspci_path2 = "lspci";
+Glib::ustring lspci_path3 = "/usr/sbin/lspci";
 
 //lspci path check
 void Lspci() {
@@ -57,6 +59,12 @@
     sbinpath = false;
   }
   fin.close();
+  fin.open("/usr/sbin/lspci",std::ios::in);
+  if(fin.is_open()) {
+    sbinpath = false;
+    usrsbin = true;
+  }
+  fin.close();
 }
 
 //motherboard chipset
@@ -67,9 +75,12 @@
 	Glib::ustring grep_bridge = " | grep bridge";
 	if (sbinpath == true)
 		path = lspci_path1 + grep_bridge;
-	else
-		path = lspci_path2 + grep_bridge;
-	
+	else {
+		if (usrsbin == true)
+			path = lspci_path3 + grep_bridge;
+		else
+			path = lspci_path2 + grep_bridge;
+	}
 	FILE *file;
 
 	char mot1[150];
@@ -109,8 +120,12 @@
 	Glib::ustring grep_ide = " | grep IDE";
 	if (sbinpath == true)
 		path = lspci_path1 + grep_ide;
-	else
-		path = lspci_path2 + grep_ide;
+	else {
+		if (usrsbin == true)
+			path = lspci_path3 + grep_ide;
+		else
+			path = lspci_path2 + grep_ide;
+	}
 	
 	FILE *file;
 	
@@ -135,8 +150,12 @@
 	Glib::ustring grep_vga = " | grep VGA";
 	if (sbinpath == true)
 		path = lspci_path1 + grep_vga;
-	else
-		path = lspci_path2 + grep_vga;
+	else {
+		if (usrsbin == true)
+			path = lspci_path3 + grep_vga;
+		else
+			path = lspci_path2 + grep_vga;
+	}
 	
 	FILE *file;
 	
@@ -161,8 +180,12 @@
 	Glib::ustring grep_audio = " | grep audio";
 	if (sbinpath == true)
 		path = lspci_path1 + grep_audio;
-	else
-		path = lspci_path2 + grep_audio;
+	else {
+		if (usrsbin == true)
+			path = lspci_path3 + grep_audio;
+		else
+			path = lspci_path2 + grep_audio;
+	}
 	
 	FILE *file;
 	
@@ -195,8 +218,12 @@
 	Glib::ustring grep_eth = " | grep Ethernet";
 	if (sbinpath == true)
 		path = lspci_path1 + grep_eth;
-	else
-		path = lspci_path2 + grep_eth;
+	else {
+		if (usrsbin == true)
+			path = lspci_path3 + grep_eth;
+		else
+			path = lspci_path2 + grep_eth;
+	}
 	
 	FILE *file;
 	
diff -Naur src.orig/usb_info.h src/usb_info.h
--- src.orig/usb_info.h	2005-07-18 17:21:51.000000000 +0200
+++ src/usb_info.h	2006-01-13 02:33:58.000000000 +0100
@@ -44,8 +44,12 @@
 	Glib::ustring grep_usb = " | grep USB";
 	if (sbinpath == true)
 		path = lspci_path1 + grep_usb;
-	else
-		path = lspci_path2 + grep_usb;
+	else {
+		if (usrsbin == true)
+			path = lspci_path3 + grep_usb;
+		else
+			path = lspci_path2 + grep_usb;
+	}
 	
 	FILE *file;