Set LANG=en_US.UTF-8 for objdump. Fixed style of the report.

2 files changed, 15 insertions, 15 deletions

diff --git a/INSTALL b/INSTALL
index 0b412a8..5227738 100644
--- a/INSTALL
+++ b/INSTALL
@@ -10,7 +10,7 @@ RELEASE INFORMATION
 
 Project:           ABI Compliance Checker (ACC)
 Version:           1.99.10
-Date:              2015-08-14
+Date:              2015-08-21
 
 
 This file explains how to install and setup environment
diff --git a/abi-compliance-checker.pl b/abi-compliance-checker.pl
index b445f74..590c66b 100755
--- a/abi-compliance-checker.pl
+++ b/abi-compliance-checker.pl
@@ -71,6 +71,7 @@ my $XML_ABI_DUMP_VERSION = "1.2";
 my $OSgroup = get_OSgroup();
 my $ORIG_DIR = cwd();
 my $TMP_DIR = tempdir(CLEANUP=>1);
+my $LOCALE = "LANG=en_US.UTF-8";
 
 # Internal modules
 my $MODULES_DIR = get_Modules();
@@ -383,16 +384,13 @@ GENERAL OPTIONS:
                    ...
               </libs>
 
-                 ... (XML-descriptor template
-                         can be generated by -d option)
+                 ...
              
          2. ABI dump generated by -dump option
          3. Directory with headers and/or $SLIB_TYPE libraries
          4. Single header file
-         5. Single $SLIB_TYPE library
-         6. Comma separated list of headers and/or libraries
 
-      If you are using an 2-6 descriptor types then you should
+      If you are using an 2-4 descriptor types then you should
       specify version numbers with -v1 and -v2 options too.
 
       For more information, please see:
@@ -15410,7 +15408,7 @@ sub get_Report_Title($)
     $Title .= $ArchInfo;
     
     if($AppPath) {
-        $Title .= " <span class='nowrap'>&#160;(relating to the portability of application <span style='color:Blue;'>".get_filename($AppPath)."</span>)</span>";
+        $Title .= " (relating to the portability of application <span style='color:Blue;'>".get_filename($AppPath)."</span>)";
     }
     $Title = "<h1>".$Title."</h1>\n";
     return $Title;
@@ -17181,7 +17179,7 @@ sub getAffectedSymbols($$$$)
         {
             my $Desc = getAffectDesc($Level, $Symbol, $SymSel{$Symbol}{"Kind"}, $SymSel{$Symbol}{"Loc"});
             my $S = get_Signature($Symbol, 1);
-            my $PName = getParamName($SymSel{$Symbol}{"Loc"});print "$Symbol\n" if($Symbol eq "sftp_file_set_blocking");
+            my $PName = getParamName($SymSel{$Symbol}{"Loc"});
             my $Pos = adjustParamPos(getParamPos($PName, $Symbol, 1), $Symbol, 1);
             
             $Affected .= "<span class='iname_a'>".highLight_Signature_PPos_Italic($S, $Pos, 1, 0, 0)."</span><br/>";
@@ -17530,7 +17528,7 @@ sub getReport($)
             </div>";
             $Report .= "<div id='BinaryTab' class='tab'>\n$BSummary\n".get_Report_Added("Binary").get_Report_Removed("Binary").get_Report_Problems("High", "Binary").get_Report_Problems("Medium", "Binary").get_Report_Problems("Low", "Binary").get_Report_Problems("Safe", "Binary").get_SourceInfo()."<br/><br/><br/></div>";
             $Report .= "<div id='SourceTab' class='tab'>\n$SSummary\n".get_Report_Added("Source").get_Report_Removed("Source").get_Report_Problems("High", "Source").get_Report_Problems("Medium", "Source").get_Report_Problems("Low", "Source").get_Report_Problems("Safe", "Source").get_SourceInfo()."<br/><br/><br/></div>";
-            $Report .= getReportFooter($TargetTitle, not $JoinReport);
+            $Report .= getReportFooter("Double");
             $Report .= "\n</body></html>\n";
             return $Report;
         }
@@ -17553,7 +17551,7 @@ sub getReport($)
             $Report .= get_Report_Problems("High", $Level).get_Report_Problems("Medium", $Level).get_Report_Problems("Low", $Level).get_Report_Problems("Safe", $Level);
             $Report .= get_SourceInfo();
             $Report .= "</div>\n<br/><br/><br/><hr/>\n";
-            $Report .= getReportFooter($TargetTitle, not $JoinReport);
+            $Report .= getReportFooter("Single");
             $Report .= "\n</body></html>\n";
             return $Report;
         }
@@ -17595,13 +17593,15 @@ sub createReport()
     }
 }
 
-sub getReportFooter($$)
+sub getReportFooter($)
 {
-    my ($LibName, $Single) = @_;
+    my $Type = $_[0];
     my $Class = "footer";
-    if(not $Single) {
+    
+    if($Type eq "Double") {
         $Class .= " double_report";
     }
+    
     my $Footer = "<div class=\'$Class\' align='right'><i>Generated on ".(localtime time);
     $Footer .= " by <a href='".$HomePage."'>ABI Compliance Checker</a> $TOOL_VERSION &#160;";
     $Footer .= "</i></div>";
@@ -19540,7 +19540,7 @@ sub getArch_Object($)
         }
         
         my $Cmd = $ObjdumpCmd." -f \"$Path\"";
-        my $Out = `$Cmd`;
+        my $Out = `$LOCALE $Cmd`;
         
         if($Out=~/architecture:\s+([\w\-\:]+)/)
         {
@@ -21205,7 +21205,7 @@ sub createSymbolsList($$$$$)
     my $Description = "List of symbols in $LName ($LVersion) on ".showArch($ArchName);
     $SYMBOLS_LIST = composeHTML_Head($Title, $Keywords, $Description, $CssStyles, $JScripts)."
     <body><div>\n$SYMBOLS_LIST</div>
-    <br/><br/><hr/>\n".getReportFooter($LName, 1)."
+    <br/><br/><hr/>\n".getReportFooter("Single")."
     </body></html>";
     writeFile($SaveTo, $SYMBOLS_LIST);
 }