* Update the udev rule due to usb_id udev import is disabled in some systems.

 * Make the matching rule of printer device path more flexible.

Author: hugh712

udev/70-printers.rules

@@ -1,4 +1,4 @@
 # Low-level USB device add trigger
 ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", TAG+="systemd", ENV{SYSTEMD_WANTS}="configure-printer@usb-$env{BUSNUM}-$env{DEVNUM}.service"
 # Low-level USB device remove trigger
-ACTION=="remove", SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="*:0701*:*", RUN+="udev-configure-printer remove %p"
+ACTION=="remove", SUBSYSTEM=="usb", ENV{INTERFACE}=="7/1/*", ENV{INTERFACE}!="7/1/4", RUN+="udev-configure-printer remove %p"

udev/udev-configure-printer.c

@@ -1791,6 +1791,39 @@ disable_queue (const char *printer_uri, void *context)
   ippDelete (answer);
   httpClose (cups);
 }
+static int  
+compare_usb_uri(char *uri_store, char *uri_uevent)
+{
+  int index = 0;
+  int subset = 1;
+  int exist = -1; 
+  char *full_path = NULL;
+  struct stat buffer;
+
+  if (strlen(uri_uevent) < strlen(uri_store))
+    return -1; 
+
+  // check whether it's a substring
+  full_path = (char *) malloc(strlen(uri_store) + 4); 
+  memset(full_path, 0, sizeof(full_path));
+  strcpy(full_path, "/sys");
+  strcat(full_path, uri_store);
+  while (uri_store[index] != '\0'){
+    if (uri_store[index] != uri_uevent[index]){
+      subset = -1; 
+      break;
+    }   
+    index++;
+  }
+
+  // check the exist of this device
+  if (subset == 1 && stat(full_path, &buffer) == 0){ 
+   exist = 1;  
+  }
+
+  free(full_path);
+  return exist;
+}
 
 static int
 do_remove (const char *devaddr)
@@ -1830,8 +1863,8 @@ do_remove (const char *devaddr)
   map = read_usb_uri_map ();
   prev = &map->entries;
   for (entry = map->entries; entry; entry = entry->next)
-    {
-      if (!strcmp (entry->devpath, devpath))
+  {
+      if (compare_usb_uri(entry->devpath, devpath))
 	{
 	  uris = &entry->uris;
 	  break;