adding --help and --version to all bins examples

 (.)

diff --git a/ChangeLog b/ChangeLog
index 23bd1a05016757dd9ab70411cfd86b8e5e7e0008..9b59c0e2e33ae9a3d18316721409d0495fdc7707 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
  * fix bugs for decompression on the latter as well
    it seems the one has to use inflateInit2 (..., -MAX_WBITS)
  * added bins/unzzipshow for an example binary
+ * added "--help" and "--version" to all bins examples
 
 2003-12-24
  * added libzzipmmap.la with a simplified interface to zip archives

diff --git a/bins/unzzip.c b/bins/unzzip.c
index 081a85dc29a0b7dcd066414f326c32a20049c360..ae8b3b9796900e57613d087bbde58fd60485e7bd 100644 (file)
--- a/bins/unzzip.c
+++ b/bins/unzzip.c
@@ -5,9 +5,9 @@
  *      This file is used as an example to clarify zzip api usage.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <zzip/zzip.h>
+#include <stdio.h>
+#include <string.h>
 
 #ifdef ZZIP_HAVE_UNISTD_H
 #include <unistd.h>
@@ -33,17 +33,22 @@ main (int argc, char ** argv)
     int exitcode = 0;
     zzip_error_t error;
 
-    if (argc <= 1)
+    if (argc <= 1 || ! strcmp (argv[1], "--help"))
     {
         printf (usage);
-        exit(0);
+        return 0;
     }
-    
+    if (! strcmp (argv[1], "--version"))
+    {
+       printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n");
+       return 0;
+    }
+  
     for (argn=1; argn < argc; argn++)
     {
         ZZIP_DIR * dir;
         ZZIP_DIRENT d;
-  
+
         dir = zzip_dir_open(argv[argn], &error);
         if (! dir)
         {

diff --git a/bins/unzzipcat.c b/bins/unzzipcat.c
index 71a6b519c1b60e25484ef18186aca45db0df46ee..4282cb36be90019dc840536d9c220fcc619bdf55 100644 (file)
--- a/bins/unzzipcat.c
+++ b/bins/unzzipcat.c
@@ -5,9 +5,10 @@
  *      This file is used as an example to clarify zzipmmap api usage.
  */
 
+#include <zzip/mmapped.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <zzip/mmapped.h>
+#include <string.h>
 
 #ifdef ZZIP_HAVE_UNISTD_H
 #include <unistd.h>
@@ -67,10 +68,15 @@ main (int argc, char ** argv)
     int argn;
     ZZIP_DISK* disk;
 
-    if (argc <= 1)
+    if (argc <= 1 || ! strcmp (argv[1], "--help"))
     {
         printf (usage);
-        exit(0);
+        return 0;
+    }
+    if (! strcmp (argv[1], "--version"))
+    {
+       printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n");
+       return 0;
     }
 
     disk = zzip_disk_open (argv[1]);

diff --git a/bins/unzzipdir.c b/bins/unzzipdir.c
index 6461bf41ec6336839557f17bd7252c5648f45e9a..3c570c5548f835165e884cf3943cadb3ce1daf77 100644 (file)
--- a/bins/unzzipdir.c
+++ b/bins/unzzipdir.c
@@ -5,9 +5,10 @@
  *      This file is used as an example to clarify zzipmmap api usage.
  */
 
+#include <zzip/mmapped.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <zzip/mmapped.h>
+#include <string.h>
 
 #ifdef ZZIP_HAVE_UNISTD_H
 #include <unistd.h>
@@ -38,10 +39,15 @@ main (int argc, char ** argv)
     int argn;
     ZZIP_DISK* disk;
 
-    if (argc <= 1)
+    if (argc <= 1 || ! strcmp (argv[1], "--help"))
     {
         printf (usage);
-        exit(0);
+        return 0;
+    }
+    if (! strcmp (argv[1], "--version"))
+    {
+       printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n");
+       return 0;
     }
 
     disk = zzip_disk_open (argv[1]);

diff --git a/bins/unzzipshow.c b/bins/unzzipshow.c
index a098fe5342af5e8559b91cee65795705c0d69697..7ba2d407a6f020f12da2a852d5cbda24bfc49049 100644 (file)
--- a/bins/unzzipshow.c
+++ b/bins/unzzipshow.c
@@ -7,6 +7,7 @@
 
 #include <zzip/fseeko.h>
 #include <stdlib.h>
+#include <string.h>
 
 #ifdef ZZIP_HAVE_FNMATCH_H
 #include <fnmatch.h>
@@ -56,10 +57,15 @@ main (int argc, char ** argv)
     int argn;
     FILE* disk;
 
-    if (argc <= 1)
+    if (argc <= 1 || ! strcmp (argv[1], "--help"))
     {
         printf (usage);
-        exit(0);
+       return 0;
+    }
+    if (! strcmp (argv[1], "--version"))
+    {
+       printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n");
+       return 0;
     }
 
     disk = fopen (argv[1], "r");

diff --git a/bins/zzcat.c b/bins/zzcat.c
index 07481aa10562e7f7d8a5a66f7ff0e67d152fc7ac..27225820784bd6611d64152b9c57a74124ac5cd6 100644 (file)
--- a/bins/zzcat.c
+++ b/bins/zzcat.c
@@ -3,9 +3,9 @@
  *      Use freely under the restrictions of the ZLIB License
  */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <zzip/zzip.h>
+#include <stdio.h>
+#include <string.h>
 
 #ifndef O_BINARY
 #define O_BINARY 0
@@ -24,12 +24,18 @@ int
 main (int argc, char ** argv)
 {
     int argn;
-    if (argc <= 1)
+    
+    if (argc <= 1 || ! strcmp (argv[1], "--help"))
     {
         printf (usage);
-        exit (0);
+        return 0;
     }
-    
+    if (! strcmp (argv[1], "--version"))
+    {
+       printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n");
+       return 0;
+    }
+
     for (argn=1; argn < argc; argn++)
     {
         ZZIP_FILE* fp = zzip_open (argv[argn], O_RDONLY|O_BINARY);

diff --git a/bins/zzdir.c b/bins/zzdir.c
index 1d6540fad938e570e8636f8a488a81b3ba443976..5345f0852da1343c83e38d2edcbfc5be2ed2c18d 100644 (file)
--- a/bins/zzdir.c
+++ b/bins/zzdir.c
@@ -3,9 +3,9 @@
  *      Use freely under the restrictions of the ZLIB license.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <zzip/zzip.h>
+#include <stdio.h>
+#include <string.h>
 
 #ifndef O_BINARY
 #define O_BINARY 0
@@ -25,12 +25,18 @@ main (int argc, char ** argv)
 {
     int argn;
     int exitcode = 0; 
-    if (argc <= 1)
+    
+    if (argc <= 1 || ! strcmp (argv[1], "--help"))
     {
         printf (usage);
-        exit(0);
+        return 0;
     }
-    
+    if (! strcmp (argv[1], "--version"))
+    {
+       printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n");
+       return 0;
+    }
+
     for (argn=1; argn < argc; argn++)
     {
         ZZIP_DIR * dir;

diff --git a/bins/zzip.c b/bins/zzip.c
index dbd47704cc050631c8f25b4d8a7d81117b76cc0f..154bb6adf50d5d19dd56dd8ffc061a499450260e 100644 (file)
--- a/bins/zzip.c
+++ b/bins/zzip.c
@@ -8,9 +8,9 @@
 
 #define _ZZIP_WRITE_SOURCE
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <zzip/zzip.h>
+#include <stdio.h>
+#include <string.h>
 
 #ifdef ZZIP_HAVE_UNISTD_H
 #include <unistd.h>
@@ -35,10 +35,15 @@ main (int argc, char ** argv)
     int argn;
     int exitcode = 0;
 
-    if (argc <= 1)
+    if (argc <= 1 || ! strcmp (argv[1], "--help"))
     {
         printf (usage);
-        exit(0);
+        return 0;
+    }
+    if (! strcmp (argv[1], "--version"))
+    {
+       printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n");
+       return 0;
     }
 
     ZZIP_DIR * dir;

diff --git a/bins/zziptest.c b/bins/zziptest.c
index 19cb9999876b07500af7e2ccfa0d6771cabc8ddc..ead434900f1f92b9d785cb1918b6e385a6eeb646 100644 (file)
--- a/bins/zziptest.c
+++ b/bins/zziptest.c
@@ -12,6 +12,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 
 #if defined _MSC_VER /* Win32*/
 #define WIN32_LEAN_AND_MEAN
@@ -38,8 +39,16 @@ int main(int argc, char ** argv)
   
     if (argc > 1 && argv[1] != NULL)
     {
-        name = argv[1];
-        argv++; argc--;
+       if (! strcmp (argv[1], "--help")) {
+           printf ("zziptest [testfile]\n - selftest defaults to 'test.zip'");
+           return 0;
+       }else if (! strcmp (argv[1], "--version")) {
+           printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n");
+           return 0;
+       }else{
+           name = argv[1];
+           argv++; argc--;
+       }
     }
 
     printf("Opening zip file `%s'... ", name);

diff --git a/bins/zzobfuscated.c b/bins/zzobfuscated.c
index aa419b768835d87ca66909b9923ef03a528eb21e..ecb6cdfe3c5d83c55e4f3dafc8c17868ed47610d 100644 (file)
--- a/bins/zzobfuscated.c
+++ b/bins/zzobfuscated.c
@@ -59,10 +59,15 @@ static const char usage[] =
 int 
 main (int argc, char* argv[])
 {
-    if (argc <= 1 || argc > 3)
+    if (argc <= 1 || argc > 3 || ! strcmp (argv[1], "--help"))
     {
         printf (usage);
-        exit (0);
+        return 0;
+    }
+    if (! strcmp (argv[1], "--version"))
+    {
+       printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n");
+       return 0;
     }
 
     if (strlen(argv[1]) > 128) {

diff --git a/bins/zzxorcat.c b/bins/zzxorcat.c
index 4ee8ab026a27247c8eaf3c2aff5afe2dc427b8d1..8ed49f66fd2feedf74d96a677eb11781ecdde26b 100644 (file)
--- a/bins/zzxorcat.c
+++ b/bins/zzxorcat.c
@@ -8,6 +8,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <ctype.h>
 #include <zzip/zzip.h>
 #include <zzip/plugin.h>
@@ -52,10 +53,15 @@ main (int argc, char ** argv)
     int argn;
     xor_value = 0x55;
 
-    if (argc <= 1)
+    if (argc <= 1 || ! strcmp (argv[1], "--help"))
     {
         printf (usage);
-        exit (0);
+        return 0;
+    }
+    if (! strcmp (argv[1], "--version"))
+    {
+       printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n");
+       return 0;
     }
 
     zzip_init_io (&xor_handlers, 0); xor_handlers.read = &xor_read;

diff --git a/bins/zzxorcopy.c b/bins/zzxorcopy.c
index c7324c21687bb4bcba3bd49b95e81fa170405773..1c06e534126700bfa006c0737230fc419aecc8ed 100644 (file)
--- a/bins/zzxorcopy.c
+++ b/bins/zzxorcopy.c
@@ -10,8 +10,11 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <ctype.h>
 
+#include <zzip/_config.h> /* for ZZIP_VERSION */
+
 #ifndef O_BINARY
 #define O_BINARY 0
 #endif
@@ -48,10 +51,15 @@ main (int argc, char ** argv)
     int argn;
     xor_value = 0x55;
 
-    if (argc <= 1)
+    if (argc <= 1 || ! strcmp (argv[1], "--help"))
     {
         printf (usage);
-        exit (0);
+        return 0;
+    }
+    if (! strcmp (argv[1], "--version"))
+    {
+       printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n");
+       return 0;
     }
     
     for (argn=1; argn < argc; argn++)

diff --git a/bins/zzxordir.c b/bins/zzxordir.c
index 1347d7a4fefcfd505220d98a9a6d05ea2d67cbec..c1e1f141446b639e0554d043172c3dc3a71e5187 100644 (file)
--- a/bins/zzxordir.c
+++ b/bins/zzxordir.c
@@ -8,6 +8,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <ctype.h>
 
 #include <zzip/zzip.h>
@@ -56,10 +57,15 @@ main (int argc, char ** argv)
     int exitcode = 0; 
     xor_value = 0x55;
 
-    if (argc <= 1)
+    if (argc <= 1 || ! strcmp (argv[1], "--help"))
     {
         printf (usage);
-        exit(0);
+        return 0;
+    }
+    if (! strcmp (argv[1], "--version"))
+    {
+       printf (__FILE__" version "ZZIP_PACKAGE" "ZZIP_VERSION"\n");
+       return 0;
     }
 
     zzip_init_io (&xor_handlers, 0); xor_handlers.fd.read = &xor_read;