... | ... |
@@ -320,12 +320,6 @@ int cli_scanmscab(cli_ctx *ctx, off_t sfx_offset) |
320 | 320 |
memset(&ops_ex, 0, sizeof(struct mspack_system_ex)); |
321 | 321 |
ops_ex.ops = mspack_sys_fmap_ops; |
322 | 322 |
|
323 |
- MSPACK_SYS_SELFTEST(ret); |
|
324 |
- if (ret) { |
|
325 |
- cli_dbgmsg("%s() failed at %d\n", __func__, __LINE__); |
|
326 |
- return CL_EUNPACK; |
|
327 |
- } |
|
328 |
- |
|
329 | 323 |
cab_d = mspack_create_cab_decompressor(&ops_ex.ops); |
330 | 324 |
if (!cab_d) { |
331 | 325 |
cli_dbgmsg("%s() failed at %d\n", __func__, __LINE__); |
... | ... |
@@ -427,12 +421,6 @@ int cli_scanmschm(cli_ctx *ctx) |
427 | 427 |
memset(&ops_ex, 0, sizeof(struct mspack_system_ex)); |
428 | 428 |
ops_ex.ops = mspack_sys_fmap_ops; |
429 | 429 |
|
430 |
- MSPACK_SYS_SELFTEST(ret); |
|
431 |
- if (ret) { |
|
432 |
- cli_dbgmsg("%s() failed at %d\n", __func__, __LINE__); |
|
433 |
- return CL_EUNPACK; |
|
434 |
- } |
|
435 |
- |
|
436 | 430 |
mschm_d = mspack_create_chm_decompressor(&ops_ex.ops); |
437 | 431 |
if (!mschm_d) { |
438 | 432 |
cli_dbgmsg("%s() failed at %d\n", __func__, __LINE__); |
... | ... |
@@ -1,9 +1,16 @@ |
1 | 1 |
AC_MSG_CHECKING([LFS safe fts implementation]) |
2 |
-AC_TRY_COMPILE([ |
|
3 |
- #include <fts.h> |
|
4 |
- ], [ fts_open((void *)0, FTS_PHYSICAL, (void *)0);], |
|
5 |
- [ have_LFS_fts=yes ], |
|
6 |
- [ have_LFS_fts=no] |
|
2 |
+AC_TRY_RUN( [ |
|
3 |
+#include <fts.h> |
|
4 |
+ |
|
5 |
+int main(void) { |
|
6 |
+ fts_open((void *)0, FTS_PHYSICAL, (void *)0); |
|
7 |
+ |
|
8 |
+ return 0; |
|
9 |
+} |
|
10 |
+], |
|
11 |
+[have_LFS_fts=yes], |
|
12 |
+[have_LFS_fts=no], |
|
13 |
+[have_LFS_fts=no] |
|
7 | 14 |
) |
8 | 15 |
AC_MSG_RESULT([$have_LFS_fts]) |
9 | 16 |
AM_CONDITIONAL([SYSTEM_LFS_FTS], [test "x$have_LFS_fts" = "xyes"]) |
... | ... |
@@ -24,6 +24,6 @@ int main(void) { |
24 | 24 |
|
25 | 25 |
if test "$enable_stat64" != "no"; then |
26 | 26 |
AC_DEFINE([HAVE_STAT64],1,[enable stat64]) |
27 |
-CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" |
|
27 |
+CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" |
|
28 | 28 |
fi |
29 | 29 |
AC_MSG_RESULT([$enable_stat64]) |
... | ... |
@@ -3,6 +3,7 @@ m4_include([libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4]) |
3 | 3 |
if test "x$system_libmspack" = "xno"; then |
4 | 4 |
use_internal_mspack=yes |
5 | 5 |
AM_CONDITIONAL([USE_INTERNAL_MSPACK], test TRUE) |
6 |
+ CLFAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" |
|
6 | 7 |
else |
7 | 8 |
PKG_CHECK_MODULES([LIBMSPACK], [libmspack], |
8 | 9 |
use_internal_mspack=no, use_internal_mspack=yes) |