Accepting request 743449 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/743449
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zziplib?expand=0&rev=34
This commit is contained in:
Dominique Leuenberger 2019-10-30 13:42:20 +00:00 committed by Git OBS Bridge
commit 513b3174eb
3 changed files with 29 additions and 3 deletions

View File

@ -2,7 +2,27 @@ Index: zziplib-0.13.69/bins/unzip-mem.c
===================================================================
--- zziplib-0.13.69.orig/bins/unzip-mem.c
+++ zziplib-0.13.69/bins/unzip-mem.c
@@ -231,9 +231,12 @@ static void zzip_mem_entry_direntry(ZZIP
@@ -186,6 +186,7 @@ static void zzip_mem_entry_direntry_star
static void zzip_mem_entry_direntry_done (void)
{
char exp = ' ';
+ long percentage;
if (sum_usize / 1024 > 1024*1024*1024) { exp = 'G';
sum_usize /= 1024*1024*1024; sum_usize /= 1024*1024*1024; }
if (sum_usize > 1024*1024*1024) { exp = 'M';
@@ -199,9 +200,10 @@ static void zzip_mem_entry_direntry_done
return;
verbose:
printf("-------- ------ ------- ----- ----\n");
+ percentage = sum_usize ? (L (100 - (sum_csize*100/sum_usize))) : 0; /* 0% if file size is 0 */
printf("%8li%c %8li%c %3li%% %8li %s\n",
L sum_usize, exp, L sum_csize, exp,
- L (100 - (sum_csize*100/sum_usize)), L sum_files,
+ percentage, L sum_files,
sum_files == 1 ? "file" : "files");
}
@@ -231,9 +233,12 @@ static void zzip_mem_entry_direntry(ZZIP
if (*name == '\n') name++;
if (option_verbose) {

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Oct 17 09:30:20 UTC 2019 - Josef Möllers <josef.moellers@suse.com>
- Fixed another instance where division by 0 may occur.
[bsc#1129403, bsc1129403-prevent-division-by-zero.patch]
-------------------------------------------------------------------
Thu Jun 13 06:39:36 UTC 2019 - josef.moellers@suse.com

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -21,7 +21,7 @@ Name: zziplib
Version: 0.13.69
Release: 0
Summary: ZIP Compression Library
License: LGPL-2.1+
License: LGPL-2.1-or-later
Group: Development/Libraries/C and C++
Url: http://zziplib.sourceforge.net
Source0: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz