Correct % processed for Windows large files

ibm-messaging · Sep 26, 2019 · e190bbf · e190bbf
1 parent bd17f75
commit e190bbf
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -98,3 +98,6 @@ Aug 2019 (v5.1.3)
 
 Aug 2019 (v5.1.4)
 * Newer compilers have changed bitfield structure padding layouts
+
+Sep 2019 (v5.1.5)
+* Percentage processed was not showing correctly for very large files on Windows
diff --git a/bin/aix/convH b/bin/aix/convH
diff --git a/bin/aix/mqsmfcsv b/bin/aix/mqsmfcsv
diff --git a/bin/linux/convH b/bin/linux/convH
diff --git a/bin/linux/mqsmfcsv b/bin/linux/mqsmfcsv
diff --git a/bin/win/mqsmfcsv.exe b/bin/win/mqsmfcsv.exe
diff --git a/src/mqsmf.c b/src/mqsmf.c
@@ -1396,10 +1396,13 @@ static char *getFormatRate(myoff_t pos)
 static char formatPercentString[10];
 static char *getFormatPercent(myoff_t totalFileSize,myoff_t pos)
 {
+  float f;
   if (streamInput) {
     strcpy(formatPercentString,"");
-  } else {
-    sprintf(formatPercentString,"[%5.2f%%]", (float)(100.0*pos)/totalFileSize);
+  } else { 
+    f = (float)((100.0*pos)/totalFileSize);
+    if (f==0) f = +0.00; /* To deal with calculation sometimes returning -0.0 */
+    sprintf(formatPercentString,"[%5.2f%%]", f);
   }
   return formatPercentString;
 }