X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=hwdb%2Fids-update.pl;h=5782bb51ef6a6fcf7b5569037b966780e0e1b240;hp=869c49b861a8d377361021239004f93762397987;hb=25220239990c7859a65160d63277105d0c1de8a8;hpb=5fe25affc01fb003a3a66937458a25640a6075ce

diff --git a/hwdb/ids-update.pl b/hwdb/ids-update.pl
index 869c49b86..5782bb51e 100755
--- a/hwdb/ids-update.pl
+++ b/hwdb/ids-update.pl
@@ -10,7 +10,7 @@ sub usb_vendor {
         open(OUT, ">", "20-usb-vendor-product.hwdb");
         print(OUT "# This file is part of systemd.\n" .
                   "#\n" .
-                  "# Data imported and updated from: http://www.linux-usb.org/usb.ids\n");
+                  "# Data imported from: http://www.linux-usb.org/usb.ids\n");
 
         while (my $line = <IN>) {
                 $line =~ s/\s+$//;
@@ -34,8 +34,8 @@ sub usb_vendor {
                 }
         }
 
-        close(INP);
-        close(OUTP);
+        close(IN);
+        close(OUT);
 }
 
 sub usb_classes {
@@ -47,7 +47,7 @@ sub usb_classes {
         open(OUT, ">", "20-usb-classes.hwdb");
         print(OUT "# This file is part of systemd.\n" .
                   "#\n" .
-                  "# Data imported and updated from: http://www.linux-usb.org/usb.ids\n");
+                  "# Data imported from: http://www.linux-usb.org/usb.ids\n");
 
         while (my $line = <IN>) {
                 $line =~ s/\s+$//;
@@ -100,20 +100,19 @@ sub usb_classes {
                 }
         }
 
-        close(INP);
-        close(OUTP);
+        close(IN);
+        close(OUT);
 }
 
 sub pci_vendor {
         my $vendor;
         my $device;
 
-        open(IN, "<", "usb.ids");
         open(IN, "<", "pci.ids");
         open(OUT, ">", "20-pci-vendor-product.hwdb");
         print(OUT "# This file is part of systemd.\n" .
                   "#\n" .
-                  "# Data imported and updated from: http://pci-ids.ucw.cz/v2.2/pci.ids\n");
+                  "# Data imported from: http://pci-ids.ucw.cz/v2.2/pci.ids\n");
 
         while (my $line = <IN>) {
                 $line =~ s/\s+$//;
@@ -149,8 +148,8 @@ sub pci_vendor {
                 }
         }
 
-        close(INP);
-        close(OUTP);
+        close(IN);
+        close(OUT);
 }
 
 sub pci_classes {
@@ -162,7 +161,7 @@ sub pci_classes {
         open(OUT, ">", "20-pci-classes.hwdb");
         print(OUT "# This file is part of systemd.\n" .
                   "#\n" .
-                  "# Data imported and updated from: http://pci-ids.ucw.cz/v2.2/pci.ids\n");
+                  "# Data imported from: http://pci-ids.ucw.cz/v2.2/pci.ids\n");
 
         while (my $line = <IN>) {
                 $line =~ s/\s+$//;
@@ -203,8 +202,8 @@ sub pci_classes {
                 }
         }
 
-        close(INP);
-        close(OUTP);
+        close(IN);
+        close(OUT);
 }
 
 sub oui {
@@ -214,11 +213,13 @@ sub oui {
         open(OUT, ">", "20-OUI.hwdb");
         print(OUT "# This file is part of systemd.\n" .
                   "#\n" .
-                  "# Data imported and updated from: http://standards.ieee.org/develop/regauth/iab/iab.txt\n" .
-                  "# Data imported and updated from: http://standards.ieee.org/develop/regauth/oui/oui.txt\n");
+                  "# Data imported from:\n" .
+                  "#   http://standards.ieee.org/develop/regauth/oui/oui.txt\n" .
+                  "#   http://standards.ieee.org/develop/regauth/iab/iab.txt\n");
 
         open(IN, "<", "iab.txt");
         while (my $line = <IN>) {
+                $line =~ s/^ +//;
                 $line =~ s/\s+$//;
                 $line =~ m/^([0-9A-F]{2})-([0-9A-F]{2})-([0-9A-F]{2})\s*\(hex\)\s*.+$/;
                 if (defined $1) {
@@ -237,10 +238,11 @@ sub oui {
                         print(OUT " ID_OUI_FROM_DATABASE=" . $text . "\n");
                 }
         }
-        close(INP);
+        close(IN);
 
         open(IN, "<", "oui.txt");
         while (my $line = <IN>) {
+                $line =~ s/^ +//;
                 $line =~ s/\s+$//;
                 $line =~ m/^([0-9A-F]{6})\s*\(base 16\)\s*(.+)$/;
                 if (defined $1) {
@@ -255,8 +257,8 @@ sub oui {
                         }
                 }
         }
-        close(INP);
-        close(OUTP);
+        close(IN);
+        close(OUT);
 }
 
 usb_vendor();