Merge pull request #33 from mariux64/stricter-assembly-regexes

mxmirror: stricter assembly regexes
mariux64 · Mar 23, 2018 · 8eba588 · 8eba588
2 parents 2b1a064 + 533c5a8
commit 8eba588
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/mxmirror/mxmirror b/mxmirror/mxmirror
@@ -646,7 +646,7 @@ sub convert_to_sourcepath {
 
     my ($jbod, $path, $host, $hostpath, $partition);
 
-    if(($jbod, $path) = $string =~ /^([XCMD]\d+)(.*?)$/) {
+    if(($jbod, $path) = $string =~ /^([XCMD][\da-f]\d\d\d)(.*?)$/) {
         unless(defined $jbodmap->{$jbod}) {
            printf STDERR "**ERROR: unknown jbod: $string";
            next;
@@ -712,7 +712,7 @@ sub convert_to_destinationpath {
 
     my ($jbod, $path, $host, $hostpath, $partition);
 
-    if(($jbod, $path) = $string =~ /^([XCMD]\d+)(.*?)$/) {
+    if(($jbod, $path) = $string =~ /^([XCMD][\da-f]\d\d\d)(.*?)$/) {
         unless(defined $jbodmap->{$jbod}) {
            printf STDERR "**ERROR: unknown jbod: $string";
            next;
@@ -882,7 +882,7 @@ sub read_jbodmap {
     my $map = {};
 
     foreach(<F>) {
-        next unless (m(/amd/(.*?)/[XCMD]/([XCMD]\d+)));
+        next unless (m(/amd/(.*?)/[XCMD]/([XCMD][\da-f]\d\d\d)));
         $map->{$2} = $1;
     }