From 98fc1310a0c85782cc06e98349fca8aa9850dc73 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Wed, 31 Aug 2005 14:36:47 +0000
Subject: - Fixed parallel printer auto-detection and registered IEEE-1284 ID  
 string for Mandriva hardware database. - Fixed USB IEEE-1284 ID string
 output.

---
 perl-install/printer/detect.pm | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'perl-install/printer')

diff --git a/perl-install/printer/detect.pm b/perl-install/printer/detect.pm
index cf07a06df..43aed0d5b 100644
--- a/perl-install/printer/detect.pm
+++ b/perl-install/printer/detect.pm
@@ -38,26 +38,32 @@ sub whatPrinter() {
 
 sub whatParport() {
     my @res;
-    foreach (0..3) {
+    my $i = 0;
+    foreach (sort { $a =~ /(\d+)/; my $m = $1; $b =~ /(\d+)/; my $n = $1; $m <=> $n } `ls -1d /proc/parport/[0-9]* /proc/sys/dev/parport/parport[0-9]* 2>/dev/null`) {
+	chomp;
 	my $elem = {};
 	my $F;
-	open $F, "/proc/parport/$_/autoprobe" or open $F, "/proc/sys/dev/parport/parport$_/autoprobe" or next;
+	open $F, "$_/autoprobe" or next;
 	{
 	    local $_;
 	    my $itemfound = 0;
-	    while (<$F>) { 
+	    while (<$F>) {
+		chomp;
 		if (/(.*):(.*);/) { #-#
 		    $elem->{$1} = $2;
 		    $elem->{$1} =~ s/Hewlett[-\s_]Packard/HP/;
 		    $elem->{$1} =~ s/HEWLETT[-\s_]PACKARD/HP/;
 		    $itemfound = 1;
+		    # Add IEEE-1284 device ID string
+		    $elem->{IEEE1284} .= $_;
 		}
 	    }
 	    # Some parallel printers miss the "CLASS" field
 	    $elem->{CLASS} = 'PRINTER' 
 		if $itemfound && !defined($elem->{CLASS});
 	}
-	push @res, { port => "/dev/lp$_", val => $elem };
+	push @res, { port => "/dev/lp$i", val => $elem };
+	$i ++;
     }
     @res;
 }
@@ -103,6 +109,10 @@ sub whatUsbport() {
 		next;
 	    };
 	    close $PORT;
+	    # Cut resulting string to its real length
+	    my $length = ord(substr($idstr, 1, 1)) +
+		(ord(substr($idstr, 0, 1)) << 8);
+	    $idstr = substr($idstr, 2, $length-2);
 	    # Remove non-printable characters
 	    $idstr =~ tr/[\x00-\x1f]/./;
 	    # If we do not find any item in the ID string, we try to read
-- 
cgit v1.2.1