Unify sysinfo plugins and add osx support

This does remove the net* commands from the
Unix version that may return at a later date
with OSX and Windows support.

This commit also makes numerious other changes
such as code cleanup, reformatting, etc.

Closes #829

7 files changed, 829 insertions, 0 deletions

diff --git a/plugins/sysinfo/unix/backend.c b/plugins/sysinfo/unix/backend.c
new file mode 100644
index 00000000..76a6f70f
--- /dev/null
+++ b/plugins/sysinfo/unix/backend.c
@@ -0,0 +1,170 @@
+/*
+ * SysInfo - sysinfo plugin for HexChat
+ * Copyright (c) 2015 Patrick Griffis.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <glib.h>
+#include "parse.h"
+#include "match.h"
+#include "sysinfo.h"
+#include "format.h"
+#include "df.h"
+
+char *sysinfo_backend_get_os(void)
+{
+	char name[bsize];
+
+	if (xs_parse_distro (name) != 0)
+	{
+		return NULL;
+	}
+
+	return g_strdup(name);
+}
+
+char *sysinfo_backend_get_disk(void)
+{
+	gint64 total, free;
+
+	if (xs_parse_df (&total, &free))
+	{
+		return NULL;
+	}
+
+	return sysinfo_format_disk (total, free);
+}
+
+char *sysinfo_backend_get_memory(void)
+{
+	unsigned long long mem_total;
+	unsigned long long mem_free;
+	unsigned long long swap_total;
+	unsigned long long swap_free;
+	char *swap_fmt = NULL, *mem_fmt, *ret;
+
+	if (xs_parse_meminfo (&mem_total, &mem_free, 0) == 1)
+	{
+		return NULL;
+	}
+	if (xs_parse_meminfo (&swap_total, &swap_free, 1) != 1)
+	{
+		swap_fmt = sysinfo_format_memory (swap_total, swap_free);
+	}
+
+	mem_fmt = sysinfo_format_memory (mem_total, mem_free);
+
+	if (swap_fmt)
+	{
+		ret = g_strdup_printf ("Physical: %s Swap: %s", mem_fmt, swap_fmt);
+		g_free (mem_fmt);
+		g_free (swap_fmt);
+	}
+	else
+		ret = mem_fmt;
+
+	return ret;
+}
+
+char *sysinfo_backend_get_cpu(void)
+{
+	char model[bsize];
+	char vendor[bsize];
+	char buffer[bsize];
+	double freq;
+	int giga = 0;
+
+	if (xs_parse_cpu (model, vendor, &freq) != 0)
+	{
+		return NULL;
+	}
+
+	if (freq > 1000)
+	{
+		freq /= 1000;
+		giga = 1;
+	}
+
+	if (giga)
+	{
+		g_snprintf (buffer, bsize, "%s (%.2fGHz)", model, freq);
+	}
+	else
+	{
+		g_snprintf (buffer, bsize, "%s (%.0fMHz)", model, freq);
+	}
+	
+	return g_strdup (buffer);
+}
+
+char *sysinfo_backend_get_gpu(void)
+{
+	char vid_card[bsize];
+	char agp_bridge[bsize];
+	char buffer[bsize];
+	int ret;
+
+	if ((ret = xs_parse_video (vid_card)) != 0)
+	{
+		return NULL;
+	}
+
+	if (xs_parse_agpbridge (agp_bridge) != 0)
+	{
+		g_snprintf (buffer, bsize, "%s", vid_card);
+	}
+	else
+	{
+		g_snprintf (buffer, bsize, "%s @ %s", vid_card, agp_bridge);
+	}
+
+	return g_strdup (buffer);
+}
+
+char *sysinfo_backend_get_sound(void)
+{
+	char sound[bsize];
+
+	if (xs_parse_sound (sound) != 0)
+	{
+		return NULL;
+	}
+	return g_strdup (sound);
+}
+
+char *sysinfo_backend_get_uptime(void)
+{
+	guint64 uptime;
+
+	if ((uptime = xs_parse_uptime ()) == 0)
+	{
+		return NULL;
+	}
+
+	return sysinfo_format_uptime (uptime);
+}
+
+char *sysinfo_backend_get_network(void)
+{
+	char ethernet_card[bsize];
+
+	if (xs_parse_ether (ethernet_card))
+	{
+		g_strlcpy (ethernet_card, "None found", bsize);
+	}
+	
+	return g_strdup (ethernet_card);
+}
diff --git a/plugins/sysinfo/unix/match.c b/plugins/sysinfo/unix/match.c
new file mode 100644
index 00000000..2ef51f3f
--- /dev/null
+++ b/plugins/sysinfo/unix/match.c
@@ -0,0 +1,98 @@
+/*
+ * match.c - matching functions for X-Sys
+ * Copyright (C) 2005, 2006, 2007 Tony Vroon
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib.h>
+#include "sysinfo.h"
+
+#define delims ":="
+
+void find_match_char(char *buffer, char *match, char *result)
+{
+	char *position;
+	g_strchug(buffer);
+	if(strstr(buffer, match) == strstr(buffer, buffer))
+	{
+		position = strpbrk(buffer, delims);
+		if (position != NULL)
+		{
+			position += 1;
+			strcpy(result, position);
+			position = strstr(result, "\n");
+			*(position) = '\0';
+			g_strchug(result);
+		}
+		else
+			strcpy(result, "\0");
+	}
+}
+
+void find_match_double(char *buffer, char *match, double *result)
+{
+	char *position;
+	g_strchug(buffer);
+	if(strstr(buffer, match) == strstr(buffer, buffer))
+	{
+		position = strpbrk(buffer, delims);
+		if (position != NULL)
+		{
+        	position += 1;
+        	*result = strtod(position, NULL);
+		}
+		else
+			*result = 0;
+	}
+}
+
+void find_match_double_hex(char *buffer, char *match, double *result)
+{
+	char *position;
+	g_strchug(buffer);
+	if(strstr(buffer, match) == strstr(buffer, buffer))
+	{
+		position = strpbrk(buffer, delims);
+		if (position != NULL)
+		{
+			memcpy(position,"0x",2);
+			*result = strtod(position,NULL);
+		}
+		else
+			*result = 0;
+	}
+}
+
+void find_match_ll(char *buffer, char *match, unsigned long long *result)
+{
+	char *position;
+	g_strchug(buffer);
+	if(strstr(buffer, match) == strstr(buffer, buffer))
+	{
+		position = strpbrk(buffer, delims);
+		if (position != NULL)
+		{
+			position += 1;
+			*result = strtoll(position, NULL, 10);
+		}
+		else
+			*result = 0;
+	}
+}
+
diff --git a/plugins/sysinfo/unix/match.h b/plugins/sysinfo/unix/match.h
new file mode 100644
index 00000000..16999fa2
--- /dev/null
+++ b/plugins/sysinfo/unix/match.h
@@ -0,0 +1,29 @@
+/*
+ * match.h - matching header for X-Sys
+ * Copyright (C) 2005 Tony Vroon
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef _MATCH_H_
+#define _MATCH_H_
+
+void find_match_char(char *buffer, char *match, char *result);
+void find_match_double(char *buffer, char *match, double *result);
+void find_match_double_hex(char *buffer, char *match, double *result);
+void find_match_ll(char *buffer, char *match, unsigned long long *result);
+void remove_leading_whitespace(char *buffer);
+
+#endif
diff --git a/plugins/sysinfo/unix/parse.c b/plugins/sysinfo/unix/parse.c
new file mode 100644
index 00000000..9f03533d
--- /dev/null
+++ b/plugins/sysinfo/unix/parse.c
@@ -0,0 +1,300 @@
+/*
+ * parse.c - parsing functions for X-Sys
+ * by mike9010
+ * Copyright (C) 2003, 2004, 2005 Michael Shoup
+ * Copyright (C) 2005, 2006, 2007 Tony Vroon
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <pci/header.h>
+#include <glib.h>
+
+#ifdef __sparc__
+#include <dirent.h>
+#endif
+
+#include "pci.h"
+#include "match.h"
+#include "parse.h"
+#include "sysinfo.h"
+
+int xs_parse_cpu(char *model, char *vendor, double *freq)
+{
+#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || defined(__alpha__) || defined(__ia64__) || defined(__parisc__) || defined(__sparc__)
+	char buffer[bsize];
+#endif
+#if defined(__powerpc__)
+	char *pos = NULL;
+#endif
+	FILE *fp = fopen("/proc/cpuinfo", "r");
+	if(fp == NULL)
+		return 1;
+	
+	#if defined(__i386__) || defined(__x86_64__)
+	while(fgets(buffer, bsize, fp) != NULL)
+	{
+		find_match_char(buffer, "model name", model);
+		find_match_char(buffer, "vendor_id", vendor);
+		find_match_double(buffer, "cpu MHz", freq);
+	}
+	#endif
+	#ifdef __powerpc__
+	while(fgets(buffer, bsize, fp) != NULL)
+	{
+		find_match_char(buffer, "cpu", model);
+		find_match_char(buffer, "machine", vendor);
+		find_match_double(buffer, "clock", freq);
+	}
+	pos = strstr(model, ",");
+	if (pos != NULL) *pos = '\0';
+	#endif
+	#ifdef __alpha__
+	while(fgets(buffer, bsize, fp) != NULL)
+	{
+		find_match_char(buffer, "cpu model", model);
+		find_match_char(buffer, "system type", vendor);
+		find_match_double(buffer, "cycle frequency [Hz]", freq);
+	}
+	*freq = *freq / 1000000;
+	#endif
+	#ifdef __ia64__
+	while(fgets(buffer, bsize, fp) != NULL)
+	{
+		find_match_char(buffer, "model", model);
+		find_match_char(buffer, "vendor", vendor);
+		find_match_double(buffer, "cpu MHz", freq);
+	}
+	#endif
+	#ifdef __parisc__
+	while(fgets(buffer, bsize, fp) != NULL)
+	{
+		find_match_char(buffer, "cpu  ", model);
+		find_match_char(buffer, "cpu family", vendor);
+		find_match_double(buffer, "cpu MHz", freq);
+	}
+	#endif
+	#ifdef __sparc__
+	DIR *dir;
+	struct dirent *entry;
+	FILE *fp2;
+	while(fgets(buffer, bsize, fp) != NULL)
+	{
+		find_match_char(buffer, "cpu	", model);
+		find_match_char(buffer, "type	", vendor);
+		find_match_double_hex(buffer, "Cpu0ClkTck", freq);
+	}
+	*freq = *freq / 1000000;
+	#endif
+	fclose(fp);
+	
+	return 0;
+}
+
+guint64 xs_parse_uptime(void)
+{
+	char buffer[bsize];
+	guint64 uptime = 0;
+	FILE *fp = fopen("/proc/uptime", "r");
+	if(fp == NULL)
+		return 0;
+
+	if(fgets(buffer, bsize, fp) != NULL)
+		uptime = strtol(buffer, NULL, 0);
+	
+	fclose(fp);
+	
+	return uptime;
+}
+
+int xs_parse_sound(char *snd_card)
+{
+	char buffer[bsize], cards[bsize] = "\0", vendor[7] = "\0", device[7] = "\0", *pos;
+	u16 class = PCI_CLASS_MULTIMEDIA_AUDIO;
+
+	FILE *fp = NULL;
+	if((fp = fopen("/proc/asound/cards", "r"))== NULL)
+	{
+		if (pci_find_by_class(&class, vendor, device) == 0) 
+		{
+			pci_find_fullname(snd_card, vendor, device);
+			return 0;
+		}
+		else
+			return 1;
+	}
+	
+	
+	while(fgets(buffer, bsize, fp) != NULL)
+	{
+		if(isdigit(buffer[0]) || isdigit(buffer[1]))
+		{
+			char card_buf[bsize];
+			long card_id = 0;
+			pos = strstr(buffer, ":");
+			card_id = strtoll(buffer, NULL, 0);
+			if (card_id == 0)
+				g_snprintf(card_buf, bsize, "%s", pos+2);
+			else
+				g_snprintf(card_buf, bsize, "%ld: %s", card_id, pos+2);
+			pos = strstr(card_buf, "\n");
+			*pos = '\0';
+			strcat(cards, card_buf);
+		}
+	}
+
+	strcpy(snd_card, cards);
+	
+	fclose(fp);
+	return 0;
+}
+
+int xs_parse_video(char *vid_card)
+{
+	char vendor[7] = "\0", device[7] = "\0";
+	u16 class = PCI_CLASS_DISPLAY_VGA;
+	if (pci_find_by_class(&class, vendor, device))
+		return 1;
+	else
+		pci_find_fullname(vid_card, vendor, device);
+	return 0;
+}
+
+int xs_parse_ether(char *ethernet_card)
+{
+	char vendor[7] = "\0", device[7] = "\0";
+	u16 class = PCI_CLASS_NETWORK_ETHERNET;
+	if (pci_find_by_class(&class, vendor, device))
+		return 1;
+	else
+		pci_find_fullname(ethernet_card, vendor, device);
+	return 0;
+}
+
+int xs_parse_agpbridge(char *agp_bridge)
+{
+	char vendor[7] = "\0", device[7] = "\0";
+	u16 class = PCI_CLASS_BRIDGE_HOST;
+	if (pci_find_by_class(&class, vendor, device))
+		return 1;
+	else
+		pci_find_fullname(agp_bridge, vendor, device);
+	return 0;
+}
+
+int xs_parse_meminfo(unsigned long long *mem_tot, unsigned long long *mem_free, int swap)
+{
+	FILE *fp;
+	char buffer[bsize];
+	unsigned long long freemem = 0, buffers = 0, cache = 0;
+	*mem_tot = 0;
+	*mem_free = 0;
+
+	if((fp = fopen("/proc/meminfo", "r")) == NULL)
+		return 1;
+
+	while(fgets(buffer, bsize, fp) != NULL)
+	{
+		if(!swap)
+		{
+			find_match_ll(buffer, "MemTotal:", mem_tot);
+			find_match_ll(buffer, "MemFree:", &freemem);
+			find_match_ll(buffer, "Buffers:", &buffers);
+			find_match_ll(buffer, "Cached:", &cache);
+		}
+		else
+		{
+			find_match_ll(buffer, "SwapTotal:", mem_tot);
+			find_match_ll(buffer, "SwapFree:", mem_free);
+		}
+	}
+	if (!swap)
+	{
+		*mem_free = freemem + buffers + cache;
+	}
+	fclose(fp);
+
+	/* Convert to bytes */
+	*mem_free *= 1000;
+	*mem_tot *= 1000;
+	return 0;
+}
+
+int xs_parse_distro(char *name)
+{
+	FILE *fp = NULL;
+	char buffer[bsize], *pos = NULL;
+
+	if((fp = fopen("/etc/portage/make.conf", "r")) != NULL ||
+			(fp = fopen("/etc/make.conf", "r")) != NULL)
+	{
+		char keywords[bsize];
+		while(fgets(buffer, bsize, fp) != NULL)
+			find_match_char(buffer, "ACCEPT_KEYWORDS", keywords);
+		/* cppcheck-suppress uninitvar */
+		if (strstr(keywords, "\"") == NULL)
+			g_snprintf(buffer, bsize, "Gentoo Linux (stable)");
+		else
+			g_snprintf(buffer, bsize, "Gentoo Linux %s", keywords);
+	}
+	else if((fp = fopen("/etc/redhat-release", "r")) != NULL)
+		fgets(buffer, bsize, fp);
+	else if((fp = fopen("/etc/mageia-release", "r")) != NULL)
+		fgets(buffer, bsize, fp);
+	else if((fp = fopen("/etc/slackware-version", "r")) != NULL)
+		fgets(buffer, bsize, fp);
+	else if((fp = fopen("/etc/mandrake-release", "r")) != NULL)
+		fgets(buffer, bsize, fp);
+	else if((fp = fopen("/etc/SuSE-release", "r")) != NULL)
+		fgets(buffer, bsize, fp);
+	else if((fp = fopen("/etc/turbolinux-release", "r")) != NULL)
+		fgets(buffer, bsize, fp);
+	else if((fp = fopen("/etc/arch-release", "r")) != NULL)
+		g_snprintf(buffer, bsize, "ArchLinux");
+	else if((fp = fopen("/etc/lsb-release", "r")) != NULL)
+	{
+		char id[bsize], codename[bsize], release[bsize];
+		strcpy(id, "?");
+		strcpy(codename, "?");
+		strcpy(release, "?");
+		while(fgets(buffer, bsize, fp) != NULL)
+		{
+			find_match_char(buffer, "DISTRIB_ID", id);
+			find_match_char(buffer, "DISTRIB_CODENAME", codename);
+			find_match_char(buffer, "DISTRIB_RELEASE", release);
+		}
+		g_snprintf(buffer, bsize, "%s \"%s\" %s", id, codename, release);
+	}
+	else if((fp = fopen("/etc/debian_version", "r")) != NULL)
+	{
+		char release[bsize];
+		fgets(release, bsize, fp);
+		g_snprintf(buffer, bsize, "Debian %s", release);
+	}
+	else
+		g_snprintf(buffer, bsize, "Unknown Distro");
+	if(fp != NULL)
+		fclose(fp);
+	
+	pos=strchr(buffer, '\n');
+	if(pos != NULL)
+		*pos = '\0';
+	strcpy(name, buffer);
+	return 0;
+}
diff --git a/plugins/sysinfo/unix/parse.h b/plugins/sysinfo/unix/parse.h
new file mode 100644
index 00000000..89f1299c
--- /dev/null
+++ b/plugins/sysinfo/unix/parse.h
@@ -0,0 +1,35 @@
+/*
+ * parse.h - parsing header for X-Sys
+ * by mikeshoup
+ * Copyright (C) 2003, 2004, 2005 Michael Shoup
+ * Copyright (C) 2005, 2006 Tony Vroon
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+
+#ifndef _PARSE_H_
+#define _PARSE_H_
+
+int xs_parse_cpu(char *model, char *vendor, double *freq);
+guint64 xs_parse_uptime(void);
+int xs_parse_sound(char *snd_card);
+int xs_parse_meminfo(unsigned long long *mem_tot, unsigned long long *mem_free, int swap);
+int xs_parse_video(char *vid_card);
+int xs_parse_agpbridge(char *agp_bridge);
+int xs_parse_ether(char *ethernet_card);
+int xs_parse_distro(char *name);
+
+#endif
diff --git a/plugins/sysinfo/unix/pci.c b/plugins/sysinfo/unix/pci.c
new file mode 100644
index 00000000..71b085fe
--- /dev/null
+++ b/plugins/sysinfo/unix/pci.c
@@ -0,0 +1,169 @@
+/*
+ * pci.c - PCI functions for X-Sys
+ * Copyright (C) 1997-1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz> [PCI routines from lspci]
+ * Copyright (C) 2000 Tom Rini <trini@kernel.crashing.org> [XorgAutoConfig pci.c, based on lspci]
+ * Copyright (C) 2005, 2006 Tony Vroon
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <pci/pci.h>
+#include <glib.h>
+
+#include "sysinfo.h"
+
+static struct pci_filter filter;       /* Device filter */
+static struct pci_access *pacc;
+int bus, dev, func; /* Location of the card */
+
+struct device {
+	struct device *next;
+	struct pci_dev *dev;
+	unsigned int config_cnt;
+	u8 config[256];
+};
+
+static struct device *first_dev;
+
+static struct device *scan_device(struct pci_dev *p)
+{
+	int how_much = 64;
+	struct device *d;
+
+	if (!pci_filter_match(&filter, p))
+		return NULL;
+	d = g_new0 (struct device, 1);
+	d->dev = p;
+	if (!pci_read_block(p, 0, d->config, how_much))
+		exit(1);
+	if (how_much < 128 && (d->config[PCI_HEADER_TYPE] & 0x7f) == PCI_HEADER_TYPE_CARDBUS)
+	{
+		/* For cardbus bridges, we need to fetch 64 bytes more to get the full standard header... */
+		if (!pci_read_block(p, 64, d->config+64, 64))
+			exit(1);
+		how_much = 128;
+	}
+	d->config_cnt = how_much;
+	pci_setup_cache(p, d->config, d->config_cnt);
+	pci_fill_info(p, PCI_FILL_IDENT);
+	return d;
+}
+
+static void scan_devices(void)
+{
+	struct device *d;
+	struct pci_dev *p;
+
+	pci_scan_bus(pacc);
+	for(p=pacc->devices; p; p=p->next)
+	{
+		if ((d = scan_device(p)))
+		{
+			d->next = first_dev;
+			first_dev = d;
+		}
+	}
+}
+
+static u16 get_conf_word(struct device *d, unsigned int pos)
+{
+	  return d->config[pos] | (d->config[pos+1] << 8);
+}
+
+int pci_find_by_class(u16 *class, char *vendor, char *device)
+{
+	struct device *d;
+	struct pci_dev *p;
+	int nomatch = 1;
+
+	pacc = pci_alloc();
+	pci_filter_init(pacc, &filter);
+	pci_init(pacc);
+	scan_devices();
+
+	for(d=first_dev; d; d=d->next)
+	{
+		p = d->dev;
+		/* Acquire vendor & device ID if the class matches */
+		if(get_conf_word(d, PCI_CLASS_DEVICE) == *class)
+		{
+			nomatch = 0;
+			g_snprintf(vendor,7,"%04x",p->vendor_id);
+			g_snprintf(device,7,"%04x",p->device_id);
+			break;
+		}
+	  }
+
+	  pci_cleanup(pacc);
+	  return nomatch;
+}
+
+void pci_find_fullname(char *fullname, char *vendor, char *device)
+{
+	char buffer[bsize];
+	char vendorname[bsize/2] = "";
+	char devicename[bsize/2] = "";
+	char *position;
+	int cardfound = 0;
+	FILE *fp;
+	
+	if (!sysinfo_get_str_pref ("pciids", buffer))
+		strcpy (buffer, DEFAULT_PCIIDS);
+
+	fp = fopen (buffer, "r");
+	if(fp == NULL)
+	{
+		g_snprintf(fullname, bsize, "%s:%s", vendor, device);
+		//sysinfo_print_error ("pci.ids file not found! You might want to adjust your pciids setting with /SYSINFO SET pciids (you can query its current value with /SYSINFO LIST).\n");
+		return;
+	}
+
+	while(fgets(buffer, bsize, fp) != NULL)
+	{
+		if (!isspace(buffer[0]) && strstr(buffer, vendor) != NULL)
+		{
+			position = strstr(buffer, vendor);
+			position += 6;
+			strncpy(vendorname, position, bsize/2);
+			position = strstr(vendorname, "\n");
+			*(position) = '\0';
+			break;
+		}
+	}
+	while(fgets(buffer, bsize, fp) != NULL)
+	{
+		if(strstr(buffer, device) != NULL)
+		{
+			position = strstr(buffer, device);
+			position += 6;
+			strncpy(devicename, position, bsize/2);
+			position = strstr(devicename, " (");
+			if (position == NULL)
+				position = strstr(devicename, "\n");
+			*(position) = '\0';
+			cardfound = 1;
+			break;
+		 }
+	}
+	if (cardfound == 1)
+		g_snprintf(fullname, bsize, "%s %s", vendorname, devicename);
+	else
+		g_snprintf(fullname, bsize, "%s:%s", vendor, device);	
+	fclose(fp);
+}
diff --git a/plugins/sysinfo/unix/pci.h b/plugins/sysinfo/unix/pci.h
new file mode 100644
index 00000000..673f0a0a
--- /dev/null
+++ b/plugins/sysinfo/unix/pci.h
@@ -0,0 +1,28 @@
+/*
+ * pci.h - PCI header for X-Sys
+ * Copyright (C) 2005 Tony Vroon
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+
+#ifndef _PCI_H_
+#define _PCI_H_
+
+#include <pci/pci.h>
+void pci_find_fullname(char *fullname, char *vendor, char *device);
+int  pci_find_by_class(u16 *class, char *vendor, char *device);
+
+#endif