1
0
Fork 0

Merging upstream version 1.3.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-24 04:08:21 +01:00
parent d58e171545
commit 09c5bf1da0
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
18 changed files with 65 additions and 64 deletions

View file

@ -1,6 +1,6 @@
2014-11-25 Antonio Diaz Diaz <antonio@gnu.org> 2015-01-22 Antonio Diaz Diaz <antonio@gnu.org>
* Version 1.3-pre1 released. * Version 1.3 released.
* dec_stream.cc: Do not use output packets or muxer when testing. * dec_stream.cc: Do not use output packets or muxer when testing.
* Make '-dvvv' and '-tvvv' show dictionary size like lzip. * Make '-dvvv' and '-tvvv' show dictionary size like lzip.
* lzip.h: Added missing 'const' to the declaration of 'compress'. * lzip.h: Added missing 'const' to the declaration of 'compress'.
@ -122,7 +122,7 @@
until something better appears on the net. until something better appears on the net.
Copyright (C) 2009-2014 Antonio Diaz Diaz. Copyright (C) 2009-2015 Antonio Diaz Diaz.
This file is a collection of facts, and thus it is not copyrightable, This file is a collection of facts, and thus it is not copyrightable,
but just in case, you have unlimited permission to copy, distribute and but just in case, you have unlimited permission to copy, distribute and

View file

@ -64,7 +64,7 @@ After running 'configure', you can run 'make' and 'make install' as
explained above. explained above.
Copyright (C) 2009-2014 Antonio Diaz Diaz. Copyright (C) 2009-2015 Antonio Diaz Diaz.
This file is free documentation: you have unlimited permission to copy, This file is free documentation: you have unlimited permission to copy,
distribute and modify it. distribute and modify it.

9
README
View file

@ -6,9 +6,10 @@ the one of lzip, bzip2 or gzip.
Plzip can compress/decompress large files on multiprocessor machines Plzip can compress/decompress large files on multiprocessor machines
much faster than lzip, at the cost of a slightly reduced compression much faster than lzip, at the cost of a slightly reduced compression
ratio. Note that the number of usable threads is limited by file size; ratio (0.4 to 2 percent larger compressed files). Note that the number
on files larger than a few GB plzip can use hundreds of processors, but of usable threads is limited by file size; on files larger than a few GB
on files of only a few MB plzip is no faster than lzip. plzip can use hundreds of processors, but on files of only a few MB
plzip is no faster than lzip.
When compressing, plzip divides the input file into chunks and When compressing, plzip divides the input file into chunks and
compresses as many chunks simultaneously as worker threads are chosen, compresses as many chunks simultaneously as worker threads are chosen,
@ -87,7 +88,7 @@ corresponding uncompressed files. Integrity testing of concatenated
compressed files is also supported. compressed files is also supported.
Copyright (C) 2009-2014 Antonio Diaz Diaz. Copyright (C) 2009-2015 Antonio Diaz Diaz.
This file is free documentation: you have unlimited permission to copy, This file is free documentation: you have unlimited permission to copy,
distribute and modify it. distribute and modify it.

View file

@ -1,5 +1,5 @@
/* Arg_parser - POSIX/GNU command line argument parser. (C++ version) /* Arg_parser - POSIX/GNU command line argument parser. (C++ version)
Copyright (C) 2006-2014 Antonio Diaz Diaz. Copyright (C) 2006-2015 Antonio Diaz Diaz.
This library is free software: you can redistribute it and/or modify This library is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

View file

@ -1,5 +1,5 @@
/* Arg_parser - POSIX/GNU command line argument parser. (C++ version) /* Arg_parser - POSIX/GNU command line argument parser. (C++ version)
Copyright (C) 2006-2014 Antonio Diaz Diaz. Copyright (C) 2006-2015 Antonio Diaz Diaz.
This library is free software: you can redistribute it and/or modify This library is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

View file

@ -1,6 +1,6 @@
/* Plzip - Parallel compressor compatible with lzip /* Plzip - Parallel compressor compatible with lzip
Copyright (C) 2009 Laszlo Ersek. Copyright (C) 2009 Laszlo Ersek.
Copyright (C) 2009-2014 Antonio Diaz Diaz. Copyright (C) 2009-2015 Antonio Diaz Diaz.
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

6
configure vendored
View file

@ -1,12 +1,12 @@
#! /bin/sh #! /bin/sh
# configure script for Plzip - Parallel compressor compatible with lzip # configure script for Plzip - Parallel compressor compatible with lzip
# Copyright (C) 2009-2014 Antonio Diaz Diaz. # Copyright (C) 2009-2015 Antonio Diaz Diaz.
# #
# This configure script is free software: you have unlimited permission # This configure script is free software: you have unlimited permission
# to copy, distribute and modify it. # to copy, distribute and modify it.
pkgname=plzip pkgname=plzip
pkgversion=1.3-pre1 pkgversion=1.3
progname=plzip progname=plzip
srctrigger=doc/${pkgname}.texi srctrigger=doc/${pkgname}.texi
@ -165,7 +165,7 @@ echo "LDFLAGS = ${LDFLAGS}"
rm -f Makefile rm -f Makefile
cat > Makefile << EOF cat > Makefile << EOF
# Makefile for Plzip - Parallel compressor compatible with lzip # Makefile for Plzip - Parallel compressor compatible with lzip
# Copyright (C) 2009-2014 Antonio Diaz Diaz. # Copyright (C) 2009-2015 Antonio Diaz Diaz.
# This file was generated automatically by configure. Do not edit. # This file was generated automatically by configure. Do not edit.
# #
# This Makefile is free software: you have unlimited permission # This Makefile is free software: you have unlimited permission

View file

@ -1,6 +1,6 @@
/* Plzip - Parallel compressor compatible with lzip /* Plzip - Parallel compressor compatible with lzip
Copyright (C) 2009 Laszlo Ersek. Copyright (C) 2009 Laszlo Ersek.
Copyright (C) 2009-2014 Antonio Diaz Diaz. Copyright (C) 2009-2015 Antonio Diaz Diaz.
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

View file

@ -1,6 +1,6 @@
/* Plzip - Parallel compressor compatible with lzip /* Plzip - Parallel compressor compatible with lzip
Copyright (C) 2009 Laszlo Ersek. Copyright (C) 2009 Laszlo Ersek.
Copyright (C) 2009-2014 Antonio Diaz Diaz. Copyright (C) 2009-2015 Antonio Diaz Diaz.
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -213,7 +213,7 @@ public:
// Search forward from 'pos' for "LZIP" (Boyer-Moore algorithm) // Search forward from 'pos' for "LZIP" (Boyer-Moore algorithm)
// Return pos of found string or 'pos+size' if not found. // Returns pos of found string or 'pos+size' if not found.
// //
int find_magic( const uint8_t * const buffer, const int pos, const int size ) int find_magic( const uint8_t * const buffer, const int pos, const int size )
{ {

View file

@ -1,6 +1,6 @@
/* Plzip - Parallel compressor compatible with lzip /* Plzip - Parallel compressor compatible with lzip
Copyright (C) 2009 Laszlo Ersek. Copyright (C) 2009 Laszlo Ersek.
Copyright (C) 2009-2014 Antonio Diaz Diaz. Copyright (C) 2009-2015 Antonio Diaz Diaz.
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

View file

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1.
.TH PLZIP "1" "November 2014" "plzip 1.3-pre1" "User Commands" .TH PLZIP "1" "January 2015" "plzip 1.3" "User Commands"
.SH NAME .SH NAME
plzip \- reduces the size of files plzip \- reduces the size of files
.SH SYNOPSIS .SH SYNOPSIS
@ -83,7 +83,7 @@ Plzip home page: http://www.nongnu.org/lzip/plzip.html
.SH COPYRIGHT .SH COPYRIGHT
Copyright \(co 2009 Laszlo Ersek. Copyright \(co 2009 Laszlo Ersek.
.br .br
Copyright \(co 2014 Antonio Diaz Diaz. Copyright \(co 2015 Antonio Diaz Diaz.
Using Lzlib 1.6 Using Lzlib 1.6
License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html> License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
.br .br

View file

@ -11,7 +11,7 @@ File: plzip.info, Node: Top, Next: Introduction, Up: (dir)
Plzip Manual Plzip Manual
************ ************
This manual is for Plzip (version 1.3-pre1, 25 November 2014). This manual is for Plzip (version 1.3, 22 January 2015).
* Menu: * Menu:
@ -25,7 +25,7 @@ This manual is for Plzip (version 1.3-pre1, 25 November 2014).
* Concept index:: Index of concepts * Concept index:: Index of concepts
Copyright (C) 2009-2014 Antonio Diaz Diaz. Copyright (C) 2009-2015 Antonio Diaz Diaz.
This manual is free documentation: you have unlimited permission to This manual is free documentation: you have unlimited permission to
copy, distribute and modify it. copy, distribute and modify it.
@ -436,18 +436,18 @@ ratio (file_size / data_size).
for full use of N processors at a given compression level, using the for full use of N processors at a given compression level, using the
default data size for each level: default data size for each level:
Processors 2 3 4 8 16 64 Processors 2 4 8 16 64 256
------------------------------------------------------------------------- -------------------------------------------------------------------------
Level Level
-1 4 MiB 6 MiB 8 MiB 16 MiB 32 MiB 128 MiB -1 4 MiB 8 MiB 16 MiB 32 MiB 128 MiB 512 MiB
-2 6 MiB 9 MiB 12 MiB 24 MiB 48 MiB 192 MiB -2 6 MiB 12 MiB 24 MiB 48 MiB 192 MiB 768 MiB
-3 8 MiB 12 MiB 16 MiB 32 MiB 64 MiB 256 MiB -3 8 MiB 16 MiB 32 MiB 64 MiB 256 MiB 1 GiB
-4 12 MiB 18 MiB 24 MiB 48 MiB 96 MiB 384 MiB -4 12 MiB 24 MiB 48 MiB 96 MiB 384 MiB 1.5 GiB
-5 16 MiB 24 MiB 32 MiB 64 MiB 128 MiB 512 MiB -5 16 MiB 32 MiB 64 MiB 128 MiB 512 MiB 2 GiB
-6 32 MiB 48 MiB 64 MiB 128 MiB 256 MiB 1 GiB -6 32 MiB 64 MiB 128 MiB 256 MiB 1 GiB 4 GiB
-7 64 MiB 96 MiB 128 MiB 256 MiB 512 MiB 2 GiB -7 64 MiB 128 MiB 256 MiB 512 MiB 2 GiB 8 GiB
-8 96 MiB 144 MiB 192 MiB 384 MiB 768 MiB 3 GiB -8 96 MiB 192 MiB 384 MiB 768 MiB 3 GiB 12 GiB
-9 128 MiB 192 MiB 256 MiB 512 MiB 1 GiB 4 GiB -9 128 MiB 256 MiB 512 MiB 1 GiB 4 GiB 16 GiB
 
File: plzip.info, Node: Problems, Next: Concept index, Prev: Minimum file sizes, Up: Top File: plzip.info, Node: Problems, Next: Concept index, Prev: Minimum file sizes, Up: Top
@ -489,15 +489,15 @@ Concept index
 
Tag Table: Tag Table:
Node: Top221 Node: Top221
Node: Introduction994 Node: Introduction988
Node: Program design5290 Node: Program design5284
Node: Invoking plzip6879 Node: Invoking plzip6873
Ref: --data-size7324 Ref: --data-size7287
Node: File format12420 Node: File format12414
Node: Memory requirements14936 Node: Memory requirements14930
Node: Minimum file sizes15913 Node: Minimum file sizes15907
Node: Problems17765 Node: Problems17758
Node: Concept index18301 Node: Concept index18294
 
End Tag Table End Tag Table

View file

@ -6,8 +6,8 @@
@finalout @finalout
@c %**end of header @c %**end of header
@set UPDATED 25 November 2014 @set UPDATED 22 January 2015
@set VERSION 1.3-pre1 @set VERSION 1.3
@dircategory Data Compression @dircategory Data Compression
@direntry @direntry
@ -46,7 +46,7 @@ This manual is for Plzip (version @value{VERSION}, @value{UPDATED}).
@end menu @end menu
@sp 1 @sp 1
Copyright @copyright{} 2009-2014 Antonio Diaz Diaz. Copyright @copyright{} 2009-2015 Antonio Diaz Diaz.
This manual is free documentation: you have unlimited permission This manual is free documentation: you have unlimited permission
to copy, distribute and modify it. to copy, distribute and modify it.
@ -204,9 +204,9 @@ Print an informative help message describing the options and exit.
@itemx --version @itemx --version
Print the version number of plzip on the standard output and exit. Print the version number of plzip on the standard output and exit.
@anchor{--data-size}
@item -B @var{bytes} @item -B @var{bytes}
@itemx --data-size=@var{bytes} @itemx --data-size=@var{bytes}
@anchor{--data-size}
Set the size of the input data blocks, in bytes. The input file will be Set the size of the input data blocks, in bytes. The input file will be
divided in chunks of this size before compression is performed. Valid divided in chunks of this size before compression is performed. Valid
values range from 8 KiB to 1 GiB. Default value is two times the values range from 8 KiB to 1 GiB. Default value is two times the
@ -472,18 +472,18 @@ The following table shows the minimum uncompressed file size needed for
full use of N processors at a given compression level, using the default full use of N processors at a given compression level, using the default
data size for each level: data size for each level:
@multitable {Processors} {128 MiB} {128 MiB} {128 MiB} {128 MiB} {128 MiB} {128 MiB} @multitable {Processors} {512 MiB} {512 MiB} {512 MiB} {512 MiB} {512 MiB} {512 MiB}
@headitem Processors @tab 2 @tab 3 @tab 4 @tab 8 @tab 16 @tab 64 @headitem Processors @tab 2 @tab 4 @tab 8 @tab 16 @tab 64 @tab 256
@item Level @item Level
@item -1 @tab 4 MiB @tab 6 MiB @tab 8 MiB @tab 16 MiB @tab 32 MiB @tab 128 MiB @item -1 @tab 4 MiB @tab 8 MiB @tab 16 MiB @tab 32 MiB @tab 128 MiB @tab 512 MiB
@item -2 @tab 6 MiB @tab 9 MiB @tab 12 MiB @tab 24 MiB @tab 48 MiB @tab 192 MiB @item -2 @tab 6 MiB @tab 12 MiB @tab 24 MiB @tab 48 MiB @tab 192 MiB @tab 768 MiB
@item -3 @tab 8 MiB @tab 12 MiB @tab 16 MiB @tab 32 MiB @tab 64 MiB @tab 256 MiB @item -3 @tab 8 MiB @tab 16 MiB @tab 32 MiB @tab 64 MiB @tab 256 MiB @tab 1 GiB
@item -4 @tab 12 MiB @tab 18 MiB @tab 24 MiB @tab 48 MiB @tab 96 MiB @tab 384 MiB @item -4 @tab 12 MiB @tab 24 MiB @tab 48 MiB @tab 96 MiB @tab 384 MiB @tab 1.5 GiB
@item -5 @tab 16 MiB @tab 24 MiB @tab 32 MiB @tab 64 MiB @tab 128 MiB @tab 512 MiB @item -5 @tab 16 MiB @tab 32 MiB @tab 64 MiB @tab 128 MiB @tab 512 MiB @tab 2 GiB
@item -6 @tab 32 MiB @tab 48 MiB @tab 64 MiB @tab 128 MiB @tab 256 MiB @tab 1 GiB @item -6 @tab 32 MiB @tab 64 MiB @tab 128 MiB @tab 256 MiB @tab 1 GiB @tab 4 GiB
@item -7 @tab 64 MiB @tab 96 MiB @tab 128 MiB @tab 256 MiB @tab 512 MiB @tab 2 GiB @item -7 @tab 64 MiB @tab 128 MiB @tab 256 MiB @tab 512 MiB @tab 2 GiB @tab 8 GiB
@item -8 @tab 96 MiB @tab 144 MiB @tab 192 MiB @tab 384 MiB @tab 768 MiB @tab 3 GiB @item -8 @tab 96 MiB @tab 192 MiB @tab 384 MiB @tab 768 MiB @tab 3 GiB @tab 12 GiB
@item -9 @tab 128 MiB @tab 192 MiB @tab 256 MiB @tab 512 MiB @tab 1 GiB @tab 4 GiB @item -9 @tab 128 MiB @tab 256 MiB @tab 512 MiB @tab 1 GiB @tab 4 GiB @tab 16 GiB
@end multitable @end multitable
@ -499,7 +499,7 @@ for all eternity, if not longer.
If you find a bug in plzip, please send electronic mail to If you find a bug in plzip, please send electronic mail to
@email{lzip-bug@@nongnu.org}. Include the version number, which you can @email{lzip-bug@@nongnu.org}. Include the version number, which you can
find by running @w{@samp{plzip --version}}. find by running @w{@code{plzip --version}}.
@node Concept index @node Concept index

View file

@ -1,5 +1,5 @@
/* Plzip - Parallel compressor compatible with lzip /* Plzip - Parallel compressor compatible with lzip
Copyright (C) 2009-2014 Antonio Diaz Diaz. Copyright (C) 2009-2015 Antonio Diaz Diaz.
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

View file

@ -1,5 +1,5 @@
/* Plzip - Parallel compressor compatible with lzip /* Plzip - Parallel compressor compatible with lzip
Copyright (C) 2009-2014 Antonio Diaz Diaz. Copyright (C) 2009-2015 Antonio Diaz Diaz.
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

2
lzip.h
View file

@ -1,5 +1,5 @@
/* Plzip - Parallel compressor compatible with lzip /* Plzip - Parallel compressor compatible with lzip
Copyright (C) 2009-2014 Antonio Diaz Diaz. Copyright (C) 2009-2015 Antonio Diaz Diaz.
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

View file

@ -1,6 +1,6 @@
/* Plzip - Parallel compressor compatible with lzip /* Plzip - Parallel compressor compatible with lzip
Copyright (C) 2009 Laszlo Ersek. Copyright (C) 2009 Laszlo Ersek.
Copyright (C) 2009-2014 Antonio Diaz Diaz. Copyright (C) 2009-2015 Antonio Diaz Diaz.
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -72,7 +72,7 @@ namespace {
const char * const Program_name = "Plzip"; const char * const Program_name = "Plzip";
const char * const program_name = "plzip"; const char * const program_name = "plzip";
const char * const program_year = "2014"; const char * const program_year = "2015";
const char * invocation_name = 0; const char * invocation_name = 0;
struct { const char * from; const char * to; } const known_extensions[] = { struct { const char * from; const char * to; } const known_extensions[] = {
@ -119,7 +119,7 @@ void show_help( const long num_online )
" -1 .. -9 set compression level [default 6]\n" " -1 .. -9 set compression level [default 6]\n"
" --fast alias for -1\n" " --fast alias for -1\n"
" --best alias for -9\n", num_online ); " --best alias for -9\n", num_online );
if( verbosity > 0 ) if( verbosity >= 1 )
{ {
std::printf( " -D, --debug=<level> (0-1) print debug statistics to stderr\n" ); std::printf( " -D, --debug=<level> (0-1) print debug statistics to stderr\n" );
} }

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# check script for Plzip - Parallel compressor compatible with lzip # check script for Plzip - Parallel compressor compatible with lzip
# Copyright (C) 2009-2014 Antonio Diaz Diaz. # Copyright (C) 2009-2015 Antonio Diaz Diaz.
# #
# This script is free software: you have unlimited permission # This script is free software: you have unlimited permission
# to copy, distribute and modify it. # to copy, distribute and modify it.