From ae9fadec473e6e4ade05259fe359c5366c3f3af6 Mon Sep 17 00:00:00 2001
From: simon987 <me@simon987.net>
Date: Wed, 30 Dec 2020 11:36:59 -0500
Subject: [PATCH] Remove UUID dep, fix incremental scan, use MD5(path) as
 unique id, version bump

---
 libscan/arc/arc.c |  2 +-
 libscan/scan.h    | 10 ++++------
 test/main.cpp     |  2 +-
 test/test_util.h  |  1 -
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/libscan/arc/arc.c b/libscan/arc/arc.c
index b4993d0..3e1b927 100644
--- a/libscan/arc/arc.c
+++ b/libscan/arc/arc.c
@@ -123,7 +123,7 @@ scan_code_t parse_archive(scan_arc_ctx_t *ctx, vfile_t *f, document_t *doc) {
         sub_job->vfile.is_fs_file = FALSE;
         sub_job->vfile.log = ctx->log;
         sub_job->vfile.logf = ctx->logf;
-        memcpy(sub_job->parent, doc->uuid, sizeof(uuid_t));
+        memcpy(sub_job->parent, doc->path_md5, MD5_DIGEST_LENGTH);
 
         while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
             sub_job->vfile.info = *archive_entry_stat(entry);
diff --git a/libscan/scan.h b/libscan/scan.h
index 5f68fc2..6dc69a4 100644
--- a/libscan/scan.h
+++ b/libscan/scan.h
@@ -7,7 +7,6 @@
 
 #include <stdio.h>
 #include <sys/stat.h>
-#include <uuid/uuid.h>
 #include <openssl/md5.h>
 
 #include "macros.h"
@@ -26,7 +25,7 @@
 
 #define IS_META_INT(key) (key & META_INT_MASK) == META_INT_MASK
 #define IS_META_LONG(key) (key & META_LONG_MASK) == META_LONG_MASK
-#define IS_META_STR(meta) (meta->key & META_STR_MASK) == META_STR_MASK
+#define IS_META_STR(key) (key & META_STR_MASK) == META_STR_MASK
 
 typedef void (*store_callback_t)(char *key, size_t key_len, char *buf, size_t buf_len);
 typedef void (*logf_callback_t)(const char *filepath, int level, char *format, ...);
@@ -100,14 +99,13 @@ typedef struct meta_line {
 
 
 typedef struct document {
-    unsigned char uuid[16];
-    unsigned long ino;
+    unsigned char path_md5[MD5_DIGEST_LENGTH];
     unsigned long size;
     unsigned int mime;
     int mtime;
     short base;
     short ext;
-    unsigned char path_md5[MD5_DIGEST_LENGTH];
+    char has_parent;
     meta_line_t *meta_head;
     meta_line_t *meta_tail;
     char *filepath;
@@ -148,7 +146,7 @@ typedef struct parse_job_t {
     int base;
     int ext;
     struct vfile vfile;
-    uuid_t parent;
+    unsigned char parent[MD5_DIGEST_LENGTH];
     char filepath[1];
 } parse_job_t;
 
diff --git a/test/main.cpp b/test/main.cpp
index 65d925b..ed87e8f 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -801,7 +801,7 @@ TEST(Msdoc, TestFuzz1) {
 
         fuzz_buffer(buf_copy, &buf_len_copy, 3, 8, 5);
         FILE *file = fmemopen(buf_copy, buf_len_copy, "rb");
-        parse_msdoc_text(&msdoc_text_ctx, &f, &doc, file, buf_copy, buf_len_copy);
+        parse_msdoc_text(&msdoc_text_ctx, &doc, file, buf_copy, buf_len_copy);
     }
     free(buf);
     cleanup(&doc, &f);
diff --git a/test/test_util.h b/test/test_util.h
index 8b33009..e388b49 100644
--- a/test/test_util.h
+++ b/test/test_util.h
@@ -4,7 +4,6 @@
 #include "../libscan/scan.h"
 #include <fcntl.h>
 #include <unistd.h>
-#include <uuid/uuid.h>
 
 void load_file(const char *filepath, vfile_t *f);
 void load_mem(void *mem, size_t size, vfile_t *f);