Don't print duplicate udev rules

https://bugs.freedesktop.org/show_bug.cgi?id=45513
This commit is contained in:
Bastien Nocera 2012-02-02 05:28:17 +00:00
parent 3d2e545264
commit dfff16f3e3

View file

@ -37,21 +37,35 @@ struct fp_driver whitelist = {
.id_table = whitelist_id_table, .id_table = whitelist_id_table,
}; };
GHashTable *printed = NULL;
static void print_driver (struct fp_driver *driver) static void print_driver (struct fp_driver *driver)
{ {
int i, j, blacklist; int i, j, blacklist;
for (i = 0; driver->id_table[i].vendor != 0; i++) { for (i = 0; driver->id_table[i].vendor != 0; i++) {
char *key;
blacklist = 0; blacklist = 0;
for (j = 0; blacklist_id_table[j].vendor != 0; j++) { for (j = 0; blacklist_id_table[j].vendor != 0; j++) {
if (driver->id_table[i].vendor == blacklist_id_table[j].vendor && if (driver->id_table[i].vendor == blacklist_id_table[j].vendor &&
driver->id_table[j].product == blacklist_id_table[j].product) { driver->id_table[j].product == blacklist_id_table[j].product) {
blacklist = 1; blacklist = 1;
break;
} }
} }
if (blacklist) if (blacklist)
continue; continue;
key = g_strdup_printf ("%04x:%04x", driver->id_table[i].vendor, driver->id_table[i].product);
if (g_hash_table_lookup (printed, key) != NULL) {
g_free (key);
continue;
}
g_hash_table_insert (printed, key, GINT_TO_POINTER (1));
printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", ATTR{power/control}=\"auto\"\n", driver->id_table[i].vendor, driver->id_table[i].product); printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", ATTR{power/control}=\"auto\"\n", driver->id_table[i].vendor, driver->id_table[i].product);
} }
} }
@ -63,11 +77,15 @@ int main (int argc, char **argv)
list = fprint_get_drivers (); list = fprint_get_drivers ();
printed = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
for (i = 0; list[i] != NULL; i++) { for (i = 0; list[i] != NULL; i++) {
print_driver (list[i]); print_driver (list[i]);
} }
print_driver (&whitelist); print_driver (&whitelist);
g_hash_table_destroy (printed);
return 0; return 0;
} }