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

Bug fix w/ libmagic & vfile

Browse Source
This commit is contained in:
simon987 2020-04-20 10:15:06 -04:00
parent e1ad26d0c6
commit faa2d8a68c
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libscan/arc/arc.c
View File

@ -37,6 +37,10 @@ int arc_read(struct vfile *f, void *buf, size_t size) {
return archive_read_data(f->arc, buf, size); return archive_read_data(f->arc, buf, size);
} }
void arc_reset(struct vfile *f) {
archive_seek_data(f->arc, 0, SEEK_SET);
}
typedef struct arc_data { typedef struct arc_data {
vfile_t *f; vfile_t *f;
char buf[ARC_BUF_SIZE]; char buf[ARC_BUF_SIZE];
@ -134,6 +138,7 @@ scan_code_t parse_archive(scan_arc_ctx_t *ctx, vfile_t *f, document_t *doc) {
sub_job->vfile.close = NULL; sub_job->vfile.close = NULL;
sub_job->vfile.read = arc_read; sub_job->vfile.read = arc_read;
sub_job->vfile.reset = arc_reset;
sub_job->vfile.arc = a; sub_job->vfile.arc = a;
sub_job->vfile.filepath = sub_job->filepath; sub_job->vfile.filepath = sub_job->filepath;
sub_job->vfile.is_fs_file = FALSE; sub_job->vfile.is_fs_file = FALSE;

3
libscan/scan.h
View File

@ -108,6 +108,8 @@ typedef int (*read_func_t)(struct vfile *, void *buf, size_t size);
typedef void (*close_func_t)(struct vfile *); typedef void (*close_func_t)(struct vfile *);
typedef void (*reset_func_t)(struct vfile *);
typedef struct vfile { typedef struct vfile {
union { union {
int fd; int fd;
@ -121,6 +123,7 @@ typedef struct vfile {
read_func_t read; read_func_t read;
close_func_t close; close_func_t close;
reset_func_t reset;
} vfile_t; } vfile_t;
typedef struct parse_job_t { typedef struct parse_job_t {