diff --git a/contrib/cussh.pl b/contrib/cussh.pl
index 48f5e9373e12dba530c0ff1a6a2292effd5ded39..23a9078f121799d8f7d68a1e40fe6e5ef901c3e7 100755 (executable)
--- a/contrib/cussh.pl
+++ b/contrib/cussh.pl
print $$string . $/;
my ($h, $p, $pi, $t, $ti) =
print $$string . $/;
my ($h, $p, $pi, $t, $ti) =
- $$string =~ m/^(\w+)\/(\w+)(?:-(\w+))?\/(\w+)(?:-(\w+))?\s*/;
+ $$string =~ m#^([^/]+)/([^/-]+)(?:-([^/]+))?/([^/-]+)(?:-([^/]+))?\s*#;
$$string = $';
return if ((! $h) || (! $p) || (! $t));
$$string = $';
return if ((! $h) || (! $p) || (! $t));
($id{'host'}, $id{'plugin'}, $id{'type'}) = ($h, $p, $t);
($id{'host'}, $id{'plugin'}, $id{'type'}) = ($h, $p, $t);
- $id{'plugin_instance'} = $pi if ($pi);
- $id{'type_instance'} = $ti if ($ti);
+ $id{'plugin_instance'} = $pi if defined ($pi);
+ $id{'type_instance'} = $ti if defined ($ti);
return \%id;
}
return \%id;
}