From 365d2d93b5f52bf4aee26c82105f2023b9823452 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 6 Nov 2015 14:13:27 +0100 Subject: Merging upstream version 1.0. Signed-off-by: Daniel Baumann --- ChangeLog | 8 ++++---- INSTALL | 2 +- NEWS | 2 +- README | 2 +- carg_parser.c | 7 ++++--- carg_parser.h | 4 ++-- configure | 8 +++----- decoder.c | 2 +- decoder.h | 2 +- doc/lunzip.1 | 6 +++--- lunzip.h | 2 +- main.c | 13 +++++++------ testsuite/check.sh | 2 +- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index 838387e..56134f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,11 @@ -2010-12-17 Antonio Diaz Diaz +2011-01-17 Antonio Diaz Diaz - * Version 1.0-rc1 released. + * Version 1.0 released. * Initial release. - * Created from the decompression code of clzip 1.1-rc2. + * Created from the decompression code of clzip 1.1. -Copyright (C) 2010 Antonio Diaz Diaz. +Copyright (C) 2010, 2011 Antonio Diaz Diaz. 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 diff --git a/INSTALL b/INSTALL index fdecdff..c5a06fc 100644 --- a/INSTALL +++ b/INSTALL @@ -50,7 +50,7 @@ After running `configure', you can run `make' and `make install' as explained above. -Copyright (C) 2010 Antonio Diaz Diaz. +Copyright (C) 2010, 2011 Antonio Diaz Diaz. This file is free documentation: you have unlimited permission to copy, distribute and modify it. diff --git a/NEWS b/NEWS index 3c9f549..428011b 100644 --- a/NEWS +++ b/NEWS @@ -2,4 +2,4 @@ Changes in version 1.0: Initial release. -Created from the decompression code of clzip 1.1-rc2. +Created from the decompression code of clzip 1.1. diff --git a/README b/README index 4a5a621..7161879 100644 --- a/README +++ b/README @@ -32,7 +32,7 @@ few tens of KiB larger than the dictionary size used to compress that file. -Copyright (C) 2010 Antonio Diaz Diaz. +Copyright (C) 2010, 2011 Antonio Diaz Diaz. This file is free documentation: you have unlimited permission to copy, distribute and modify it. diff --git a/carg_parser.c b/carg_parser.c index ff14a87..52c8658 100644 --- a/carg_parser.c +++ b/carg_parser.c @@ -1,5 +1,5 @@ -/* Arg_parser - A POSIX/GNU command line argument parser. (C version) - Copyright (C) 2006, 2007, 2008, 2009, 2010 Antonio Diaz Diaz. +/* Arg_parser - POSIX/GNU command line argument parser. (C version) + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Antonio Diaz Diaz. 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 @@ -45,7 +45,8 @@ static char push_back_record( struct Arg_parser * const ap, { const int len = strlen( argument ); struct ap_Record *p; - void * tmp = ap_resize_buffer( ap->data, ( ap->data_size + 1 ) * sizeof (struct ap_Record) ); + void * tmp = ap_resize_buffer( ap->data, + ( ap->data_size + 1 ) * sizeof (struct ap_Record) ); if( !tmp ) return 0; ap->data = (struct ap_Record *)tmp; p = &(ap->data[ap->data_size]); diff --git a/carg_parser.h b/carg_parser.h index 4dccb5f..0f61c12 100644 --- a/carg_parser.h +++ b/carg_parser.h @@ -1,5 +1,5 @@ -/* Arg_parser - A POSIX/GNU command line argument parser. (C version) - Copyright (C) 2006, 2007, 2008, 2009, 2010 Antonio Diaz Diaz. +/* Arg_parser - POSIX/GNU command line argument parser. (C version) + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Antonio Diaz Diaz. 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 diff --git a/configure b/configure index a7b8339..ba3e65c 100755 --- a/configure +++ b/configure @@ -1,16 +1,14 @@ #! /bin/sh # configure script for Lunzip - Decompressor for lzip files -# Copyright (C) 2010 Antonio Diaz Diaz. +# Copyright (C) 2010, 2011 Antonio Diaz Diaz. # # This configure script is free software: you have unlimited permission # to copy, distribute and modify it. -# -# Date of this version: 2010-12-17 args= no_create= pkgname=lunzip -pkgversion=1.0-rc1 +pkgversion=1.0 progname=lunzip srctrigger=lunzip.h @@ -167,7 +165,7 @@ echo "LDFLAGS = ${LDFLAGS}" rm -f Makefile cat > Makefile << EOF # Makefile for Lunzip - Decompressor for lzip files -# Copyright (C) 2010 Antonio Diaz Diaz. +# Copyright (C) 2010, 2011 Antonio Diaz Diaz. # This file was generated automatically by configure. Do not edit. # # This Makefile is free software: you have unlimited permission diff --git a/decoder.c b/decoder.c index e6af722..e59b2ad 100644 --- a/decoder.c +++ b/decoder.c @@ -1,5 +1,5 @@ /* Lunzip - Decompressor for lzip files - Copyright (C) 2010 Antonio Diaz Diaz. + Copyright (C) 2010, 2011 Antonio Diaz Diaz. 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 diff --git a/decoder.h b/decoder.h index efb9472..c81147f 100644 --- a/decoder.h +++ b/decoder.h @@ -1,5 +1,5 @@ /* Lunzip - Decompressor for lzip files - Copyright (C) 2010 Antonio Diaz Diaz. + Copyright (C) 2010, 2011 Antonio Diaz Diaz. 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 diff --git a/doc/lunzip.1 b/doc/lunzip.1 index c8e20df..260d24a 100644 --- a/doc/lunzip.1 +++ b/doc/lunzip.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH LUNZIP "1" "December 2010" "Lunzip 1.0-rc1" "User Commands" +.TH LUNZIP "1" "January 2011" "Lunzip 1.0" "User Commands" .SH NAME Lunzip \- small decompressor for lzip files .SH SYNOPSIS @@ -19,7 +19,7 @@ output version information and exit send output to standard output .TP \fB\-d\fR, \fB\-\-decompress\fR -decompress +decompress (this is the default) .TP \fB\-f\fR, \fB\-\-force\fR overwrite existing output files @@ -46,7 +46,7 @@ Report bugs to lzip\-bug@nongnu.org .br Lunzip home page: http://www.nongnu.org/lzip/lunzip.html .SH COPYRIGHT -Copyright \(co 2010 Antonio Diaz Diaz. +Copyright \(co 2011 Antonio Diaz Diaz. License GPLv3+: GNU GPL version 3 or later .br This is free software: you are free to change and redistribute it. diff --git a/lunzip.h b/lunzip.h index 52b0f27..a2209b4 100644 --- a/lunzip.h +++ b/lunzip.h @@ -1,5 +1,5 @@ /* Lunzip - Decompressor for lzip files - Copyright (C) 2010 Antonio Diaz Diaz. + Copyright (C) 2010, 2011 Antonio Diaz Diaz. 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 diff --git a/main.c b/main.c index 11d733b..0649d1d 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ /* Lunzip - Decompressor for lzip files - Copyright (C) 2010 Antonio Diaz Diaz. + Copyright (C) 2010, 2011 Antonio Diaz Diaz. 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 @@ -63,7 +63,7 @@ long long int llabs( long long int number ); const char * const Program_name = "Lunzip"; const char * const program_name = "lunzip"; -const char * const program_year = "2010"; +const char * const program_year = "2011"; const char * invocation_name = 0; #ifdef O_BINARY @@ -106,7 +106,7 @@ static void show_help() printf( " -h, --help display this help and exit\n" ); printf( " -V, --version output version information and exit\n" ); printf( " -c, --stdout send output to standard output\n" ); - printf( " -d, --decompress decompress\n" ); + printf( " -d, --decompress decompress (this is the default)\n" ); printf( " -f, --force overwrite existing output files\n" ); printf( " -k, --keep keep (don't delete) input files\n" ); printf( " -o, --output= if reading stdin, place the output into \n" ); @@ -260,9 +260,10 @@ static void close_and_set_permissions( const struct stat * const in_statsp ) bool error = false; if( in_statsp ) { - if( fchmod( outfd, in_statsp->st_mode ) != 0 || - ( fchown( outfd, in_statsp->st_uid, in_statsp->st_gid ) != 0 && - errno != EPERM ) ) error = true; + if( ( fchown( outfd, in_statsp->st_uid, in_statsp->st_gid ) != 0 && + errno != EPERM ) || + fchmod( outfd, in_statsp->st_mode ) != 0 ) + error = true; /* fchown will in many cases return with EPERM, which can be safely ignored. */ } if( close( outfd ) == 0 ) outfd = -1; diff --git a/testsuite/check.sh b/testsuite/check.sh index 5743d4a..f1e6c17 100755 --- a/testsuite/check.sh +++ b/testsuite/check.sh @@ -1,6 +1,6 @@ #! /bin/sh # check script for Lunzip - Decompressor for lzip files -# Copyright (C) 2010 Antonio Diaz Diaz. +# Copyright (C) 2010, 2011 Antonio Diaz Diaz. # # This script is free software: you have unlimited permission # to copy, distribute and modify it. -- cgit v1.2.3