diff options
| author | Souf Oued | 2010-03-23 05:06:37 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2010-03-23 05:11:40 +0100 |
| commit | 1c3f117ca4d1363177ed7c55c443ddaca9ddc668 (patch) | |
| tree | 10f29dc80a90cbf93e20c7b2aa991efd7ac2f162 | |
| parent | e283413395431a3b49aaf7c74ce6c7701232eff1 (diff) | |
| download | busybox-1c3f117ca4d1363177ed7c55c443ddaca9ddc668.zip busybox-1c3f117ca4d1363177ed7c55c443ddaca9ddc668.tar.gz | |
lsusb: 2.6.32 compat
Signed-off-by: Souf Oued <souf_oued@yahoo.fr>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | util-linux/lsusb.c | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/util-linux/lsusb.c b/util-linux/lsusb.c index 7c5b6b9..c15b8ca 100644 --- a/util-linux/lsusb.c +++ b/util-linux/lsusb.c @@ -15,37 +15,41 @@ static int FAST_FUNC fileAction( int depth UNUSED_PARAM) { parser_t *parser; - char *tokens[6]; - char *bus = NULL, *device = NULL; + char *tokens[4]; + char *busnum = NULL, *devnum = NULL; int product_vid = 0, product_did = 0; - char *uevent_filename = concat_path_file(fileName, "/uevent"); + parser = config_open2(uevent_filename, fopen_for_read); free(uevent_filename); - while (config_read(parser, tokens, 6, 1, "\\/=", PARSE_NORMAL)) { + while (config_read(parser, tokens, 4, 2, "\\/=", PARSE_NORMAL)) { if ((parser->lineno == 1) && strcmp(tokens[0], "DEVTYPE") == 0) { break; } - if (strcmp(tokens[0], "DEVICE") == 0) { - bus = xstrdup(tokens[4]); - device = xstrdup(tokens[5]); - continue; - } - if (strcmp(tokens[0], "PRODUCT") == 0) { product_vid = xstrtou(tokens[1], 16); product_did = xstrtou(tokens[2], 16); continue; } + + if (strcmp(tokens[0], "BUSNUM") == 0) { + busnum = xstrdup(tokens[1]); + continue; + } + + if (strcmp(tokens[0], "DEVNUM") == 0) { + devnum = xstrdup(tokens[1]); + continue; + } } config_close(parser); - if (bus) { - printf("Bus %s Device %s: ID %04x:%04x\n", bus, device, product_vid, product_did); - free(bus); - free(device); + if (busnum) { + printf("Bus %s Device %s: ID %04x:%04x\n", busnum, devnum, product_vid, product_did); + free(busnum); + free(devnum); } return TRUE; |