Merge branch 'master' into next

diff --git a/test-gsimm.c b/test-gsimm.c
index b1e7939b6573027f39c5a86295c03d863ca01676..bd28b7da28e4456ca7fea883144e2ebbfb7b6625 100644 (file)
--- a/test-gsimm.c
+++ b/test-gsimm.c
@@ -58,6 +58,19 @@ void usage()
    exit (1);
 }
 
+int dist (u_char *l, u_char *r)
+{ int j, k;
+  int d = 0;
+
+  for (j = 0; j < MD_LENGTH; j++)
+  { u_char ch = l[j] ^ r[j];
+
+    for (k = 0; k < 8; k++) d += ((ch & (1<<k)) > 0);
+  }
+
+  return d;
+}
+
 char *md_to_str(u_char *md)
 { int j;
 
@@ -89,8 +102,8 @@ void process_file (char *name)
     exit (2);
   }
 
-  if (fs.st_size >= GB_SIMM_MIN_FILE_SIZE
-      && fs.st_size <= GB_SIMM_MAX_FILE_SIZE)
+  if (fs.st_size >= MIN_FILE_SIZE
+      && fs.st_size <= MAX_FILE_SIZE)
   { fi->length = fs.st_size;
     fi->name = name;
 
@@ -103,11 +116,13 @@ void process_file (char *name)
 
     gb_simm_process (data, fs.st_size, fi->md);
     if (flag_relative)
-           fprintf (stdout, "%s %llu %u %s %u %3.1f\n",
-                    md_to_str (fi->md), (long long unsigned) 0,
-                    (unsigned) fs.st_size, name,
-                    (unsigned) 0,
-                    100.0 * gb_simm_score(fi->md, relative_md));
+    { int d = dist (fi->md, relative_md);
+      double sim = 1.0 - MIN (1.0, (double) (d) / (MD_LENGTH * 4 - 1));
+      fprintf (stdout, "%s %llu %u %s %u %3.1f\n",
+               md_to_str (fi->md), (long long unsigned) 0,
+              (unsigned) fs.st_size, name,
+               d, 100.0 * sim);
+    }
     else
     {
       fprintf (stdout, "%s %llu %u %s\n",