[Scst-svn] SF.net SVN: scst:[1918] trunk/scstadmin/scstadmin.sysfs/scstadmin

[<mga...@us...>]

Revision: 1918
          http://scst.svn.sourceforge.net/scst/?rev=1918&view=rev
Author:   mgandalf
Date:     2010-08-03 16:15:50 +0000 (Tue, 03 Aug 2010)

Log Message:
-----------
- Fix list_group.

Modified Paths:
--------------
    trunk/scstadmin/scstadmin.sysfs/scstadmin

Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin	2010-08-03 15:38:57 UTC (rev 1917)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin	2010-08-03 16:15:50 UTC (rev 1918)
@@ -1921,7 +1921,7 @@
 	my $target = shift;
 	my %toprint;
 
-	return listGroups(undef, $driver, $target) if ($target && $driver);
+	return listGroups($driver, $target, undef) if ($target && $driver);
 
 	my $got_driver = defined($driver);
 
@@ -1929,11 +1929,13 @@
 
 	my $l_driver;
 	my $l_target;
+
 	foreach my $_driver (@{$drivers}) {
 		$driver = $_driver if (!$got_driver);
 
 		if ($driver eq $_driver) {
 			$toprint{$driver}++;
+
 			$l_driver = length($driver) if ($l_driver < length($driver));
 
 			my $targets = $SCST->targets($driver);
@@ -2045,20 +2047,36 @@
 		return listGroup($driver, $target, $group);
 	}
 
+	my $got_group = $group;
+	my $got_target = $target;
+	my $got_driver = $driver;
+
 	my $drivers = $SCST->drivers();
 
-	foreach my $driver (@{$drivers}) {
-		my $targets = $SCST->targets($driver);
-		foreach my $target (@{$targets}) {
-			my $groups = $SCST->groups($driver, $target);
-			foreach my $group (@{$groups}) {
-				print "Driver: $driver\n";
-				print "Target: $target\n";
-				print "Group : $group\n\n";
+	foreach my $_driver (@{$drivers}) {
+		$driver = $_driver if (!$got_driver);
 
-				listGroup($driver, $target, $group);
+		if ($driver eq $_driver) {
+			my $targets = $SCST->targets($driver);
+			foreach my $_target (@{$targets}) {
+				$target = $_target if (!$got_target);
 
-				print "\n\n";
+				if ($target eq $_target) {
+					my $groups = $SCST->groups($driver, $target);
+					foreach my $_group (@{$groups}) {
+						$group = $_group if (!$got_group);
+
+						if ($group eq $_group) {
+							print "Driver: $driver\n";
+							print "Target: $target\n";
+							print "Group : $group\n\n";
+
+							listGroup($driver, $target, $group);
+
+							print "\n\n";
+						}
+					}
+				}
 			}
 		}
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.