- Fix list_group.

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1918 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Mark Buechler
2010-08-03 16:15:50 +00:00
parent 078841cbf4
commit ebeeebf2d2

View File

@@ -1921,7 +1921,7 @@ sub listTargets {
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 @@ sub listTargets {
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 @@ sub listGroups {
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";
}
}
}
}
}
}