Update cdrtools patch

Add release documentation
Add option to display the current version

8 files changed, 275 insertions, 16 deletions

diff --git a/CHANGES b/CHANGES
new file mode 100644
index 0000000..85dde47
--- /dev/null
+++ b/CHANGES
@@ -0,0 +1,20 @@
+News in zisofs-tools-1.00:
+
+	Restructured code; now split into a number of modules.
+
+	Use autoconf for configuration.
+
+	Add support for long options if the platform has
+	getopt_long().
+
+	Support compiling on systems without lchown().
+
+	Support the following new options:
+	  -x	Don't descend into other filesystems
+	  -X	Same as -x, but don't create mount point directories
+	  -l	Don't descend into any subdirectories
+	  -L	Same as -l, but don't create stub directories
+	  -F	Allow compression or decompression of single files.
+	  -V	Explicitly set the verbosity.
+	  -w	Display program version.
+
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..b42a17a
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,182 @@
+Basic Installation
+==================
+
+   These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, a file
+`config.cache' that saves the results of its tests to speed up
+reconfiguring, and a file `config.log' containing compiler output
+(useful mainly for debugging `configure').
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If at some point `config.cache'
+contains results you don't want to keep, you may remove or edit it.
+
+   The file `configure.in' is used to create `configure' by a program
+called `autoconf'.  You only need `configure.in' if you want to change
+it or regenerate `configure' using a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  You can give `configure'
+initial values for variables by setting them in the environment.  Using
+a Bourne-compatible shell, you can do that on the command line like
+this:
+     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+
+Or on systems that have the `env' program, you can do it like this:
+     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not supports the `VPATH'
+variable, you have to compile the package for one architecture at a time
+in the source code directory.  After you have installed the package for
+one architecture, use `make distclean' before reconfiguring for another
+architecture.
+
+Installation Names
+==================
+
+   By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=PATH' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' can not figure out
+automatically, but needs to determine by the type of host the package
+will run on.  Usually `configure' can figure that out, but if it prints
+a message saying it can not guess the host type, give it the
+`--host=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name with three fields:
+     CPU-COMPANY-SYSTEM
+
+See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the host type.
+
+   If you are building compiler tools for cross-compiling, you can also
+use the `--target=TYPE' option to select the type of system they will
+produce code for and the `--build=TYPE' option to select the type of
+system on which you are compiling the package.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Operation Controls
+==================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--cache-file=FILE'
+     Use and save the results of the tests in FILE instead of
+     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
+     debugging `configure'.
+
+`--help'
+     Print a summary of the options to `configure', and exit.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--version'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`configure' also accepts some other, not widely useful, options.
diff --git a/Makefile b/Makefile
index 2a515e1..f766ae6 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ OBJS = 	mkzftree.o walk.o workers.o util.o hash.o iso9660.o \
 all: mkzftree
 
 clean:
-	rm -f *.o *.i *.s mkzftree
+	rm -f *.o *.i *.s version.h mkzftree
 
 distclean: clean
 	rm -f MCONFIG config.status config.cache config.log config.h *~ \#*
@@ -50,7 +50,22 @@ configure: configure.in aclocal.m4
 	rm -f MCONFIG config.cache config.log config.status config.h
 
 #
+# Version header
+#
+VERSION = $(shell cat version)
+
+version.h: version
+	echo "#define ZISOFS_TOOLS_VERSION \"$(VERSION)\"" > version.h
+
+#
 # Dependencies
 #
-mkzftree.o:	mkzftree.c mkzftree.h config.h
-workers.o:	workers.c mkzftree.h config.h
\ No newline at end of file
+mkzftree.o:	mkzftree.c mkzftree.h config.h version.h
+workers.o:	workers.c mkzftree.h config.h
+compress.o:	compress.c mkzftree.h config.h iso9660.h
+hash.o:		hash.c mkzftree.h config.h
+iso9660.o:	iso9660.c iso9660.h
+uncompress.o:	uncompress.c mkzftree.h config.h iso9660.h
+util.o:		util.c mkzftree.h config.h
+walk.o:		walk.c mkzftree.h config.h
+workers.o:	workers.c mkzftree.h config.h
diff --git a/README b/README
index 588a8fa..f174d48 100644
--- a/README
+++ b/README
@@ -1,9 +1,10 @@
-			     May 4, 2001
+			    July 27, 2001
 
 User tools for zisofs:
 
 The user tools for zisofs come in two parts: a utility "mkzftree" and
-a patch for cdrtools-1.10 (which includes mkisofs).
+a patch for cdrtools-1.10 (also tested on cdrtools-1.11a06), which is
+the package which includes mkisofs.
 
 First create a directory tree containing compressed files:
 
diff --git a/cdrtools-1.10-zisofs.diff b/cdrtools-1.10-zisofs.diff
index 8c7ebe1..1cc6433 100644
--- a/cdrtools-1.10-zisofs.diff
+++ b/cdrtools-1.10-zisofs.diff
@@ -1,6 +1,6 @@
-diff -ur cdrtools-1.10/mkisofs/mkisofs.c cdrtools-1.10-zisofs/mkisofs/mkisofs.c
---- cdrtools-1.10/mkisofs/mkisofs.c	Fri Apr 20 08:45:50 2001
-+++ cdrtools-1.10-zisofs/mkisofs/mkisofs.c	Thu May  3 21:59:56 2001
+diff -ur stock/cdrtools-1.11/mkisofs/mkisofs.c cdrtools-1.11/mkisofs/mkisofs.c
+--- stock/cdrtools-1.11/mkisofs/mkisofs.c	Fri Apr 20 11:45:50 2001
++++ cdrtools-1.11/mkisofs/mkisofs.c	Fri Jul 27 14:51:05 2001
 @@ -565,10 +565,8 @@
  	'\0', "#", "Set numbers of load sectors", ONE_DASH},
  	{{"boot-info-table", no_argument, NULL, OPTION_BOOT_INFO_TABLE},
@@ -12,9 +12,22 @@ diff -ur cdrtools-1.10/mkisofs/mkisofs.c cdrtools-1.10-zisofs/mkisofs/mkisofs.c
  #ifdef APPLE_HYB
  	{{"hfs-type", required_argument, NULL, OPTION_HFS_TYPE},
  	'\0', "TYPE", "Set HFS default TYPE", ONE_DASH},
-diff -ur cdrtools-1.10/mkisofs/rock.c cdrtools-1.10-zisofs/mkisofs/rock.c
---- cdrtools-1.10/mkisofs/rock.c	Tue Jan 23 04:28:34 2001
-+++ cdrtools-1.10-zisofs/mkisofs/rock.c	Fri May  4 02:34:25 2001
+@@ -1988,7 +1986,11 @@
+ 		error("         but without (standard) Rock Ridge extensions.\n");
+ 		error("         It is highly recommended to add Rock Ridge\n");
+ 	}
+-
++	if (transparent_compression && !use_RockRidge) {
++		error("Warning: transparent decompression is a Rock Ridge extension, but\n");
++		error("         creating filesystem without Rock Ridge attributes; files\n");
++		error("         will not be transparently decompressed.\n");
++	}
+ 	init_nls();		/* Initialize UNICODE tables */
+ 
+ 	/* initialize code tables from a file - if they exists */
+diff -ur stock/cdrtools-1.11/mkisofs/rock.c cdrtools-1.11/mkisofs/rock.c
+--- stock/cdrtools-1.11/mkisofs/rock.c	Tue Jan 23 07:28:34 2001
++++ cdrtools-1.11/mkisofs/rock.c	Fri Jul 27 14:47:05 2001
 @@ -45,7 +45,7 @@
  #define PX_SIZE 36
  #define RE_SIZE 4
@@ -156,3 +169,18 @@ diff -ur cdrtools-1.10/mkisofs/rock.c cdrtools-1.10-zisofs/mkisofs/rock.c
  			set_733((char *) Rock + ipnt, file_size); /* Real file size */
  			ipnt += 8;
  		};
+--- /dev/null	Tue May  5 16:32:27 1998
++++ cdrtools-1.11/mkisofs/README.compression	Fri Jul 27 14:59:17 2001
+@@ -0,0 +1,12 @@
++Transparent decompression (-z option) is supported on Linux systems
++with the "zisofs" patches by H. Peter Anvin, available at:
++
++ftp://ftp.kernel.org/pub/linux/kernel/people/hpa/
++
++You also need the zisofs-tools package to create the compressed files;
++this package is available at:
++
++ftp://ftp.kernel.org/pub/linux/utils/fs/zisofs/
++
++Transparent decompression is implemented as an extension to Rock
++Ridge, so Rock Ridge needs to be enabled (-R or -r options.)
diff --git a/mkzftree.1 b/mkzftree.1
index c226123..1b0b2ab 100644
--- a/mkzftree.1
+++ b/mkzftree.1
@@ -76,8 +76,12 @@ as specifying
 .TP
 \fB\-h\fP, \fB\-\-help\fP
 Displays a brief help message.
+.TP
+\fB\-w\fP, \fB\-\-version\fP
+Display the release version.
 .SH BUGS
-Long options (beginning with \-\-) may not work on all systems.
+Long options (beginning with \-\-) may not work on all systems.  See the
+message printed out by \fImkisofs \-h\fP.
 .SH AUTHOR
 Written by H. Peter Anvin <hpa@zytor.com>.
 .SH COPYRIGHT
diff --git a/mkzftree.c b/mkzftree.c
index 4f7aafa..b8898fe 100644
--- a/mkzftree.c
+++ b/mkzftree.c
@@ -70,6 +70,7 @@
 #include <sys/types.h>
 
 #include "mkzftree.h"
+#include "version.h"
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
@@ -89,7 +90,7 @@ munger_func munger = block_compress_file; /* Default action */
 const char *program;
 
 /* Long options */
-#define OPTSTRING "fl:up:xXlLFvqV:h"
+#define OPTSTRING "fl:up:xXlLFvqV:hw"
 #ifdef HAVE_GETOPT_LONG
 const struct option long_options[] = {
   { "force",	             0,  0,  'f' },
@@ -105,6 +106,7 @@ const struct option long_options[] = {
   { "quiet",                 0,  0,  'q' },
   { "verbosity",             1,  0,  'V' },
   { "help",                  0,  0,  'h' },
+  { "version",               0,  0,  'w' },
   { 0, 0, 0, 0 }
 };
 #define LO(X) X
@@ -116,6 +118,7 @@ const struct option long_options[] = {
 static void usage(enum verbosity level, int err)
 {
   message(level,
+	  "zisofs-tools " ZISOFS_TOOLS_VERSION "\n"
 	  "Usage: %s [options] intree outtree\n"
 	  LO("  --force                ")"  -f    Always compress, even if result is larger\n"
 	  LO("  --level #              ")"  -z #  Set compression level (1-9)\n"
@@ -129,6 +132,8 @@ static void usage(enum verbosity level, int err)
 	  LO("  --verbose              ")"  -v    Increase message verbosity\n"
 	  LO("  --verbosity #          ")"  -V #  Set message verbosity to # (default = %d)\n"
 	  LO("  --quiet                ")"  -q    No messages, not even errors (-V 0)\n"
+	  LO("  --help                 ")"  -h    Display this message\n"
+	  LO("  --version              ")"  -w    Display the program version\n"
 	  ,program, (int)default_verbosity);
   exit(err);
 }
@@ -171,9 +176,6 @@ int main(int argc, char *argv[])
 	level = optarg[0] - '0';
       }
       break;
-    case 'h':
-      usage(vl_quiet, 0);
-      break;
     case 'v':
       verbosity++;
       break;
@@ -208,6 +210,12 @@ int main(int argc, char *argv[])
     case 'F':
       file_root = 1;
       break;
+    case 'h':
+      usage(vl_quiet, 0);
+      break;
+    case 'w':
+      message(vl_quiet, "zisofs-tools " ZISOFS_TOOLS_VERSION "\n");
+      exit(0);
     default:
       usage(vl_error, EX_USAGE);
       break;
diff --git a/version b/version
new file mode 100644
index 0000000..1e376f6
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+1.00