From 6a77734d1b1ac1938abbc33014b60cfb49828824 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Mon, 11 Aug 2014 20:15:19 -0500 Subject: Promote lspci. --- toys/other/lspci.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++ toys/pending/lspci.c | 129 --------------------------------------------------- 2 files changed, 129 insertions(+), 129 deletions(-) create mode 100644 toys/other/lspci.c delete mode 100644 toys/pending/lspci.c (limited to 'toys') diff --git a/toys/other/lspci.c b/toys/other/lspci.c new file mode 100644 index 00000000..40e0c0a0 --- /dev/null +++ b/toys/other/lspci.c @@ -0,0 +1,129 @@ +/* + * lspci - written by Isaac Dunham + +USE_LSPCI(NEWTOY(lspci, "emkn"USE_LSPCI_TEXT("@i:"), TOYFLAG_USR|TOYFLAG_BIN)) + +config LSPCI + bool "lspci" + default y + help + usage: lspci [-ekm] + + List PCI devices. + + -e Print all 6 digits in class + -k Print kernel driver + -m Machine parseable format + +config LSPCI_TEXT + bool "lspci readable output" + depends on LSPCI + default y + help + usage: lspci [-n] [-i FILE ] + + -n Numeric output (repeat for readable and numeric) + -i PCI ID database (default /usr/share/misc/pci.ids) + +*/ + +#define FOR_lspci +#include "toys.h" + +GLOBALS( + char *ids; + long numeric; + + FILE *db; +) + +int do_lspci(struct dirtree *new) +{ + char *p = toybuf, *vendor = toybuf+9, *device = toybuf+18, + driver[256], *vbig = 0, *dbig = 0, **fields; + int dirfd; + + if (!new->parent) return DIRTREE_RECURSE; + + // Parse data out of /proc + + if (-1 == (dirfd = openat(dirtree_parentfd(new), new->name, O_RDONLY))) + return 0; + + *driver = 0; + if (toys.optflags & FLAG_k) + readlinkat(dirfd, "driver", driver, sizeof(driver)); + + for (fields = (char*[]){"class", "vendor", "device", 0}; *fields; fields++) { + int fd, size = 6 + 2*((toys.optflags & FLAG_e) && p == toybuf); + *p = 0; + + if (-1 == (fd = openat(dirfd, *fields, O_RDONLY))) { + close(dirfd); + return 0; + } + xreadall(fd, p, size); + memmove(p, p+2, size -= 2); + p[size] = 0; + close(fd); + p += 9; + } + + close(dirfd); + + // Lookup/display data from pci.ids? + + if (CFG_LSPCI_TEXT && TT.db) { + if (TT.numeric != 1) { + char *s; + + fseek(TT.db, 0, SEEK_SET); + while (!vbig || !dbig) { + s = p; + if (!fgets(s, sizeof(toybuf)-(p-toybuf)-1, TT.db)) break; + while (isspace(*s)) s++; + if (*s == '#') continue; + if (vbig && s == p) break; + if (strstart(&s, vbig ? device : vendor)) { + if (vbig) dbig = s+2; + else vbig = s+2; + s += strlen(s); + s[-1] = 0; // trim ending newline + p = s + 1; + } + } + } + + if (TT.numeric > 1) { + printf((toys.optflags & FLAG_m) + ? "%s, \"%s\" \"%s [%s]\" \"%s [%s]\"" + : "%s Class %s: %s [%s] %s [%s]", + new->name+5, toybuf, vbig ? vbig : "", vendor, + dbig ? dbig : "", device); + + goto driver; + } + } + + printf((toys.optflags & FLAG_m) ? "%s \"%s\" \"%s\" \"%s\"" + : "%s Class %s: %s:%s", new->name+5, toybuf, + vbig ? vbig : vendor, dbig ? dbig : device); + +driver: + if (*driver) + printf((toys.optflags & FLAG_m) ? " \"%s\"" : " %s", basename(driver)); + xputc('\n'); + + return 0; +} + +void lspci_main(void) +{ + if (CFG_LSPCI_TEXT && TT.numeric != 1) { + if (!TT.ids) TT.ids = "/usr/share/misc/pci.ids"; + if (!(TT.db = fopen(TT.ids, "r"))) + perror_msg("could not open PCI ID db"); + } + + dirtree_read("/sys/bus/pci/devices", do_lspci); +} diff --git a/toys/pending/lspci.c b/toys/pending/lspci.c deleted file mode 100644 index 7361ca14..00000000 --- a/toys/pending/lspci.c +++ /dev/null @@ -1,129 +0,0 @@ -/* - * lspci - written by Isaac Dunham - -USE_LSPCI(NEWTOY(lspci, "emkn"USE_LSPCI_TEXT("@i:"), TOYFLAG_USR|TOYFLAG_BIN)) - -config LSPCI - bool "lspci" - default n - help - usage: lspci [-ekm] - - List PCI devices. - - -e Print all 6 digits in class - -k Print kernel driver - -m Machine parseable format - -config LSPCI_TEXT - bool "lspci readable output" - depends on LSPCI - default n - help - usage: lspci [-n] [-i FILE ] - - -n Numeric output (repeat for readable and numeric) - -i PCI ID database (default /usr/share/misc/pci.ids) - -*/ - -#define FOR_lspci -#include "toys.h" - -GLOBALS( - char *ids; - long numeric; - - FILE *db; -) - -int do_lspci(struct dirtree *new) -{ - char *p = toybuf, *vendor = toybuf+9, *device = toybuf+18, - driver[256], *vbig = 0, *dbig = 0, **fields; - int dirfd; - - if (!new->parent) return DIRTREE_RECURSE; - - // Parse data out of /proc - - if (-1 == (dirfd = openat(dirtree_parentfd(new), new->name, O_RDONLY))) - return 0; - - *driver = 0; - if (toys.optflags & FLAG_k) - readlinkat(dirfd, "driver", driver, sizeof(driver)); - - for (fields = (char*[]){"class", "vendor", "device", 0}; *fields; fields++) { - int fd, size = 6 + 2*((toys.optflags & FLAG_e) && p == toybuf); - *p = 0; - - if (-1 == (fd = openat(dirfd, *fields, O_RDONLY))) { - close(dirfd); - return 0; - } - xreadall(fd, p, size); - memmove(p, p+2, size -= 2); - p[size] = 0; - close(fd); - p += 9; - } - - close(dirfd); - - // Lookup/display data from pci.ids? - - if (CFG_LSPCI_TEXT && TT.db) { - if (TT.numeric != 1) { - char *s; - - fseek(TT.db, 0, SEEK_SET); - while (!vbig || !dbig) { - s = p; - if (!fgets(s, sizeof(toybuf)-(p-toybuf)-1, TT.db)) break; - while (isspace(*s)) s++; - if (*s == '#') continue; - if (vbig && s == p) break; - if (strstart(&s, vbig ? device : vendor)) { - if (vbig) dbig = s+2; - else vbig = s+2; - s += strlen(s); - s[-1] = 0; // trim ending newline - p = s + 1; - } - } - } - - if (TT.numeric > 1) { - printf((toys.optflags & FLAG_m) - ? "%s, \"%s\" \"%s [%s]\" \"%s [%s]\"" - : "%s Class %s: %s [%s] %s [%s]", - new->name+5, toybuf, vbig ? vbig : "", vendor, - dbig ? dbig : "", device); - - goto driver; - } - } - - printf((toys.optflags & FLAG_m) ? "%s \"%s\" \"%s\" \"%s\"" - : "%s Class %s: %s:%s", new->name+5, toybuf, - vbig ? vbig : vendor, dbig ? dbig : device); - -driver: - if (*driver) - printf((toys.optflags & FLAG_m) ? " \"%s\"" : " %s", basename(driver)); - xputc('\n'); - - return 0; -} - -void lspci_main(void) -{ - if (CFG_LSPCI_TEXT && TT.numeric != 1) { - if (!TT.ids) TT.ids = "/usr/share/misc/pci.ids"; - if (!(TT.db = fopen(TT.ids, "r"))) - perror_msg("could not open PCI ID db"); - } - - dirtree_read("/sys/bus/pci/devices", do_lspci); -} -- cgit v1.2.3