X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flizard-test.c;h=137cdc79249a5b7d725ca9b70978f46f3fdaa06e;hb=18fcca1138ad1b480854cb1e64fa10a84660dcba;hp=a9a82a28a15029f4bbb872b242dd1e7fe826c213;hpb=2c6f7d0fdea90d70ed9d7d10b766e775c0e2f790;p=libucw.git

diff --git a/lib/lizard-test.c b/lib/lizard-test.c
index a9a82a28..137cdc79 100644
--- a/lib/lizard-test.c
+++ b/lib/lizard-test.c
@@ -1,33 +1,75 @@
 #include "lib/lib.h"
+#include "lib/getopt.h"
 #include "lib/fastbuf.h"
-#include "lib/lizzard.h"
+#include "lib/ff-binary.h"
+#include "lib/lizard.h"
 #include <stdio.h>
+#include <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
 
+static char *options = CF_SHORT_OPTS "cdtx";
+static char *help = "\
+Usage: lizard-test <options> input-file [output-file]\n\
+\n\
+Options:\n"
+CF_USAGE
+"-c\t\tCompress\n\
+-d\t\tDecompress\n\
+-t\t\tCompress, decompress, and compare (in memory only, default)\n\
+-x\t\tLet the test crash by shrinking the output buffer\n\
+";
+
+static void NONRET
+usage(void)
+{
+  fputs(help, stderr);
+  exit(1);
+}
+
 int
 main(int argc, char **argv)
 {
-  if (argc < 4)
-    die("Syntax: lizzard-test -cd input-file output-file");
-  uns compress = !strcmp(argv[1], "-c");
-  struct fastbuf *fi, *fo;
+  int opt;
+  uns action = 't';
+  uns crash = 0;
+  log_init(argv[0]);
+  while ((opt = cf_getopt(argc, argv, options, CF_NO_LONG_OPTS, NULL)) >= 0)
+    switch (opt)
+    {
+      case 'c':
+      case 'd':
+      case 't':
+	action = opt;
+	break;
+      case 'x':
+	crash++;
+	break;
+      default:
+	usage();
+    }
+  if (action == 't' && argc != optind+1
+  || action != 't' && argc != optind+2)
+    usage();
+
   void *mi, *mo;
-  uns li, lo;
+  int li, lo;
+  uns adler = 0;
 
   struct stat st;
-  stat(argv[2], &st);
+  stat(argv[optind], &st);
   li = st.st_size;
-  fi = bopen(argv[2], O_RDONLY, 1<<16);
-  if (compress)
+  struct fastbuf *fi = bopen(argv[optind], O_RDONLY, 1<<16);
+  if (action != 'd')
   {
-    lo = li * LIZZARD_MAX_MULTIPLY + LIZZARD_MAX_ADD;
-    li += LIZZARD_NEEDS_CHARS;
+    lo = li * LIZARD_MAX_MULTIPLY + LIZARD_MAX_ADD;
+    li += LIZARD_NEEDS_CHARS;
   }
   else
   {
     lo = bgetl(fi);
-    li -= 4;
+    adler = bgetl(fi);
+    li -= 8;
   }
   mi = xmalloc(li);
   mo = xmalloc(lo);
@@ -35,19 +77,47 @@ main(int argc, char **argv)
   bclose(fi);
 
   printf("%d ", li);
-  if (!compress)
-    printf("->expected %d ", lo);
+  if (action == 'd')
+    printf("->expected %d (%08x) ", lo, adler);
   fflush(stdout);
-  if (compress)
-    lo = lizzard_compress(mi, li, mo);
+  if (action != 'd')
+    lo = lizard_compress(mi, li, mo);
   else
-    lo = lizzard_decompress(mi, mo);
-  printf("-> %d\n", lo);
+  {
+    lo = lizard_decompress(mi, mo);
+    if (adler32(mo, lo) != adler)
+      printf("wrong Adler32 ");
+  }
+  printf("-> %d ", lo);
   fflush(stdout);
 
-  fo = bopen(argv[3], O_CREAT | O_TRUNC | O_WRONLY, 1<<16);
-  if (compress)
-    bputl(fo, li);
-  bwrite(fo, mo, lo);
-  bclose(fo);
+  if (action != 't')
+  {
+    struct fastbuf *fo = bopen(argv[optind+1], O_CREAT | O_TRUNC | O_WRONLY, 1<<16);
+    if (action == 'c')
+    {
+      bputl(fo, li);
+      bputl(fo, adler32(mi, li));
+    }
+    bwrite(fo, mo, lo);
+    bclose(fo);
+  }
+  else
+  {
+    int smaller_li;
+    if (li >= (int) CPU_PAGE_SIZE)
+      smaller_li = li - CPU_PAGE_SIZE;
+    else
+      smaller_li = 0;
+    struct lizard_buffer *buf = lizard_alloc();
+    byte *ptr = lizard_decompress_safe(mo, buf, crash ? smaller_li : li);
+    if (!ptr)
+      printf("err: %m");
+    else if (memcmp(mi, ptr, li))
+      printf("WRONG");
+    else
+      printf("OK");
+    lizard_free(buf);
+  }
+  printf("\n");
 }