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

Handle excludes in archive files

Browse Source
This commit is contained in:
simon987 2021-09-20 20:15:35 -04:00
parent da17282374
commit 1d95be534b
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libscan/arc/arc.c
View File

@ -142,7 +142,10 @@ int arc_open(scan_arc_ctx_t *ctx, vfile_t *f, struct archive **a, arc_data_t *ar
} }
} }
scan_code_t parse_archive(scan_arc_ctx_t *ctx, vfile_t *f, document_t *doc) { static __thread int sub_strings[30];
#define EXCLUDED(str) (pcre_exec(exclude, exclude_extra, str, strlen(str), 0, 0, sub_strings, sizeof(sub_strings)) >= 0)
scan_code_t parse_archive(scan_arc_ctx_t *ctx, vfile_t *f, document_t *doc, pcre *exclude, pcre_extra *exclude_extra) {
struct archive *a = NULL; struct archive *a = NULL;
struct archive_entry *entry = NULL; struct archive_entry *entry = NULL;
@ -213,14 +216,19 @@ scan_code_t parse_archive(scan_arc_ctx_t *ctx, vfile_t *f, document_t *doc) {
} }
sub_job->base = (int) (strrchr(sub_job->filepath, '/') - sub_job->filepath) + 1; sub_job->base = (int) (strrchr(sub_job->filepath, '/') - sub_job->filepath) + 1;
// Handle excludes
if (exclude != NULL && EXCLUDED(sub_job->filepath)) {
CTX_LOG_DEBUGF("arc.c", "Excluded: %s", sub_job->filepath)
continue;
}
char *p = strrchr(sub_job->filepath, '.'); char *p = strrchr(sub_job->filepath, '.');
if (p != NULL) { if (p != NULL && (p - sub_job->filepath) > strlen(f->filepath)) {
sub_job->ext = (int) (p - sub_job->filepath + 1); sub_job->ext = (int) (p - sub_job->filepath + 1);
} else { } else {
sub_job->ext = (int) strlen(sub_job->filepath); sub_job->ext = (int) strlen(sub_job->filepath);
} }
memset(&sub_job->vfile.sha1_ctx, 0, sizeof(sub_job->vfile.sha1_ctx));
SHA1_Init(&sub_job->vfile.sha1_ctx); SHA1_Init(&sub_job->vfile.sha1_ctx);
ctx->parse(sub_job); ctx->parse(sub_job);

3
libscan/arc/arc.h
View File

@ -4,6 +4,7 @@
#include <archive.h> #include <archive.h>
#include <archive_entry.h> #include <archive_entry.h>
#include <fcntl.h> #include <fcntl.h>
#include <pcre.h>
#include "../scan.h" #include "../scan.h"
# define ARC_SKIPPED (-1) # define ARC_SKIPPED (-1)
@ -68,7 +69,7 @@ int arc_open(scan_arc_ctx_t *ctx, vfile_t *f, struct archive **a, arc_data_t *ar
int should_parse_filtered_file(const char *filepath, int ext); int should_parse_filtered_file(const char *filepath, int ext);
scan_code_t parse_archive(scan_arc_ctx_t *ctx, vfile_t *f, document_t *doc); scan_code_t parse_archive(scan_arc_ctx_t *ctx, vfile_t *f, document_t *doc, pcre *exclude, pcre_extra *exclude_extra);
int arc_read(struct vfile *f, void *buf, size_t size); int arc_read(struct vfile *f, void *buf, size_t size);