contrib/cussh.pl: Improve parsing of identifiers.

diff --git a/contrib/cussh.pl b/contrib/cussh.pl
index 65c634e0f8637dc57c34d8812645639b3a7fad13..d4126bfdeeaaaff09bd99d0f497a6472c793d351 100755 (executable)
--- a/contrib/cussh.pl
+++ b/contrib/cussh.pl
@@ -105,7 +105,11 @@ sub getid {
 
        print $$string . $/;
        my ($h, $p, $pi, $t, $ti) =
+<<<<<<< collectd-4.3:contrib/cussh.pl
                $$string =~ m/^(\w+)\/(\w+)(?:-(\w+))?\/(\w+)(?:-(\w+))?\s+/;
+=======
+               $$string =~ m#^([^/]+)/([^/-]+)(?:-([^/]+))?/([^/-]+)(?:-([^/]+))?\s*#;
+>>>>>>> local:contrib/cussh.pl
        $$string = $';
 
        return if ((! $h) || (! $p) || (! $t));
@@ -114,8 +118,8 @@ sub getid {
 
        ($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;
 }