From 8d6c6b2529250fde353890e477acec7c3ef980e9 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Wed, 31 Aug 2005 15:20:51 +0000
Subject: - Fixed retrieval of parallel port base address.

---
 perl-install/printer/detect.pm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'perl-install/printer/detect.pm')

diff --git a/perl-install/printer/detect.pm b/perl-install/printer/detect.pm
index 43aed0d5b..b2f3321b0 100644
--- a/perl-install/printer/detect.pm
+++ b/perl-install/printer/detect.pm
@@ -529,8 +529,18 @@ sub parport_addr {
     $device =~ m!^/dev/lp(\d+)$! or
 	$device =~ m!^/dev/printers/(\d+)$!;
     my $portnumber = $1;
+    my $i = 0;
+    my $parportdir;
+    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;
+	if ($i == $portnumber) {
+	    $parportdir = $_;
+	    last;
+	}
+	$i++;
+    }
     my $parport_addresses = 
-	`cat /proc/sys/dev/parport/parport$portnumber/base-addr`;
+	`cat $parportdir/base-addr`;
     my $address_arg;
     if ($parport_addresses =~ /^\s*(\d+)\s+(\d+)\s*$/) {
 	$address_arg = sprintf(" -base 0x%x -basehigh 0x%x", $1, $2);
-- 
cgit v1.2.1