Merge branch 'no_last_slice'

Edrusb · Dec 5, 2024 · 56436a2 · 56436a2
2 parents 1b56696 + 2b669b5
commit 56436a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/build/ChangeLog b/src/build/ChangeLog
@@ -51,6 +51,8 @@ from 2.7.15 to 2.7.16
 - fixing bug in thread_cancellation class that led a cancelled thread kept
   being recorded as cancelled forever, leading libdar to abort immediately when
   run in a new thread having the the same tid.
+- fixing bug in libdar leading an API call to return zero instead of the total
+  size of the backup/archive (not use in dar CLI).
 
 from 2.7.14 to 2.7.15
 - updating libdar about CURLINFO_CONTENT_LENGTH_DOWNLOAD symbol which is

diff --git a/src/libdar/i_archive.cpp b/src/libdar/i_archive.cpp
@@ -1190,11 +1190,8 @@ namespace libdar
 		    first_slice_size = last_slice_size;
 		    archive_size = last_slice_size;
 		}
-
-		if(slice_number > 1)
-		    archive_size = first_slice_size + (slice_number - 2)*sub_slice_size + last_slice_size;
 		else
-		    archive_size = 0; // unknown
+		    archive_size = first_slice_size + (slice_number - 2)*sub_slice_size + last_slice_size;
 	    }
 	    else // not reading from a sar
 	    {