diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-08-21 12:23:01 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-08-21 12:24:06 +0200 |
| commit | e14ffcf8e092758bc21d0d5c795b58ea0b1773f2 (patch) | |
| tree | 3359d1e5939982a9695330c2dbf74e1609f28728 /difftool/extract.c | |
| parent | a7d22b83cf70eb500f52edb625e9c719a35b0134 (diff) | |
Merge functionality of file on disk and file in sqfs compare functions
Moving towards unified sqfs vs sqfs, sqfs vs dir, dir vs sqfs
comparisions.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'difftool/extract.c')
| -rw-r--r-- | difftool/extract.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/difftool/extract.c b/difftool/extract.c index 9d84265..9fee46d 100644 --- a/difftool/extract.c +++ b/difftool/extract.c @@ -39,12 +39,12 @@ static int extract(data_reader_t *data, file_info_t *fi, int extract_files(file_info_t *a, file_info_t *b, const char *path) { - if (a != NULL) { + if (a != NULL && !a_is_dir) { if (extract(sqfs_a.data, a, path, 'a')) return -1; } - if (b != NULL) { + if (b != NULL && !b_is_dir) { if (extract(sqfs_b.data, b, path, 'b')) return -1; } |