Merging upstream version 0.7.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

8 files changed, 65 insertions, 59 deletions

diff --git a/ChangeLog b/ChangeLog
index f1ad554..1200ef9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-07  Antonio Diaz Diaz  <antonio@gnu.org>
+
+	* Version 0.7 released.
+	* Minor changes.
+
 2014-08-25  Antonio Diaz Diaz  <antonio@gnu.org>
 
 	* Version 0.6 released.
@@ -28,7 +33,7 @@
 	* Version 0.1 released.
 
 
-Copyright (C) 2013, 2014 Antonio Diaz Diaz.
+Copyright (C) 2013-2015 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 d9a0ccb..7260e4a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 Requirements
 ------------
 You will need a C++ compiler.
-I use gcc 4.9.1 and 3.3.6, but the code should compile with any
+I use gcc 4.9.1 and 4.1.2, but the code should compile with any
 standards compliant compiler.
 Gcc is available at http://gcc.gnu.org.
 
@@ -32,10 +32,6 @@ the main archive.
 5. Type 'make install' to install the program and any data files and
    documentation.
 
-   You can install only the program, the info manual or the man page by
-   typing 'make install-bin', 'make install-info' or 'make install-man'
-   respectively.
-
 
 Another way
 -----------
@@ -54,7 +50,7 @@ After running 'configure', you can run 'make' and 'make install' as
 explained above.
 
 
-Copyright (C) 2013, 2014 Antonio Diaz Diaz.
+Copyright (C) 2013-2015 Antonio Diaz Diaz.
 
 This file is free documentation: you have unlimited permission to copy,
 distribute and modify it.
diff --git a/Makefile.in b/Makefile.in
index fa4ce0f..b125b52 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,20 +9,19 @@ SHELL = /bin/sh
 objs = lzd.o
 
 
-.PHONY : all install install-bin install-info install-man install-strip \
+.PHONY : all install install-bin install-info install-man \
+         install-strip install-compress install-strip-compress \
+         install-bin-strip install-info-compress install-man-compress \
          uninstall uninstall-bin uninstall-info uninstall-man \
          doc info man check dist clean distclean
 
 all : $(progname)
 
 $(progname) : $(objs)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(objs)
-
-$(progname)_profiled : $(objs)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -pg -o $@ $(objs)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(objs)
 
 %.o : %.cc
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -DPROGVERSION=\"$(pkgversion)\" -c -o $@ $<
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -c -o $@ $<
 
 $(objs) : Makefile
 
@@ -37,7 +36,7 @@ $(VPATH)/doc/$(pkgname).info : $(VPATH)/doc/$(pkgname).texi
 man : $(VPATH)/doc/$(progname).1
 
 $(VPATH)/doc/$(progname).1 : $(progname)
-	help2man -n 'educational decompressor for lzip files' \
+	help2man -n 'educational decompressor for the lzip format' \
 	  -o $@ --no-info ./$(progname)
 
 Makefile : $(VPATH)/configure $(VPATH)/Makefile.in
@@ -47,34 +46,45 @@ check : all
 	@$(VPATH)/testsuite/check.sh $(VPATH)/testsuite $(pkgversion)
 
 install : install-bin
+install-strip : install-bin-strip
+install-compress : install-bin
+install-strip-compress : install-bin-strip
 
 install-bin : all
 	if [ ! -d "$(DESTDIR)$(bindir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(bindir)" ; fi
 	$(INSTALL_PROGRAM) ./$(progname) "$(DESTDIR)$(bindir)/$(progname)"
 
+install-bin-strip : all
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install-bin
+
 install-info :
 	if [ ! -d "$(DESTDIR)$(infodir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(infodir)" ; fi
+	-rm -f "$(DESTDIR)$(infodir)/$(pkgname).info"*
 	$(INSTALL_DATA) $(VPATH)/doc/$(pkgname).info "$(DESTDIR)$(infodir)/$(pkgname).info"
 	-install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$(pkgname).info"
 
+install-info-compress : install-info
+	lzip -v -9 "$(DESTDIR)$(infodir)/$(pkgname).info"
+
 install-man :
 	if [ ! -d "$(DESTDIR)$(mandir)/man1" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" ; fi
+	-rm -f "$(DESTDIR)$(mandir)/man1/$(progname).1"*
 	$(INSTALL_DATA) $(VPATH)/doc/$(progname).1 "$(DESTDIR)$(mandir)/man1/$(progname).1"
 
-install-strip : all
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+install-man-compress : install-man
+	lzip -v -9 "$(DESTDIR)$(mandir)/man1/$(progname).1"
 
-uninstall : uninstall-bin uninstall-info uninstall-man
+uninstall : uninstall-bin
 
 uninstall-bin :
 	-rm -f "$(DESTDIR)$(bindir)/$(progname)"
 
 uninstall-info :
 	-install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$(pkgname).info"
-	-rm -f "$(DESTDIR)$(infodir)/$(pkgname).info"
+	-rm -f "$(DESTDIR)$(infodir)/$(pkgname).info"*
 
 uninstall-man :
-	-rm -f "$(DESTDIR)$(mandir)/man1/$(progname).1"
+	-rm -f "$(DESTDIR)$(mandir)/man1/$(progname).1"*
 
 dist : doc
 	ln -sf $(VPATH) $(DISTNAME)
@@ -94,7 +104,7 @@ dist : doc
 	lzip -v -9 $(DISTNAME).tar
 
 clean :
-	-rm -f $(progname) $(progname)_profiled $(objs)
+	-rm -f $(progname) $(objs)
 
 distclean : clean
 	-rm -f Makefile config.status *.tar *.tar.lz
diff --git a/NEWS b/NEWS
index 53c0fc7..e58eb7f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,3 @@
-Changes in version 0.6:
+Changes in version 0.7:
 
 Minor changes.
diff --git a/README b/README
index 400ef93..55c1c52 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 Description
 
-Lzd is a simplified decompressor for lzip files with an educational
+Lzd is a simplified decompressor for the lzip format with an educational
 purpose. Studying its source is a good first step to understand how lzip
 works. It is not safe to use lzd for any real work.
 
@@ -13,8 +13,9 @@ correctly decompress the concatenation of two or more compressed files.
 The result is the concatenation of the corresponding decompressed data.
 Integrity of such concatenated compressed input is also verified.
 
-The lzip file format is designed for long-term data archiving, taking
-into account both data integrity and decoder availability:
+The lzip file format is designed for data sharing and long-term
+archiving, taking into account both data integrity and decoder
+availability:
 
    * The lzip format provides very safe integrity checking and some data
      recovery means. The lziprecover program can repair bit-flip errors
@@ -29,8 +30,8 @@ into account both data integrity and decoder availability:
      extract the data from a lzip file long after quantum computers
      eventually render LZMA obsolete.
 
-   * Additionally lzip is copylefted, which guarantees that it will
-     remain free forever.
+   * Additionally the lzip reference implementation is copylefted, which
+     guarantees that it will remain free forever.
 
 A nice feature of the lzip format is that a corrupt byte is easier to
 repair the nearer it is from the beginning of the file. Therefore, with
@@ -44,7 +45,7 @@ range encoding), and Igor Pavlov (for putting all the above together in
 LZMA).
 
 
-Copyright (C) 2013, 2014 Antonio Diaz Diaz.
+Copyright (C) 2013-2015 Antonio Diaz Diaz.
 
 This file is free documentation: you have unlimited permission to copy,
 distribute and modify it.
diff --git a/configure b/configure
index d380090..70ed8c3 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,12 @@
 #! /bin/sh
-# configure script for Lzd - Educational decompressor for lzip files
-# Copyright (C) 2013, 2014 Antonio Diaz Diaz.
+# configure script for Lzd - Educational decompressor for the lzip format
+# Copyright (C) 2013-2015 Antonio Diaz Diaz.
 #
 # This configure script is free software: you have unlimited permission
 # to copy, distribute and modify it.
 
 pkgname=lzd
-pkgversion=0.6
+pkgversion=0.7
 progname=lzd
 srctrigger=lzd.cc
 
@@ -164,8 +164,8 @@ echo "CXXFLAGS = ${CXXFLAGS}"
 echo "LDFLAGS = ${LDFLAGS}"
 rm -f Makefile
 cat > Makefile << EOF
-# Makefile for Lzd - Educational decompressor for lzip files
-# Copyright (C) 2013, 2014 Antonio Diaz Diaz.
+# Makefile for Lzd - Educational decompressor for the lzip format
+# Copyright (C) 2013-2015 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/lzd.cc b/lzd.cc
index f1a500e..30dde48 100644
--- a/lzd.cc
+++ b/lzd.cc
@@ -1,5 +1,5 @@
-/*  Lzd - Educational decompressor for lzip files
-    Copyright (C) 2013, 2014 Antonio Diaz Diaz.
+/*  Lzd - Educational decompressor for the lzip format
+    Copyright (C) 2013-2015 Antonio Diaz Diaz.
 
     This program is free software: you have unlimited permission
     to copy, distribute and modify it.
@@ -241,7 +241,7 @@ class LZ_decoder
 
   void flush_data();
 
-  uint8_t get_byte( const unsigned distance ) const
+  uint8_t peek( const unsigned distance ) const
     {
     unsigned i = pos - distance - 1;
     if( pos <= distance ) i += dictionary_size;
@@ -255,7 +255,7 @@ class LZ_decoder
     }
 
 public:
-  LZ_decoder( const unsigned dict_size )
+  explicit LZ_decoder( const unsigned dict_size )
     :
     partial_data_pos( 0 ),
     dictionary_size( dict_size ),
@@ -282,7 +282,7 @@ void LZ_decoder::flush_data()
     crc32.update_buf( crc_, buffer + stream_pos, size );
     errno = 0;
     if( std::fwrite( buffer + stream_pos, 1, size, stdout ) != size )
-      { std::fprintf( stderr, "Write error: %s.\n", std::strerror( errno ) );
+      { std::fprintf( stderr, "Write error: %s\n", std::strerror( errno ) );
         std::exit( 1 ); }
     if( pos >= dictionary_size ) { partial_data_pos += pos; pos = 0; }
     stream_pos = pos;
@@ -315,16 +315,16 @@ bool LZ_decoder::decode_member()		// Returns false if error
     const int pos_state = data_position() & pos_state_mask;
     if( rdec.decode_bit( bm_match[state()][pos_state] ) == 0 )	// 1st bit
       {
-      const uint8_t prev_byte = get_byte( 0 );
+      const uint8_t prev_byte = peek( 0 );
       const int literal_state = prev_byte >> ( 8 - literal_context_bits );
       Bit_model * const bm = bm_literal[literal_state];
       if( state.is_char() )
         put_byte( rdec.decode_tree( bm, 8 ) );
       else
-        put_byte( rdec.decode_matched( bm, get_byte( rep0 ) ) );
+        put_byte( rdec.decode_matched( bm, peek( rep0 ) ) );
       state.set_char();
       }
-    else
+    else					// match or repeated match
       {
       int len;
       if( rdec.decode_bit( bm_rep[state()] ) != 0 )		// 2nd bit
@@ -348,12 +348,12 @@ bool LZ_decoder::decode_member()		// Returns false if error
         else
           {
           if( rdec.decode_bit( bm_len[state()][pos_state] ) == 0 ) // 4th bit
-            { state.set_short_rep(); put_byte( get_byte( rep0 ) ); continue; }
+            { state.set_short_rep(); put_byte( peek( rep0 ) ); continue; }
           }
         state.set_rep();
         len = min_match_len + rdec.decode_len( rep_len_model, pos_state );
         }
-      else
+      else					// match
         {
         rep3 = rep2; rep2 = rep1; rep1 = rep0;
         len = min_match_len + rdec.decode_len( match_len_model, pos_state );
@@ -372,7 +372,7 @@ bool LZ_decoder::decode_member()		// Returns false if error
             {
             rep0 += rdec.decode( direct_bits - dis_align_bits ) << dis_align_bits;
             rep0 += rdec.decode_tree_reversed( bm_align, dis_align_bits );
-            if( rep0 == 0xFFFFFFFFU )		// Marker found
+            if( rep0 == 0xFFFFFFFFU )		// marker found
               {
               flush_data();
               return ( len == min_match_len );	// End Of Stream marker
@@ -383,7 +383,7 @@ bool LZ_decoder::decode_member()		// Returns false if error
         if( rep0 >= dictionary_size || rep0 >= data_position() )
           { flush_data(); return false; }
         }
-      for( int i = 0; i < len; ++i ) put_byte( get_byte( rep0 ) );
+      for( int i = 0; i < len; ++i ) put_byte( peek( rep0 ) );
       }
     }
   flush_data();
@@ -395,14 +395,14 @@ int main( const int argc, const char * const argv[] )
   {
   if( argc > 1 )
     {
-    std::printf( "Lzd %s - Educational decompressor for lzip files.\n",
+    std::printf( "Lzd %s - Educational decompressor for the lzip format.\n",
                  PROGVERSION );
     std::printf( "Study the source to learn how a lzip decompressor works.\n"
                  "See the lzip manual for an explanation of the code.\n"
                  "It is not safe to use lzd for any real work.\n"
                  "\nUsage: %s < file.lz > file\n", argv[0] );
     std::printf( "Lzd decompresses from standard input to standard output.\n"
-                 "\nCopyright (C) 2014 Antonio Diaz Diaz.\n"
+                 "\nCopyright (C) 2015 Antonio Diaz Diaz.\n"
                  "This is free software: you are free to change and redistribute it.\n"
                  "There is NO WARRANTY, to the extent permitted by law.\n"
                  "Report bugs to lzip-bug@nongnu.org\n"
@@ -419,28 +419,22 @@ int main( const int argc, const char * const argv[] )
     {
     File_header header;
     for( int i = 0; i < 6; ++i ) header[i] = std::getc( stdin );
-    if( std::feof( stdin ) || std::memcmp( header, "LZIP", 4 ) != 0 )
+    if( std::feof( stdin ) || std::memcmp( header, "LZIP\x01", 5 ) != 0 )
       {
       if( first_member )
-        { std::fprintf( stderr, "Bad magic number (file not in lzip format)\n" );
+        { std::fputs( "Bad magic number (file not in lzip format).\n", stderr );
           return 2; }
       break;
       }
-    if( header[4] != 1 )
-      {
-      std::fprintf( stderr, "Version %d member format not supported.\n",
-                    header[4] );
-      return 2;
-      }
     unsigned dict_size = 1 << ( header[5] & 0x1F );
     dict_size -= ( dict_size / 16 ) * ( ( header[5] >> 5 ) & 7 );
     if( dict_size < min_dictionary_size || dict_size > max_dictionary_size )
-      { std::fprintf( stderr, "Invalid dictionary size in member header\n" );
+      { std::fputs( "Invalid dictionary size in member header.\n", stderr );
         return 2; }
 
     LZ_decoder decoder( dict_size );
     if( !decoder.decode_member() )
-      { std::fprintf( stderr, "Data error\n" ); return 2; }
+      { std::fputs( "Data error\n", stderr ); return 2; }
 
     File_trailer trailer;
     for( int i = 0; i < 20; ++i ) trailer[i] = std::getc( stdin );
@@ -449,11 +443,11 @@ int main( const int argc, const char * const argv[] )
     unsigned long long data_size = 0;
     for( int i = 11; i >= 4; --i ) { data_size <<= 8; data_size += trailer[i]; }
     if( crc != decoder.crc() || data_size != decoder.data_position() )
-      { std::fprintf( stderr, "CRC error\n" ); return 2; }
+      { std::fputs( "CRC error\n", stderr ); return 2; }
     }
 
   if( std::fclose( stdout ) != 0 )
-    { std::fprintf( stderr, "Can't close stdout: %s.\n", std::strerror( errno ) );
+    { std::fprintf( stderr, "Can't close stdout: %s\n", std::strerror( errno ) );
       return 1; }
   return 0;
   }
diff --git a/testsuite/check.sh b/testsuite/check.sh
index 0cdc668..cf0a940 100755
--- a/testsuite/check.sh
+++ b/testsuite/check.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # check script for Lzd - Educational decompressor for lzip files
-# Copyright (C) 2013, 2014 Antonio Diaz Diaz.
+# Copyright (C) 2013-2015 Antonio Diaz Diaz.
 #
 # This script is free software: you have unlimited permission
 # to copy, distribute and modify it.