simon987/libscan
1
0
Fork 0
mirror of https://github.com/simon987/libscan.git synced 2025-04-06 04:42:59 +00:00
Code Issues Projects Releases Wiki Activity

Remove UUID dep, fix incremental scan, use MD5(path) as unique id, version bump

Browse Source
This commit is contained in:
simon987 2020-12-30 11:36:59 -05:00
parent cc89c21b87
commit ae9fadec47
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libscan/arc/arc.c
View File

@ -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.is_fs_file = FALSE;
sub_job->vfile.log = ctx->log; sub_job->vfile.log = ctx->log;
sub_job->vfile.logf = ctx->logf; 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) { while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
sub_job->vfile.info = *archive_entry_stat(entry); sub_job->vfile.info = *archive_entry_stat(entry);

10
libscan/scan.h
View File

@ -7,7 +7,6 @@
#include <stdio.h> #include <stdio.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <uuid/uuid.h>
#include <openssl/md5.h> #include <openssl/md5.h>
#include "macros.h" #include "macros.h"
@ -26,7 +25,7 @@
#define IS_META_INT(key) (key & META_INT_MASK) == META_INT_MASK #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_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 (*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, ...); typedef void (*logf_callback_t)(const char *filepath, int level, char *format, ...);
@ -100,14 +99,13 @@ typedef struct meta_line {
typedef struct document { typedef struct document {
unsigned char uuid[16]; unsigned char path_md5[MD5_DIGEST_LENGTH];
unsigned long ino;
unsigned long size; unsigned long size;
unsigned int mime; unsigned int mime;
int mtime; int mtime;
short base; short base;
short ext; short ext;
unsigned char path_md5[MD5_DIGEST_LENGTH]; char has_parent;
meta_line_t *meta_head; meta_line_t *meta_head;
meta_line_t *meta_tail; meta_line_t *meta_tail;
char *filepath; char *filepath;
@ -148,7 +146,7 @@ typedef struct parse_job_t {
int base; int base;
int ext; int ext;
struct vfile vfile; struct vfile vfile;
uuid_t parent; unsigned char parent[MD5_DIGEST_LENGTH];
char filepath[1]; char filepath[1];
} parse_job_t; } parse_job_t;

2
test/main.cpp
View File

@ -801,7 +801,7 @@ TEST(Msdoc, TestFuzz1) {
fuzz_buffer(buf_copy, &buf_len_copy, 3, 8, 5); fuzz_buffer(buf_copy, &buf_len_copy, 3, 8, 5);
FILE *file = fmemopen(buf_copy, buf_len_copy, "rb"); 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); free(buf);
cleanup(&doc, &f); cleanup(&doc, &f);

1
test/test_util.h
View File

@ -4,7 +4,6 @@
#include "../libscan/scan.h" #include "../libscan/scan.h"
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <uuid/uuid.h>
void load_file(const char *filepath, vfile_t *f); void load_file(const char *filepath, vfile_t *f);
void load_mem(void *mem, size_t size, vfile_t *f); void load_mem(void *mem, size_t size, vfile_t *f);