Ensure that --outputfile ./xxx and ../xxx work

diff --git a/lib/MyOptions.pm b/lib/MyOptions.pm
index b48c343edd7991965ea9ff28200a9f144dcf58c9..5a50ba2cc3cc721f300cbe731515b02c47c189f0 100755 (executable)
--- a/lib/MyOptions.pm
+++ b/lib/MyOptions.pm
@@ -38,7 +38,7 @@ my %optionspec = (
 
 # Applicable to: match-xsa
     'xsadir=s'     => \$o{'XSADIR'},
-    'xsalist=s'    => \$o{'XSALIST'}, 
+    'xsalist=s'    => \$o{'XSALIST'},
     'xsalistdir=s' => \$o{'XSALISTDIR'},
 
     'not-smart'    => \$o{'NOTSMART'},
@@ -83,7 +83,12 @@ sub handleoptions {
     if (!-d $o{'LOGDIR'}) {
         mkdir $o{'LOGDIR'};
     }
-    $o{'OUTPUTFILE'}  = $o{'LOGROOT'}."/".$o{'SHORT'}."-".$o{'OUTPUTFILE'};
+    if ( index($o{'OUTPUTFILE'},"./") == 0
+         || index($o{'OUTPUTFILE'},"../") == 0 ) {
+        $o{'OUTPUTFILE'}  = $o{'LOGROOT'}."/".$o{'OUTPUTFILE'};
+    } else {
+        $o{'OUTPUTFILE'}  = $o{'LOGROOT'}."/".$o{'SHORT'}."-".$o{'OUTPUTFILE'};
+    }
     $o{'TMPDIR'}      = $o{'LOGDIR'}."/tmp";
     system("rm -rf ".$o{'TMPDIR'});
     mkdir $o{'TMPDIR'};