Browse code

Activate new RAR code.

git-svn: trunk@1479

Trog authored on 2005/04/14 22:38:18
Showing 7 changed files
... ...
@@ -1,3 +1,11 @@
1
+Thu Apr 14 14:35:37 BST 2005 (trog)
2
+-----------------------------------
3
+  * libclamav/scanners.c: Activate new RAR code.
4
+
5
+  * libclamav/unrar.c, unrar.h, unrarvm.h: update code for activation
6
+
7
+  * libclamav/Makefile.am, Makefile.in: compile in new RAR code
8
+ 
1 9
 Thu Apr 14 14:11:31 CEST 2005 (tk)
2 10
 ----------------------------------
3 11
   * freshclam/manager.c: pass proper argument to OnErrorExecute (patch by
... ...
@@ -16,7 +16,7 @@
16 16
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
17 17
 
18 18
 
19
-INCLUDES = -I$(top_srcdir) -I@srcdir@/zziplib -I@srcdir@/mspack
19
+INCLUDES = -I$(top_srcdir) -I@srcdir@/zziplib -I@srcdir@/mspack -I@srcdir@/unrar
20 20
 
21 21
 libclamav_la_LIBADD = @LIBCLAMAV_LIBS@
22 22
 
... ...
@@ -49,8 +49,6 @@ libclamav_la_SOURCES = \
49 49
 	scanners.h \
50 50
 	filetypes.c \
51 51
 	filetypes.h \
52
-	unrarlib.c \
53
-	unrarlib.h \
54 52
 	zziplib/zzip-conf.h \
55 53
 	zziplib/zzip-config.h \
56 54
 	zziplib/zzip-dir.c \
... ...
@@ -124,6 +122,21 @@ libclamav_la_SOURCES = \
124 124
 	is_tar.c \
125 125
 	is_tar.h \
126 126
 	tnef.c \
127
-	tnef.h
127
+	tnef.h \
128
+	unrar/unrar15.c \
129
+	unrar/unrar20.h \
130
+	unrar/unrarcmd.h \
131
+	unrar/unrar.h \
132
+	unrar/unrarvm.c \
133
+	unrar/unrar15.h \
134
+	unrar/unrar.c \
135
+	unrar/unrarfilter.c \
136
+	unrar/unrarppm.c \
137
+	unrar/unrarvm.h \
138
+	unrar/unrar20.c \
139
+	unrar/unrarcmd.c \
140
+	unrar/unrarfilter.h \
141
+	unrar/unrarppm.h
142
+
128 143
 
129 144
 lib_LTLIBRARIES = libclamav.la
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
1
+# Makefile.in generated by automake 1.9.2 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
... ...
@@ -68,49 +68,30 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
68 68
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
69 69
 CONFIG_HEADER = $(top_builddir)/clamav-config.h
70 70
 CONFIG_CLEAN_FILES =
71
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
72
+am__vpath_adj = case $$p in \
73
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
74
+    *) f=$$p;; \
75
+  esac;
76
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
71 77
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
72 78
 libLTLIBRARIES_INSTALL = $(INSTALL)
73 79
 LTLIBRARIES = $(lib_LTLIBRARIES)
74 80
 libclamav_la_DEPENDENCIES =
75 81
 am_libclamav_la_OBJECTS = matcher-ac.lo matcher-bm.lo matcher.lo \
76 82
 	md5.lo others.lo readdb.lo cvd.lo dsig.lo str.lo scanners.lo \
77
-	filetypes.lo unrarlib.lo zzip-dir.lo zzip-err.lo zzip-file.lo \
78
-	zzip-info.lo zzip-io.lo zzip-stat.lo zzip-zip.lo strc.lo \
79
-	blob.lo mbox.lo message.lo snprintf.lo strrcpy.lo table.lo \
80
-	text.lo ole2_extract.lo vba_extract.lo msexpand.lo pe.lo \
81
-	cabd.lo lzxd.lo mszipd.lo qtmd.lo system.lo upx.lo htmlnorm.lo \
83
+	filetypes.lo zzip-dir.lo zzip-err.lo zzip-file.lo zzip-info.lo \
84
+	zzip-io.lo zzip-stat.lo zzip-zip.lo strc.lo blob.lo mbox.lo \
85
+	message.lo snprintf.lo strrcpy.lo table.lo text.lo \
86
+	ole2_extract.lo vba_extract.lo msexpand.lo pe.lo cabd.lo \
87
+	lzxd.lo mszipd.lo qtmd.lo system.lo upx.lo htmlnorm.lo \
82 88
 	chmunpack.lo rebuildpe.lo petite.lo fsg.lo line.lo untar.lo \
83
-	special.lo binhex.lo is_tar.lo tnef.lo
89
+	special.lo binhex.lo is_tar.lo tnef.lo unrar15.lo unrarvm.lo \
90
+	unrar.lo unrarfilter.lo unrarppm.lo unrar20.lo unrarcmd.lo
84 91
 libclamav_la_OBJECTS = $(am_libclamav_la_OBJECTS)
85 92
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
86 93
 depcomp = $(SHELL) $(top_srcdir)/depcomp
87 94
 am__depfiles_maybe = depfiles
88
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/binhex.Plo ./$(DEPDIR)/blob.Plo \
89
-@AMDEP_TRUE@	./$(DEPDIR)/cabd.Plo ./$(DEPDIR)/chmunpack.Plo \
90
-@AMDEP_TRUE@	./$(DEPDIR)/cvd.Plo ./$(DEPDIR)/dsig.Plo \
91
-@AMDEP_TRUE@	./$(DEPDIR)/filetypes.Plo ./$(DEPDIR)/fsg.Plo \
92
-@AMDEP_TRUE@	./$(DEPDIR)/htmlnorm.Plo ./$(DEPDIR)/is_tar.Plo \
93
-@AMDEP_TRUE@	./$(DEPDIR)/line.Plo ./$(DEPDIR)/lzxd.Plo \
94
-@AMDEP_TRUE@	./$(DEPDIR)/matcher-ac.Plo \
95
-@AMDEP_TRUE@	./$(DEPDIR)/matcher-bm.Plo ./$(DEPDIR)/matcher.Plo \
96
-@AMDEP_TRUE@	./$(DEPDIR)/mbox.Plo ./$(DEPDIR)/md5.Plo \
97
-@AMDEP_TRUE@	./$(DEPDIR)/message.Plo ./$(DEPDIR)/msexpand.Plo \
98
-@AMDEP_TRUE@	./$(DEPDIR)/mszipd.Plo \
99
-@AMDEP_TRUE@	./$(DEPDIR)/ole2_extract.Plo \
100
-@AMDEP_TRUE@	./$(DEPDIR)/others.Plo ./$(DEPDIR)/pe.Plo \
101
-@AMDEP_TRUE@	./$(DEPDIR)/petite.Plo ./$(DEPDIR)/qtmd.Plo \
102
-@AMDEP_TRUE@	./$(DEPDIR)/readdb.Plo ./$(DEPDIR)/rebuildpe.Plo \
103
-@AMDEP_TRUE@	./$(DEPDIR)/scanners.Plo ./$(DEPDIR)/snprintf.Plo \
104
-@AMDEP_TRUE@	./$(DEPDIR)/special.Plo ./$(DEPDIR)/str.Plo \
105
-@AMDEP_TRUE@	./$(DEPDIR)/strc.Plo ./$(DEPDIR)/strrcpy.Plo \
106
-@AMDEP_TRUE@	./$(DEPDIR)/system.Plo ./$(DEPDIR)/table.Plo \
107
-@AMDEP_TRUE@	./$(DEPDIR)/text.Plo ./$(DEPDIR)/tnef.Plo \
108
-@AMDEP_TRUE@	./$(DEPDIR)/unrarlib.Plo ./$(DEPDIR)/untar.Plo \
109
-@AMDEP_TRUE@	./$(DEPDIR)/upx.Plo ./$(DEPDIR)/vba_extract.Plo \
110
-@AMDEP_TRUE@	./$(DEPDIR)/zzip-dir.Plo ./$(DEPDIR)/zzip-err.Plo \
111
-@AMDEP_TRUE@	./$(DEPDIR)/zzip-file.Plo \
112
-@AMDEP_TRUE@	./$(DEPDIR)/zzip-info.Plo ./$(DEPDIR)/zzip-io.Plo \
113
-@AMDEP_TRUE@	./$(DEPDIR)/zzip-stat.Plo ./$(DEPDIR)/zzip-zip.Plo
114 95
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
115 96
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
116 97
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
... ...
@@ -200,6 +181,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
200 200
 am__include = @am__include@
201 201
 am__leading_dot = @am__leading_dot@
202 202
 am__quote = @am__quote@
203
+am__tar = @am__tar@
204
+am__untar = @am__untar@
203 205
 bindir = @bindir@
204 206
 build = @build@
205 207
 build_alias = @build_alias@
... ...
@@ -232,7 +215,7 @@ target_alias = @target_alias@
232 232
 target_cpu = @target_cpu@
233 233
 target_os = @target_os@
234 234
 target_vendor = @target_vendor@
235
-INCLUDES = -I$(top_srcdir) -I@srcdir@/zziplib -I@srcdir@/mspack
235
+INCLUDES = -I$(top_srcdir) -I@srcdir@/zziplib -I@srcdir@/mspack -I@srcdir@/unrar
236 236
 libclamav_la_LIBADD = @LIBCLAMAV_LIBS@
237 237
 libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined
238 238
 include_HEADERS = clamav.h
... ...
@@ -261,8 +244,6 @@ libclamav_la_SOURCES = \
261 261
 	scanners.h \
262 262
 	filetypes.c \
263 263
 	filetypes.h \
264
-	unrarlib.c \
265
-	unrarlib.h \
266 264
 	zziplib/zzip-conf.h \
267 265
 	zziplib/zzip-config.h \
268 266
 	zziplib/zzip-dir.c \
... ...
@@ -336,7 +317,21 @@ libclamav_la_SOURCES = \
336 336
 	is_tar.c \
337 337
 	is_tar.h \
338 338
 	tnef.c \
339
-	tnef.h
339
+	tnef.h \
340
+	unrar/unrar15.c \
341
+	unrar/unrar20.h \
342
+	unrar/unrarcmd.h \
343
+	unrar/unrar.h \
344
+	unrar/unrarvm.c \
345
+	unrar/unrar15.h \
346
+	unrar/unrar.c \
347
+	unrar/unrarfilter.c \
348
+	unrar/unrarppm.c \
349
+	unrar/unrarvm.h \
350
+	unrar/unrar20.c \
351
+	unrar/unrarcmd.c \
352
+	unrar/unrarfilter.h \
353
+	unrar/unrarppm.h
340 354
 
341 355
 lib_LTLIBRARIES = libclamav.la
342 356
 all: all-am
... ...
@@ -377,7 +372,7 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
377 377
 	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
378 378
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
379 379
 	  if test -f $$p; then \
380
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
380
+	    f=$(am__strip_dir) \
381 381
 	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
382 382
 	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
383 383
 	  else :; fi; \
... ...
@@ -385,8 +380,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
385 385
 
386 386
 uninstall-libLTLIBRARIES:
387 387
 	@$(NORMAL_UNINSTALL)
388
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
389
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
388
+	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
389
+	  p=$(am__strip_dir) \
390 390
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
391 391
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
392 392
 	done
... ...
@@ -445,7 +440,13 @@ distclean-compile:
445 445
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/table.Plo@am__quote@
446 446
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text.Plo@am__quote@
447 447
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tnef.Plo@am__quote@
448
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrarlib.Plo@am__quote@
448
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrar.Plo@am__quote@
449
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrar15.Plo@am__quote@
450
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrar20.Plo@am__quote@
451
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrarcmd.Plo@am__quote@
452
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrarfilter.Plo@am__quote@
453
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrarppm.Plo@am__quote@
454
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unrarvm.Plo@am__quote@
449 455
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/untar.Plo@am__quote@
450 456
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upx.Plo@am__quote@
451 457
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vba_extract.Plo@am__quote@
... ...
@@ -461,338 +462,163 @@ distclean-compile:
461 461
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
462 462
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
463 463
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
464
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
465
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
464
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
466 465
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
467 466
 
468 467
 .c.obj:
469 468
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
470 469
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
471 470
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
472
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
473
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
471
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
474 472
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
475 473
 
476 474
 .c.lo:
477 475
 @am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
478 476
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
479 477
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
480
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
481
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
478
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
482 479
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
483 480
 
484
-zzip-dir.o: zziplib/zzip-dir.c
485
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-dir.o -MD -MP -MF "$(DEPDIR)/zzip-dir.Tpo" -c -o zzip-dir.o `test -f 'zziplib/zzip-dir.c' || echo '$(srcdir)/'`zziplib/zzip-dir.c; \
486
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-dir.Tpo" "$(DEPDIR)/zzip-dir.Po"; else rm -f "$(DEPDIR)/zzip-dir.Tpo"; exit 1; fi
487
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-dir.c' object='zzip-dir.o' libtool=no @AMDEPBACKSLASH@
488
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-dir.Po' tmpdepfile='$(DEPDIR)/zzip-dir.TPo' @AMDEPBACKSLASH@
489
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
490
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-dir.o `test -f 'zziplib/zzip-dir.c' || echo '$(srcdir)/'`zziplib/zzip-dir.c
491
-
492
-zzip-dir.obj: zziplib/zzip-dir.c
493
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-dir.obj -MD -MP -MF "$(DEPDIR)/zzip-dir.Tpo" -c -o zzip-dir.obj `if test -f 'zziplib/zzip-dir.c'; then $(CYGPATH_W) 'zziplib/zzip-dir.c'; else $(CYGPATH_W) '$(srcdir)/zziplib/zzip-dir.c'; fi`; \
494
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-dir.Tpo" "$(DEPDIR)/zzip-dir.Po"; else rm -f "$(DEPDIR)/zzip-dir.Tpo"; exit 1; fi
495
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-dir.c' object='zzip-dir.obj' libtool=no @AMDEPBACKSLASH@
496
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-dir.Po' tmpdepfile='$(DEPDIR)/zzip-dir.TPo' @AMDEPBACKSLASH@
497
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
498
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-dir.obj `if test -f 'zziplib/zzip-dir.c'; then $(CYGPATH_W) 'zziplib/zzip-dir.c'; else $(CYGPATH_W) '$(srcdir)/zziplib/zzip-dir.c'; fi`
499
-
500 481
 zzip-dir.lo: zziplib/zzip-dir.c
501 482
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-dir.lo -MD -MP -MF "$(DEPDIR)/zzip-dir.Tpo" -c -o zzip-dir.lo `test -f 'zziplib/zzip-dir.c' || echo '$(srcdir)/'`zziplib/zzip-dir.c; \
502 483
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-dir.Tpo" "$(DEPDIR)/zzip-dir.Plo"; else rm -f "$(DEPDIR)/zzip-dir.Tpo"; exit 1; fi
503 484
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-dir.c' object='zzip-dir.lo' libtool=yes @AMDEPBACKSLASH@
504
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-dir.Plo' tmpdepfile='$(DEPDIR)/zzip-dir.TPlo' @AMDEPBACKSLASH@
505
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
485
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
506 486
 @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-dir.lo `test -f 'zziplib/zzip-dir.c' || echo '$(srcdir)/'`zziplib/zzip-dir.c
507 487
 
508
-zzip-err.o: zziplib/zzip-err.c
509
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-err.o -MD -MP -MF "$(DEPDIR)/zzip-err.Tpo" -c -o zzip-err.o `test -f 'zziplib/zzip-err.c' || echo '$(srcdir)/'`zziplib/zzip-err.c; \
510
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-err.Tpo" "$(DEPDIR)/zzip-err.Po"; else rm -f "$(DEPDIR)/zzip-err.Tpo"; exit 1; fi
511
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-err.c' object='zzip-err.o' libtool=no @AMDEPBACKSLASH@
512
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-err.Po' tmpdepfile='$(DEPDIR)/zzip-err.TPo' @AMDEPBACKSLASH@
513
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
514
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-err.o `test -f 'zziplib/zzip-err.c' || echo '$(srcdir)/'`zziplib/zzip-err.c
515
-
516
-zzip-err.obj: zziplib/zzip-err.c
517
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-err.obj -MD -MP -MF "$(DEPDIR)/zzip-err.Tpo" -c -o zzip-err.obj `if test -f 'zziplib/zzip-err.c'; then $(CYGPATH_W) 'zziplib/zzip-err.c'; else $(CYGPATH_W) '$(srcdir)/zziplib/zzip-err.c'; fi`; \
518
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-err.Tpo" "$(DEPDIR)/zzip-err.Po"; else rm -f "$(DEPDIR)/zzip-err.Tpo"; exit 1; fi
519
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-err.c' object='zzip-err.obj' libtool=no @AMDEPBACKSLASH@
520
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-err.Po' tmpdepfile='$(DEPDIR)/zzip-err.TPo' @AMDEPBACKSLASH@
521
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
522
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-err.obj `if test -f 'zziplib/zzip-err.c'; then $(CYGPATH_W) 'zziplib/zzip-err.c'; else $(CYGPATH_W) '$(srcdir)/zziplib/zzip-err.c'; fi`
523
-
524 488
 zzip-err.lo: zziplib/zzip-err.c
525 489
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-err.lo -MD -MP -MF "$(DEPDIR)/zzip-err.Tpo" -c -o zzip-err.lo `test -f 'zziplib/zzip-err.c' || echo '$(srcdir)/'`zziplib/zzip-err.c; \
526 490
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-err.Tpo" "$(DEPDIR)/zzip-err.Plo"; else rm -f "$(DEPDIR)/zzip-err.Tpo"; exit 1; fi
527 491
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-err.c' object='zzip-err.lo' libtool=yes @AMDEPBACKSLASH@
528
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-err.Plo' tmpdepfile='$(DEPDIR)/zzip-err.TPlo' @AMDEPBACKSLASH@
529
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
492
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
530 493
 @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-err.lo `test -f 'zziplib/zzip-err.c' || echo '$(srcdir)/'`zziplib/zzip-err.c
531 494
 
532
-zzip-file.o: zziplib/zzip-file.c
533
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-file.o -MD -MP -MF "$(DEPDIR)/zzip-file.Tpo" -c -o zzip-file.o `test -f 'zziplib/zzip-file.c' || echo '$(srcdir)/'`zziplib/zzip-file.c; \
534
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-file.Tpo" "$(DEPDIR)/zzip-file.Po"; else rm -f "$(DEPDIR)/zzip-file.Tpo"; exit 1; fi
535
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-file.c' object='zzip-file.o' libtool=no @AMDEPBACKSLASH@
536
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-file.Po' tmpdepfile='$(DEPDIR)/zzip-file.TPo' @AMDEPBACKSLASH@
537
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
538
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-file.o `test -f 'zziplib/zzip-file.c' || echo '$(srcdir)/'`zziplib/zzip-file.c
539
-
540
-zzip-file.obj: zziplib/zzip-file.c
541
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-file.obj -MD -MP -MF "$(DEPDIR)/zzip-file.Tpo" -c -o zzip-file.obj `if test -f 'zziplib/zzip-file.c'; then $(CYGPATH_W) 'zziplib/zzip-file.c'; else $(CYGPATH_W) '$(srcdir)/zziplib/zzip-file.c'; fi`; \
542
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-file.Tpo" "$(DEPDIR)/zzip-file.Po"; else rm -f "$(DEPDIR)/zzip-file.Tpo"; exit 1; fi
543
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-file.c' object='zzip-file.obj' libtool=no @AMDEPBACKSLASH@
544
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-file.Po' tmpdepfile='$(DEPDIR)/zzip-file.TPo' @AMDEPBACKSLASH@
545
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
546
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-file.obj `if test -f 'zziplib/zzip-file.c'; then $(CYGPATH_W) 'zziplib/zzip-file.c'; else $(CYGPATH_W) '$(srcdir)/zziplib/zzip-file.c'; fi`
547
-
548 495
 zzip-file.lo: zziplib/zzip-file.c
549 496
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-file.lo -MD -MP -MF "$(DEPDIR)/zzip-file.Tpo" -c -o zzip-file.lo `test -f 'zziplib/zzip-file.c' || echo '$(srcdir)/'`zziplib/zzip-file.c; \
550 497
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-file.Tpo" "$(DEPDIR)/zzip-file.Plo"; else rm -f "$(DEPDIR)/zzip-file.Tpo"; exit 1; fi
551 498
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-file.c' object='zzip-file.lo' libtool=yes @AMDEPBACKSLASH@
552
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-file.Plo' tmpdepfile='$(DEPDIR)/zzip-file.TPlo' @AMDEPBACKSLASH@
553
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
499
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
554 500
 @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-file.lo `test -f 'zziplib/zzip-file.c' || echo '$(srcdir)/'`zziplib/zzip-file.c
555 501
 
556
-zzip-info.o: zziplib/zzip-info.c
557
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-info.o -MD -MP -MF "$(DEPDIR)/zzip-info.Tpo" -c -o zzip-info.o `test -f 'zziplib/zzip-info.c' || echo '$(srcdir)/'`zziplib/zzip-info.c; \
558
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-info.Tpo" "$(DEPDIR)/zzip-info.Po"; else rm -f "$(DEPDIR)/zzip-info.Tpo"; exit 1; fi
559
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-info.c' object='zzip-info.o' libtool=no @AMDEPBACKSLASH@
560
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-info.Po' tmpdepfile='$(DEPDIR)/zzip-info.TPo' @AMDEPBACKSLASH@
561
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
562
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-info.o `test -f 'zziplib/zzip-info.c' || echo '$(srcdir)/'`zziplib/zzip-info.c
563
-
564
-zzip-info.obj: zziplib/zzip-info.c
565
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-info.obj -MD -MP -MF "$(DEPDIR)/zzip-info.Tpo" -c -o zzip-info.obj `if test -f 'zziplib/zzip-info.c'; then $(CYGPATH_W) 'zziplib/zzip-info.c'; else $(CYGPATH_W) '$(srcdir)/zziplib/zzip-info.c'; fi`; \
566
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-info.Tpo" "$(DEPDIR)/zzip-info.Po"; else rm -f "$(DEPDIR)/zzip-info.Tpo"; exit 1; fi
567
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-info.c' object='zzip-info.obj' libtool=no @AMDEPBACKSLASH@
568
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-info.Po' tmpdepfile='$(DEPDIR)/zzip-info.TPo' @AMDEPBACKSLASH@
569
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
570
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-info.obj `if test -f 'zziplib/zzip-info.c'; then $(CYGPATH_W) 'zziplib/zzip-info.c'; else $(CYGPATH_W) '$(srcdir)/zziplib/zzip-info.c'; fi`
571
-
572 502
 zzip-info.lo: zziplib/zzip-info.c
573 503
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-info.lo -MD -MP -MF "$(DEPDIR)/zzip-info.Tpo" -c -o zzip-info.lo `test -f 'zziplib/zzip-info.c' || echo '$(srcdir)/'`zziplib/zzip-info.c; \
574 504
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-info.Tpo" "$(DEPDIR)/zzip-info.Plo"; else rm -f "$(DEPDIR)/zzip-info.Tpo"; exit 1; fi
575 505
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-info.c' object='zzip-info.lo' libtool=yes @AMDEPBACKSLASH@
576
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-info.Plo' tmpdepfile='$(DEPDIR)/zzip-info.TPlo' @AMDEPBACKSLASH@
577
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
506
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
578 507
 @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-info.lo `test -f 'zziplib/zzip-info.c' || echo '$(srcdir)/'`zziplib/zzip-info.c
579 508
 
580
-zzip-io.o: zziplib/zzip-io.c
581
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-io.o -MD -MP -MF "$(DEPDIR)/zzip-io.Tpo" -c -o zzip-io.o `test -f 'zziplib/zzip-io.c' || echo '$(srcdir)/'`zziplib/zzip-io.c; \
582
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-io.Tpo" "$(DEPDIR)/zzip-io.Po"; else rm -f "$(DEPDIR)/zzip-io.Tpo"; exit 1; fi
583
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-io.c' object='zzip-io.o' libtool=no @AMDEPBACKSLASH@
584
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-io.Po' tmpdepfile='$(DEPDIR)/zzip-io.TPo' @AMDEPBACKSLASH@
585
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
586
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-io.o `test -f 'zziplib/zzip-io.c' || echo '$(srcdir)/'`zziplib/zzip-io.c
587
-
588
-zzip-io.obj: zziplib/zzip-io.c
589
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-io.obj -MD -MP -MF "$(DEPDIR)/zzip-io.Tpo" -c -o zzip-io.obj `if test -f 'zziplib/zzip-io.c'; then $(CYGPATH_W) 'zziplib/zzip-io.c'; else $(CYGPATH_W) '$(srcdir)/zziplib/zzip-io.c'; fi`; \
590
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-io.Tpo" "$(DEPDIR)/zzip-io.Po"; else rm -f "$(DEPDIR)/zzip-io.Tpo"; exit 1; fi
591
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-io.c' object='zzip-io.obj' libtool=no @AMDEPBACKSLASH@
592
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-io.Po' tmpdepfile='$(DEPDIR)/zzip-io.TPo' @AMDEPBACKSLASH@
593
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
594
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-io.obj `if test -f 'zziplib/zzip-io.c'; then $(CYGPATH_W) 'zziplib/zzip-io.c'; else $(CYGPATH_W) '$(srcdir)/zziplib/zzip-io.c'; fi`
595
-
596 509
 zzip-io.lo: zziplib/zzip-io.c
597 510
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-io.lo -MD -MP -MF "$(DEPDIR)/zzip-io.Tpo" -c -o zzip-io.lo `test -f 'zziplib/zzip-io.c' || echo '$(srcdir)/'`zziplib/zzip-io.c; \
598 511
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-io.Tpo" "$(DEPDIR)/zzip-io.Plo"; else rm -f "$(DEPDIR)/zzip-io.Tpo"; exit 1; fi
599 512
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-io.c' object='zzip-io.lo' libtool=yes @AMDEPBACKSLASH@
600
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-io.Plo' tmpdepfile='$(DEPDIR)/zzip-io.TPlo' @AMDEPBACKSLASH@
601
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
513
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
602 514
 @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-io.lo `test -f 'zziplib/zzip-io.c' || echo '$(srcdir)/'`zziplib/zzip-io.c
603 515
 
604
-zzip-stat.o: zziplib/zzip-stat.c
605
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-stat.o -MD -MP -MF "$(DEPDIR)/zzip-stat.Tpo" -c -o zzip-stat.o `test -f 'zziplib/zzip-stat.c' || echo '$(srcdir)/'`zziplib/zzip-stat.c; \
606
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-stat.Tpo" "$(DEPDIR)/zzip-stat.Po"; else rm -f "$(DEPDIR)/zzip-stat.Tpo"; exit 1; fi
607
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-stat.c' object='zzip-stat.o' libtool=no @AMDEPBACKSLASH@
608
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-stat.Po' tmpdepfile='$(DEPDIR)/zzip-stat.TPo' @AMDEPBACKSLASH@
609
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
610
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-stat.o `test -f 'zziplib/zzip-stat.c' || echo '$(srcdir)/'`zziplib/zzip-stat.c
611
-
612
-zzip-stat.obj: zziplib/zzip-stat.c
613
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-stat.obj -MD -MP -MF "$(DEPDIR)/zzip-stat.Tpo" -c -o zzip-stat.obj `if test -f 'zziplib/zzip-stat.c'; then $(CYGPATH_W) 'zziplib/zzip-stat.c'; else $(CYGPATH_W) '$(srcdir)/zziplib/zzip-stat.c'; fi`; \
614
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-stat.Tpo" "$(DEPDIR)/zzip-stat.Po"; else rm -f "$(DEPDIR)/zzip-stat.Tpo"; exit 1; fi
615
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-stat.c' object='zzip-stat.obj' libtool=no @AMDEPBACKSLASH@
616
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-stat.Po' tmpdepfile='$(DEPDIR)/zzip-stat.TPo' @AMDEPBACKSLASH@
617
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
618
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-stat.obj `if test -f 'zziplib/zzip-stat.c'; then $(CYGPATH_W) 'zziplib/zzip-stat.c'; else $(CYGPATH_W) '$(srcdir)/zziplib/zzip-stat.c'; fi`
619
-
620 516
 zzip-stat.lo: zziplib/zzip-stat.c
621 517
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-stat.lo -MD -MP -MF "$(DEPDIR)/zzip-stat.Tpo" -c -o zzip-stat.lo `test -f 'zziplib/zzip-stat.c' || echo '$(srcdir)/'`zziplib/zzip-stat.c; \
622 518
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-stat.Tpo" "$(DEPDIR)/zzip-stat.Plo"; else rm -f "$(DEPDIR)/zzip-stat.Tpo"; exit 1; fi
623 519
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-stat.c' object='zzip-stat.lo' libtool=yes @AMDEPBACKSLASH@
624
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-stat.Plo' tmpdepfile='$(DEPDIR)/zzip-stat.TPlo' @AMDEPBACKSLASH@
625
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
520
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
626 521
 @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-stat.lo `test -f 'zziplib/zzip-stat.c' || echo '$(srcdir)/'`zziplib/zzip-stat.c
627 522
 
628
-zzip-zip.o: zziplib/zzip-zip.c
629
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-zip.o -MD -MP -MF "$(DEPDIR)/zzip-zip.Tpo" -c -o zzip-zip.o `test -f 'zziplib/zzip-zip.c' || echo '$(srcdir)/'`zziplib/zzip-zip.c; \
630
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-zip.Tpo" "$(DEPDIR)/zzip-zip.Po"; else rm -f "$(DEPDIR)/zzip-zip.Tpo"; exit 1; fi
631
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-zip.c' object='zzip-zip.o' libtool=no @AMDEPBACKSLASH@
632
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-zip.Po' tmpdepfile='$(DEPDIR)/zzip-zip.TPo' @AMDEPBACKSLASH@
633
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
634
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-zip.o `test -f 'zziplib/zzip-zip.c' || echo '$(srcdir)/'`zziplib/zzip-zip.c
635
-
636
-zzip-zip.obj: zziplib/zzip-zip.c
637
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-zip.obj -MD -MP -MF "$(DEPDIR)/zzip-zip.Tpo" -c -o zzip-zip.obj `if test -f 'zziplib/zzip-zip.c'; then $(CYGPATH_W) 'zziplib/zzip-zip.c'; else $(CYGPATH_W) '$(srcdir)/zziplib/zzip-zip.c'; fi`; \
638
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-zip.Tpo" "$(DEPDIR)/zzip-zip.Po"; else rm -f "$(DEPDIR)/zzip-zip.Tpo"; exit 1; fi
639
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-zip.c' object='zzip-zip.obj' libtool=no @AMDEPBACKSLASH@
640
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-zip.Po' tmpdepfile='$(DEPDIR)/zzip-zip.TPo' @AMDEPBACKSLASH@
641
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
642
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-zip.obj `if test -f 'zziplib/zzip-zip.c'; then $(CYGPATH_W) 'zziplib/zzip-zip.c'; else $(CYGPATH_W) '$(srcdir)/zziplib/zzip-zip.c'; fi`
643
-
644 523
 zzip-zip.lo: zziplib/zzip-zip.c
645 524
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zzip-zip.lo -MD -MP -MF "$(DEPDIR)/zzip-zip.Tpo" -c -o zzip-zip.lo `test -f 'zziplib/zzip-zip.c' || echo '$(srcdir)/'`zziplib/zzip-zip.c; \
646 525
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zzip-zip.Tpo" "$(DEPDIR)/zzip-zip.Plo"; else rm -f "$(DEPDIR)/zzip-zip.Tpo"; exit 1; fi
647 526
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/zzip-zip.c' object='zzip-zip.lo' libtool=yes @AMDEPBACKSLASH@
648
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zzip-zip.Plo' tmpdepfile='$(DEPDIR)/zzip-zip.TPlo' @AMDEPBACKSLASH@
649
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
527
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
650 528
 @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zzip-zip.lo `test -f 'zziplib/zzip-zip.c' || echo '$(srcdir)/'`zziplib/zzip-zip.c
651 529
 
652
-strc.o: zziplib/strc.c
653
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strc.o -MD -MP -MF "$(DEPDIR)/strc.Tpo" -c -o strc.o `test -f 'zziplib/strc.c' || echo '$(srcdir)/'`zziplib/strc.c; \
654
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/strc.Tpo" "$(DEPDIR)/strc.Po"; else rm -f "$(DEPDIR)/strc.Tpo"; exit 1; fi
655
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/strc.c' object='strc.o' libtool=no @AMDEPBACKSLASH@
656
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/strc.Po' tmpdepfile='$(DEPDIR)/strc.TPo' @AMDEPBACKSLASH@
657
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
658
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strc.o `test -f 'zziplib/strc.c' || echo '$(srcdir)/'`zziplib/strc.c
659
-
660
-strc.obj: zziplib/strc.c
661
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strc.obj -MD -MP -MF "$(DEPDIR)/strc.Tpo" -c -o strc.obj `if test -f 'zziplib/strc.c'; then $(CYGPATH_W) 'zziplib/strc.c'; else $(CYGPATH_W) '$(srcdir)/zziplib/strc.c'; fi`; \
662
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/strc.Tpo" "$(DEPDIR)/strc.Po"; else rm -f "$(DEPDIR)/strc.Tpo"; exit 1; fi
663
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/strc.c' object='strc.obj' libtool=no @AMDEPBACKSLASH@
664
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/strc.Po' tmpdepfile='$(DEPDIR)/strc.TPo' @AMDEPBACKSLASH@
665
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
666
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strc.obj `if test -f 'zziplib/strc.c'; then $(CYGPATH_W) 'zziplib/strc.c'; else $(CYGPATH_W) '$(srcdir)/zziplib/strc.c'; fi`
667
-
668 530
 strc.lo: zziplib/strc.c
669 531
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strc.lo -MD -MP -MF "$(DEPDIR)/strc.Tpo" -c -o strc.lo `test -f 'zziplib/strc.c' || echo '$(srcdir)/'`zziplib/strc.c; \
670 532
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/strc.Tpo" "$(DEPDIR)/strc.Plo"; else rm -f "$(DEPDIR)/strc.Tpo"; exit 1; fi
671 533
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zziplib/strc.c' object='strc.lo' libtool=yes @AMDEPBACKSLASH@
672
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/strc.Plo' tmpdepfile='$(DEPDIR)/strc.TPlo' @AMDEPBACKSLASH@
673
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
534
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
674 535
 @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strc.lo `test -f 'zziplib/strc.c' || echo '$(srcdir)/'`zziplib/strc.c
675 536
 
676
-cabd.o: mspack/cabd.c
677
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cabd.o -MD -MP -MF "$(DEPDIR)/cabd.Tpo" -c -o cabd.o `test -f 'mspack/cabd.c' || echo '$(srcdir)/'`mspack/cabd.c; \
678
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cabd.Tpo" "$(DEPDIR)/cabd.Po"; else rm -f "$(DEPDIR)/cabd.Tpo"; exit 1; fi
679
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mspack/cabd.c' object='cabd.o' libtool=no @AMDEPBACKSLASH@
680
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/cabd.Po' tmpdepfile='$(DEPDIR)/cabd.TPo' @AMDEPBACKSLASH@
681
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
682
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cabd.o `test -f 'mspack/cabd.c' || echo '$(srcdir)/'`mspack/cabd.c
683
-
684
-cabd.obj: mspack/cabd.c
685
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cabd.obj -MD -MP -MF "$(DEPDIR)/cabd.Tpo" -c -o cabd.obj `if test -f 'mspack/cabd.c'; then $(CYGPATH_W) 'mspack/cabd.c'; else $(CYGPATH_W) '$(srcdir)/mspack/cabd.c'; fi`; \
686
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cabd.Tpo" "$(DEPDIR)/cabd.Po"; else rm -f "$(DEPDIR)/cabd.Tpo"; exit 1; fi
687
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mspack/cabd.c' object='cabd.obj' libtool=no @AMDEPBACKSLASH@
688
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/cabd.Po' tmpdepfile='$(DEPDIR)/cabd.TPo' @AMDEPBACKSLASH@
689
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
690
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cabd.obj `if test -f 'mspack/cabd.c'; then $(CYGPATH_W) 'mspack/cabd.c'; else $(CYGPATH_W) '$(srcdir)/mspack/cabd.c'; fi`
691
-
692 537
 cabd.lo: mspack/cabd.c
693 538
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cabd.lo -MD -MP -MF "$(DEPDIR)/cabd.Tpo" -c -o cabd.lo `test -f 'mspack/cabd.c' || echo '$(srcdir)/'`mspack/cabd.c; \
694 539
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cabd.Tpo" "$(DEPDIR)/cabd.Plo"; else rm -f "$(DEPDIR)/cabd.Tpo"; exit 1; fi
695 540
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mspack/cabd.c' object='cabd.lo' libtool=yes @AMDEPBACKSLASH@
696
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/cabd.Plo' tmpdepfile='$(DEPDIR)/cabd.TPlo' @AMDEPBACKSLASH@
697
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
541
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
698 542
 @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cabd.lo `test -f 'mspack/cabd.c' || echo '$(srcdir)/'`mspack/cabd.c
699 543
 
700
-lzxd.o: mspack/lzxd.c
701
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzxd.o -MD -MP -MF "$(DEPDIR)/lzxd.Tpo" -c -o lzxd.o `test -f 'mspack/lzxd.c' || echo '$(srcdir)/'`mspack/lzxd.c; \
702
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/lzxd.Tpo" "$(DEPDIR)/lzxd.Po"; else rm -f "$(DEPDIR)/lzxd.Tpo"; exit 1; fi
703
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mspack/lzxd.c' object='lzxd.o' libtool=no @AMDEPBACKSLASH@
704
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/lzxd.Po' tmpdepfile='$(DEPDIR)/lzxd.TPo' @AMDEPBACKSLASH@
705
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
706
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzxd.o `test -f 'mspack/lzxd.c' || echo '$(srcdir)/'`mspack/lzxd.c
707
-
708
-lzxd.obj: mspack/lzxd.c
709
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzxd.obj -MD -MP -MF "$(DEPDIR)/lzxd.Tpo" -c -o lzxd.obj `if test -f 'mspack/lzxd.c'; then $(CYGPATH_W) 'mspack/lzxd.c'; else $(CYGPATH_W) '$(srcdir)/mspack/lzxd.c'; fi`; \
710
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/lzxd.Tpo" "$(DEPDIR)/lzxd.Po"; else rm -f "$(DEPDIR)/lzxd.Tpo"; exit 1; fi
711
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mspack/lzxd.c' object='lzxd.obj' libtool=no @AMDEPBACKSLASH@
712
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/lzxd.Po' tmpdepfile='$(DEPDIR)/lzxd.TPo' @AMDEPBACKSLASH@
713
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
714
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzxd.obj `if test -f 'mspack/lzxd.c'; then $(CYGPATH_W) 'mspack/lzxd.c'; else $(CYGPATH_W) '$(srcdir)/mspack/lzxd.c'; fi`
715
-
716 544
 lzxd.lo: mspack/lzxd.c
717 545
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzxd.lo -MD -MP -MF "$(DEPDIR)/lzxd.Tpo" -c -o lzxd.lo `test -f 'mspack/lzxd.c' || echo '$(srcdir)/'`mspack/lzxd.c; \
718 546
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/lzxd.Tpo" "$(DEPDIR)/lzxd.Plo"; else rm -f "$(DEPDIR)/lzxd.Tpo"; exit 1; fi
719 547
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mspack/lzxd.c' object='lzxd.lo' libtool=yes @AMDEPBACKSLASH@
720
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/lzxd.Plo' tmpdepfile='$(DEPDIR)/lzxd.TPlo' @AMDEPBACKSLASH@
721
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
548
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
722 549
 @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzxd.lo `test -f 'mspack/lzxd.c' || echo '$(srcdir)/'`mspack/lzxd.c
723 550
 
724
-mszipd.o: mspack/mszipd.c
725
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mszipd.o -MD -MP -MF "$(DEPDIR)/mszipd.Tpo" -c -o mszipd.o `test -f 'mspack/mszipd.c' || echo '$(srcdir)/'`mspack/mszipd.c; \
726
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mszipd.Tpo" "$(DEPDIR)/mszipd.Po"; else rm -f "$(DEPDIR)/mszipd.Tpo"; exit 1; fi
727
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mspack/mszipd.c' object='mszipd.o' libtool=no @AMDEPBACKSLASH@
728
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/mszipd.Po' tmpdepfile='$(DEPDIR)/mszipd.TPo' @AMDEPBACKSLASH@
729
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
730
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mszipd.o `test -f 'mspack/mszipd.c' || echo '$(srcdir)/'`mspack/mszipd.c
731
-
732
-mszipd.obj: mspack/mszipd.c
733
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mszipd.obj -MD -MP -MF "$(DEPDIR)/mszipd.Tpo" -c -o mszipd.obj `if test -f 'mspack/mszipd.c'; then $(CYGPATH_W) 'mspack/mszipd.c'; else $(CYGPATH_W) '$(srcdir)/mspack/mszipd.c'; fi`; \
734
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mszipd.Tpo" "$(DEPDIR)/mszipd.Po"; else rm -f "$(DEPDIR)/mszipd.Tpo"; exit 1; fi
735
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mspack/mszipd.c' object='mszipd.obj' libtool=no @AMDEPBACKSLASH@
736
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/mszipd.Po' tmpdepfile='$(DEPDIR)/mszipd.TPo' @AMDEPBACKSLASH@
737
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
738
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mszipd.obj `if test -f 'mspack/mszipd.c'; then $(CYGPATH_W) 'mspack/mszipd.c'; else $(CYGPATH_W) '$(srcdir)/mspack/mszipd.c'; fi`
739
-
740 551
 mszipd.lo: mspack/mszipd.c
741 552
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mszipd.lo -MD -MP -MF "$(DEPDIR)/mszipd.Tpo" -c -o mszipd.lo `test -f 'mspack/mszipd.c' || echo '$(srcdir)/'`mspack/mszipd.c; \
742 553
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mszipd.Tpo" "$(DEPDIR)/mszipd.Plo"; else rm -f "$(DEPDIR)/mszipd.Tpo"; exit 1; fi
743 554
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mspack/mszipd.c' object='mszipd.lo' libtool=yes @AMDEPBACKSLASH@
744
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/mszipd.Plo' tmpdepfile='$(DEPDIR)/mszipd.TPlo' @AMDEPBACKSLASH@
745
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
555
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
746 556
 @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mszipd.lo `test -f 'mspack/mszipd.c' || echo '$(srcdir)/'`mspack/mszipd.c
747 557
 
748
-qtmd.o: mspack/qtmd.c
749
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT qtmd.o -MD -MP -MF "$(DEPDIR)/qtmd.Tpo" -c -o qtmd.o `test -f 'mspack/qtmd.c' || echo '$(srcdir)/'`mspack/qtmd.c; \
750
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/qtmd.Tpo" "$(DEPDIR)/qtmd.Po"; else rm -f "$(DEPDIR)/qtmd.Tpo"; exit 1; fi
751
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mspack/qtmd.c' object='qtmd.o' libtool=no @AMDEPBACKSLASH@
752
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/qtmd.Po' tmpdepfile='$(DEPDIR)/qtmd.TPo' @AMDEPBACKSLASH@
753
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
754
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o qtmd.o `test -f 'mspack/qtmd.c' || echo '$(srcdir)/'`mspack/qtmd.c
755
-
756
-qtmd.obj: mspack/qtmd.c
757
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT qtmd.obj -MD -MP -MF "$(DEPDIR)/qtmd.Tpo" -c -o qtmd.obj `if test -f 'mspack/qtmd.c'; then $(CYGPATH_W) 'mspack/qtmd.c'; else $(CYGPATH_W) '$(srcdir)/mspack/qtmd.c'; fi`; \
758
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/qtmd.Tpo" "$(DEPDIR)/qtmd.Po"; else rm -f "$(DEPDIR)/qtmd.Tpo"; exit 1; fi
759
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mspack/qtmd.c' object='qtmd.obj' libtool=no @AMDEPBACKSLASH@
760
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/qtmd.Po' tmpdepfile='$(DEPDIR)/qtmd.TPo' @AMDEPBACKSLASH@
761
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
762
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o qtmd.obj `if test -f 'mspack/qtmd.c'; then $(CYGPATH_W) 'mspack/qtmd.c'; else $(CYGPATH_W) '$(srcdir)/mspack/qtmd.c'; fi`
763
-
764 558
 qtmd.lo: mspack/qtmd.c
765 559
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT qtmd.lo -MD -MP -MF "$(DEPDIR)/qtmd.Tpo" -c -o qtmd.lo `test -f 'mspack/qtmd.c' || echo '$(srcdir)/'`mspack/qtmd.c; \
766 560
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/qtmd.Tpo" "$(DEPDIR)/qtmd.Plo"; else rm -f "$(DEPDIR)/qtmd.Tpo"; exit 1; fi
767 561
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mspack/qtmd.c' object='qtmd.lo' libtool=yes @AMDEPBACKSLASH@
768
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/qtmd.Plo' tmpdepfile='$(DEPDIR)/qtmd.TPlo' @AMDEPBACKSLASH@
769
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
562
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
770 563
 @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o qtmd.lo `test -f 'mspack/qtmd.c' || echo '$(srcdir)/'`mspack/qtmd.c
771 564
 
772
-system.o: mspack/system.c
773
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT system.o -MD -MP -MF "$(DEPDIR)/system.Tpo" -c -o system.o `test -f 'mspack/system.c' || echo '$(srcdir)/'`mspack/system.c; \
774
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/system.Tpo" "$(DEPDIR)/system.Po"; else rm -f "$(DEPDIR)/system.Tpo"; exit 1; fi
775
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mspack/system.c' object='system.o' libtool=no @AMDEPBACKSLASH@
776
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/system.Po' tmpdepfile='$(DEPDIR)/system.TPo' @AMDEPBACKSLASH@
777
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
778
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o system.o `test -f 'mspack/system.c' || echo '$(srcdir)/'`mspack/system.c
779
-
780
-system.obj: mspack/system.c
781
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT system.obj -MD -MP -MF "$(DEPDIR)/system.Tpo" -c -o system.obj `if test -f 'mspack/system.c'; then $(CYGPATH_W) 'mspack/system.c'; else $(CYGPATH_W) '$(srcdir)/mspack/system.c'; fi`; \
782
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/system.Tpo" "$(DEPDIR)/system.Po"; else rm -f "$(DEPDIR)/system.Tpo"; exit 1; fi
783
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mspack/system.c' object='system.obj' libtool=no @AMDEPBACKSLASH@
784
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/system.Po' tmpdepfile='$(DEPDIR)/system.TPo' @AMDEPBACKSLASH@
785
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
786
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o system.obj `if test -f 'mspack/system.c'; then $(CYGPATH_W) 'mspack/system.c'; else $(CYGPATH_W) '$(srcdir)/mspack/system.c'; fi`
787
-
788 565
 system.lo: mspack/system.c
789 566
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT system.lo -MD -MP -MF "$(DEPDIR)/system.Tpo" -c -o system.lo `test -f 'mspack/system.c' || echo '$(srcdir)/'`mspack/system.c; \
790 567
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/system.Tpo" "$(DEPDIR)/system.Plo"; else rm -f "$(DEPDIR)/system.Tpo"; exit 1; fi
791 568
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mspack/system.c' object='system.lo' libtool=yes @AMDEPBACKSLASH@
792
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/system.Plo' tmpdepfile='$(DEPDIR)/system.TPlo' @AMDEPBACKSLASH@
793
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
569
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
794 570
 @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o system.lo `test -f 'mspack/system.c' || echo '$(srcdir)/'`mspack/system.c
795 571
 
572
+unrar15.lo: unrar/unrar15.c
573
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unrar15.lo -MD -MP -MF "$(DEPDIR)/unrar15.Tpo" -c -o unrar15.lo `test -f 'unrar/unrar15.c' || echo '$(srcdir)/'`unrar/unrar15.c; \
574
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/unrar15.Tpo" "$(DEPDIR)/unrar15.Plo"; else rm -f "$(DEPDIR)/unrar15.Tpo"; exit 1; fi
575
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='unrar/unrar15.c' object='unrar15.lo' libtool=yes @AMDEPBACKSLASH@
576
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
577
+@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unrar15.lo `test -f 'unrar/unrar15.c' || echo '$(srcdir)/'`unrar/unrar15.c
578
+
579
+unrarvm.lo: unrar/unrarvm.c
580
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unrarvm.lo -MD -MP -MF "$(DEPDIR)/unrarvm.Tpo" -c -o unrarvm.lo `test -f 'unrar/unrarvm.c' || echo '$(srcdir)/'`unrar/unrarvm.c; \
581
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/unrarvm.Tpo" "$(DEPDIR)/unrarvm.Plo"; else rm -f "$(DEPDIR)/unrarvm.Tpo"; exit 1; fi
582
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='unrar/unrarvm.c' object='unrarvm.lo' libtool=yes @AMDEPBACKSLASH@
583
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
584
+@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unrarvm.lo `test -f 'unrar/unrarvm.c' || echo '$(srcdir)/'`unrar/unrarvm.c
585
+
586
+unrar.lo: unrar/unrar.c
587
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unrar.lo -MD -MP -MF "$(DEPDIR)/unrar.Tpo" -c -o unrar.lo `test -f 'unrar/unrar.c' || echo '$(srcdir)/'`unrar/unrar.c; \
588
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/unrar.Tpo" "$(DEPDIR)/unrar.Plo"; else rm -f "$(DEPDIR)/unrar.Tpo"; exit 1; fi
589
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='unrar/unrar.c' object='unrar.lo' libtool=yes @AMDEPBACKSLASH@
590
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
591
+@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unrar.lo `test -f 'unrar/unrar.c' || echo '$(srcdir)/'`unrar/unrar.c
592
+
593
+unrarfilter.lo: unrar/unrarfilter.c
594
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unrarfilter.lo -MD -MP -MF "$(DEPDIR)/unrarfilter.Tpo" -c -o unrarfilter.lo `test -f 'unrar/unrarfilter.c' || echo '$(srcdir)/'`unrar/unrarfilter.c; \
595
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/unrarfilter.Tpo" "$(DEPDIR)/unrarfilter.Plo"; else rm -f "$(DEPDIR)/unrarfilter.Tpo"; exit 1; fi
596
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='unrar/unrarfilter.c' object='unrarfilter.lo' libtool=yes @AMDEPBACKSLASH@
597
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
598
+@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unrarfilter.lo `test -f 'unrar/unrarfilter.c' || echo '$(srcdir)/'`unrar/unrarfilter.c
599
+
600
+unrarppm.lo: unrar/unrarppm.c
601
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unrarppm.lo -MD -MP -MF "$(DEPDIR)/unrarppm.Tpo" -c -o unrarppm.lo `test -f 'unrar/unrarppm.c' || echo '$(srcdir)/'`unrar/unrarppm.c; \
602
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/unrarppm.Tpo" "$(DEPDIR)/unrarppm.Plo"; else rm -f "$(DEPDIR)/unrarppm.Tpo"; exit 1; fi
603
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='unrar/unrarppm.c' object='unrarppm.lo' libtool=yes @AMDEPBACKSLASH@
604
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
605
+@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unrarppm.lo `test -f 'unrar/unrarppm.c' || echo '$(srcdir)/'`unrar/unrarppm.c
606
+
607
+unrar20.lo: unrar/unrar20.c
608
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unrar20.lo -MD -MP -MF "$(DEPDIR)/unrar20.Tpo" -c -o unrar20.lo `test -f 'unrar/unrar20.c' || echo '$(srcdir)/'`unrar/unrar20.c; \
609
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/unrar20.Tpo" "$(DEPDIR)/unrar20.Plo"; else rm -f "$(DEPDIR)/unrar20.Tpo"; exit 1; fi
610
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='unrar/unrar20.c' object='unrar20.lo' libtool=yes @AMDEPBACKSLASH@
611
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
612
+@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unrar20.lo `test -f 'unrar/unrar20.c' || echo '$(srcdir)/'`unrar/unrar20.c
613
+
614
+unrarcmd.lo: unrar/unrarcmd.c
615
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unrarcmd.lo -MD -MP -MF "$(DEPDIR)/unrarcmd.Tpo" -c -o unrarcmd.lo `test -f 'unrar/unrarcmd.c' || echo '$(srcdir)/'`unrar/unrarcmd.c; \
616
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/unrarcmd.Tpo" "$(DEPDIR)/unrarcmd.Plo"; else rm -f "$(DEPDIR)/unrarcmd.Tpo"; exit 1; fi
617
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='unrar/unrarcmd.c' object='unrarcmd.lo' libtool=yes @AMDEPBACKSLASH@
618
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
619
+@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unrarcmd.lo `test -f 'unrar/unrarcmd.c' || echo '$(srcdir)/'`unrar/unrarcmd.c
620
+
796 621
 mostlyclean-libtool:
797 622
 	-rm -f *.lo
798 623
 
... ...
@@ -807,7 +633,7 @@ install-includeHEADERS: $(include_HEADERS)
807 807
 	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
808 808
 	@list='$(include_HEADERS)'; for p in $$list; do \
809 809
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
810
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
810
+	  f=$(am__strip_dir) \
811 811
 	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
812 812
 	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
813 813
 	done
... ...
@@ -815,7 +641,7 @@ install-includeHEADERS: $(include_HEADERS)
815 815
 uninstall-includeHEADERS:
816 816
 	@$(NORMAL_UNINSTALL)
817 817
 	@list='$(include_HEADERS)'; for p in $$list; do \
818
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
818
+	  f=$(am__strip_dir) \
819 819
 	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
820 820
 	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
821 821
 	done
... ...
@@ -921,7 +747,7 @@ mostlyclean-generic:
921 921
 clean-generic:
922 922
 
923 923
 distclean-generic:
924
-	-rm -f $(CONFIG_CLEAN_FILES)
924
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
925 925
 
926 926
 maintainer-clean-generic:
927 927
 	@echo "This command is intended for maintainers to use"
... ...
@@ -42,12 +42,6 @@
42 42
 
43 43
 #include <mspack.h>
44 44
 
45
-#ifdef CL_THREAD_SAFE
46
-#  include <pthread.h>
47
-pthread_mutex_t cli_scanrar_mutex = PTHREAD_MUTEX_INITIALIZER;
48
-#endif
49
-int cli_scanrar_inuse = 0;
50
-
51 45
 extern short cli_leavetemps_flag;
52 46
 
53 47
 extern int cli_mbox(const char *dir, int desc, unsigned int options); /* FIXME */
... ...
@@ -58,7 +52,7 @@ extern int cli_mbox(const char *dir, int desc, unsigned int options); /* FIXME *
58 58
 #include "matcher-ac.h"
59 59
 #include "matcher-bm.h"
60 60
 #include "matcher.h"
61
-#include "unrarlib.h"
61
+#include "unrar.h"
62 62
 #include "ole2_extract.h"
63 63
 #include "vba_extract.h"
64 64
 #include "msexpand.h"
... ...
@@ -110,6 +104,7 @@ extern int cli_mbox(const char *dir, int desc, unsigned int options); /* FIXME *
110 110
 
111 111
 static int cli_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec);
112 112
 
113
+static int cli_scandir(const char *dirname, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec);
113 114
 
114 115
 #ifdef CL_THREAD_SAFE
115 116
 static void cli_unlock_mutex(void *mtx)
... ...
@@ -121,59 +116,52 @@ static void cli_unlock_mutex(void *mtx)
121 121
 
122 122
 static int cli_scanrar(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)
123 123
 {
124
-	FILE *tmp = NULL;
125 124
 	int fd, ret = CL_CLEAN;
126
-	unsigned int files = 0, encrypted, afiles;
127
-	ArchiveList_struct *rarlist = NULL;
128
-	ArchiveList_struct *rarlist_head = NULL;
129
-	char *rar_data_ptr;
130
-	unsigned long rar_data_size;
125
+	unsigned int files = 0;
126
+	rar_metadata_t *metadata, *metadata_tmp;
131 127
 	struct cli_meta_node *mdata;
128
+	char *dir;
132 129
 
133 130
 
134 131
     cli_dbgmsg("in scanrar()\n");
135 132
 
136
-#ifdef CL_THREAD_SAFE
137
-    pthread_cleanup_push(cli_unlock_mutex, &cli_scanrar_mutex);
138
-    pthread_mutex_lock(&cli_scanrar_mutex);
139
-    cli_scanrar_inuse = 1;
140
-#endif
141
-
142
-    if(!(afiles = urarlib_list(desc, (ArchiveList_struct *) &rarlist))) {
143
-#ifdef CL_THREAD_SAFE
144
-	pthread_mutex_unlock(&cli_scanrar_mutex);
145
-	cli_scanrar_inuse = 0;
146
-#endif
147
-	return CL_ERAR;
133
+    /* generate the temporary directory */
134
+    dir = cli_gentemp(NULL);
135
+    if(mkdir(dir, 0700)) {
136
+	cli_dbgmsg("RAR: Can't create temporary directory %s\n", dir);
137
+	free(dir);
138
+	return CL_ETMPDIR;
148 139
     }
149 140
 
150
-    cli_dbgmsg("RAR: Number of archived files: %d\n", afiles);
141
+    metadata = metadata_tmp = cli_unrar(desc, dir, limits);
151 142
 
152
-    rarlist_head = rarlist;
153
-
154
-    while(rarlist) {
143
+    if(cli_scandir(dir, virname, scanned, root, limits, options, arec, mrec) == CL_VIRUS) {
144
+	    ret = CL_VIRUS;
145
+    } else while(metadata) {
155 146
 
156 147
 	files++;
157
-	encrypted = rarlist->item.Flags & 0x04;
158 148
 
159
-	cli_dbgmsg("RAR: %s, crc32: 0x%x, encrypted: %d, compressed: %u, normal: %u, method: %d, ratio: %d (max: %d)\n", rarlist->item.Name, rarlist->item.FileCRC, encrypted, rarlist->item.PackSize, rarlist->item.UnpSize, rarlist->item.Method, rarlist->item.PackSize ? ((unsigned int) rarlist->item.UnpSize / (unsigned int) rarlist->item.PackSize) : 0, limits ? limits->maxratio : 0);
149
+	cli_dbgmsg("RAR: %s, crc32: 0x%x, encrypted: %d, compressed: %u, normal: %u, method: %d, ratio: %d (max: %d)\n",
150
+		metadata->filename, metadata->crc, metadata->encrypted, metadata->pack_size,
151
+		metadata->unpack_size, metadata->method,
152
+		metadata->pack_size ? ((unsigned int) metadata->unpack_size / (unsigned int) metadata->pack_size) : 0, limits ? limits->maxratio : 0);
160 153
 
161 154
 	/* Scan metadata */
162 155
 	mdata = root->rar_mlist;
163 156
 	if(mdata) do {
164
-	    if(mdata->encrypted != encrypted)
157
+	    if(mdata->encrypted != metadata->encrypted)
165 158
 		continue;
166 159
 
167
-	    if(mdata->crc32 && (unsigned int) mdata->crc32 != rarlist->item.FileCRC)
160
+	    if(mdata->crc32 && (unsigned int) mdata->crc32 != metadata->crc)
168 161
 		continue;
169 162
 
170
-	    if(mdata->csize > 0 && (unsigned int) mdata->csize != rarlist->item.PackSize)
163
+	    if(mdata->csize > 0 && (unsigned int) mdata->csize != metadata->pack_size)
171 164
 		continue;
172 165
 
173
-	    if(mdata->size >= 0 && (unsigned int) mdata->size != rarlist->item.UnpSize)
166
+	    if(mdata->size >= 0 && (unsigned int) mdata->size != metadata->unpack_size)
174 167
 		continue;
175 168
 
176
-	    if(mdata->method && mdata->method != rarlist->item.Method)
169
+	    if(mdata->method && mdata->method != metadata->method)
177 170
 		continue;
178 171
 
179 172
 	    if(mdata->fileno && mdata->fileno != files)
... ...
@@ -184,7 +172,7 @@ static int cli_scanrar(int desc, const char **virname, long int *scanned, const
184 184
 
185 185
 	    /* TODO add support for regex */
186 186
 	    /*if(mdata->filename && !strstr(zdirent.d_name, mdata->filename))*/
187
-	    if(mdata->filename && strcmp(rarlist->item.Name, mdata->filename))
187
+	    if(mdata->filename && strcmp(metadata->filename, mdata->filename))
188 188
 		continue;
189 189
 
190 190
 	    break; /* matched */
... ...
@@ -197,7 +185,7 @@ static int cli_scanrar(int desc, const char **virname, long int *scanned, const
197 197
 	    break;
198 198
 	}
199 199
 
200
-	if(DETECT_ENCRYPTED && (rarlist->item.Flags & 0x04)) {
200
+	if(DETECT_ENCRYPTED && metadata->encrypted) {
201 201
 	    cli_dbgmsg("RAR: Encrypted files found in archive.\n");
202 202
 	    lseek(desc, 0, SEEK_SET);
203 203
 	    ret = cli_scandesc(desc, virname, scanned, root, 0, 0);
... ...
@@ -210,31 +198,34 @@ static int cli_scanrar(int desc, const char **virname, long int *scanned, const
210 210
 	    break;
211 211
 	}
212 212
 
213
+/*
214
+	TROG - TODO: multi-volume files
213 215
 	if((rarlist->item.Flags & 0x03) != 0) {
214
-	    cli_dbgmsg("RAR: Skipping %s (splitted)\n", rarlist->item.Name);
216
+	    cli_dbgmsg("RAR: Skipping %s (split)\n", rarlist->item.Name);
215 217
 	    rarlist = rarlist->next;
216 218
 	    continue;
217 219
 	}
218
-
220
+*/
219 221
 	if(limits) {
220
-
221
-	    if(limits->maxratio && rarlist->item.UnpSize && rarlist->item.PackSize) {
222
-		if((unsigned int) rarlist->item.UnpSize / (unsigned int) rarlist->item.PackSize >= limits->maxratio) {
223
-		    cli_dbgmsg("RAR: Max ratio reached (normal: %d, compressed: %d, max: %ld)\n", (int) rarlist->item.UnpSize, (int) rarlist->item.PackSize, limits->maxratio);
222
+	    if(limits->maxratio && metadata->unpack_size && metadata->pack_size) {
223
+		if((unsigned int) metadata->unpack_size / (unsigned int) metadata->pack_size >= limits->maxratio) {
224
+		    cli_dbgmsg("RAR: Max ratio reached (normal: %u, compressed: %u, max: %ld)\n", metadata->unpack_size,
225
+		    		metadata->pack_size, limits->maxratio);
224 226
 		    *virname = "Oversized.RAR";
225 227
 		    ret = CL_VIRUS;
226 228
 		    break;
227 229
 		}
228 230
 	    }
229 231
 
230
-	    if(limits->maxfilesize && (rarlist->item.UnpSize > (unsigned int) limits->maxfilesize)) {
231
-		cli_dbgmsg("RAR: %s: Size exceeded (%u, max: %lu)\n", rarlist->item.Name, (unsigned int) rarlist->item.UnpSize, limits->maxfilesize);
232
-		rarlist = rarlist->next;
232
+	    if(limits->maxfilesize && (metadata->unpack_size > (unsigned int) limits->maxfilesize)) {
233
+		cli_dbgmsg("RAR: %s: Size exceeded (%u, max: %lu)\n", metadata->filename,
234
+					metadata->unpack_size, limits->maxfilesize);
233 235
 		if(BLOCKMAX) {
234 236
 		    *virname = "RAR.ExceededFileSize";
235 237
 		    ret = CL_VIRUS;
236 238
 		    break;
237 239
 		}
240
+		metadata = metadata->next;
238 241
 		continue;
239 242
 	    }
240 243
 
... ...
@@ -249,83 +240,20 @@ static int cli_scanrar(int desc, const char **virname, long int *scanned, const
249 249
 	    }
250 250
 	}
251 251
 
252
-        if(rarlist->item.FileAttr & RAR_FENTRY_ATTR_DIRECTORY) {
253
-            rarlist = rarlist->next;
254
-            continue;
255
-        }
256
-
257
-	if((tmp = tmpfile()) == NULL) {
258
-	    cli_dbgmsg("RAR: Can't generate temporary file.\n");
259
-#ifdef CL_THREAD_SAFE
260
-	    pthread_mutex_unlock(&cli_scanrar_mutex);
261
-	    cli_scanrar_inuse = 0;
262
-#endif
263
-	    return CL_ETMPFILE;
264
-	}
265
-	fd = fileno(tmp);
266
-
267
-	if( urarlib_get(&rar_data_ptr, &rar_data_size, rarlist->item.Name, desc, "clam")) {
268
-	    cli_dbgmsg("RAR: Extracted: %s, size: %lu\n", rarlist->item.Name, rar_data_size);
269
-	    if(fwrite(rar_data_ptr, 1, rar_data_size, tmp) != rar_data_size) {
270
-		cli_dbgmsg("RAR: Can't write to file.\n");
271
-		fclose(tmp);
272
-		tmp = NULL;
273
-		ret = CL_ERAR;
274
-		if(rar_data_ptr) {
275
-		    free(rar_data_ptr);
276
-		    rar_data_ptr = NULL;
277
-		}
278
-		break;
279
-	    }
280
-
281
-	    if(rar_data_ptr) {
282
-		free(rar_data_ptr);
283
-		rar_data_ptr = NULL;
284
-	    }
285
-	    if(fflush(tmp) != 0) {
286
-		cli_dbgmsg("RAR: fflush() failed: %s\n", strerror(errno));
287
-		fclose(tmp);
288
-		urarlib_freelist(rarlist_head);
289
-#ifdef CL_THREAD_SAFE
290
-		pthread_mutex_unlock(&cli_scanrar_mutex);
291
-		cli_scanrar_inuse = 0;
292
-#endif
293
-		return CL_EFSYNC;
294
-	    }
295
-
296
-	    lseek(fd, 0, SEEK_SET);
297
-	    if((ret = cli_magic_scandesc(fd, virname, scanned, root, limits, options, arec, mrec)) == CL_VIRUS ) {
298
-		cli_dbgmsg("RAR: Infected with %s\n", *virname);
299
-
300
-		fclose(tmp);
301
-		urarlib_freelist(rarlist);
302
-#ifdef CL_THREAD_SAFE
303
-		pthread_mutex_unlock(&cli_scanrar_mutex);
304
-		cli_scanrar_inuse = 0;
305
-#endif
306
-  		return ret;
307
-	    }
252
+	metadata = metadata->next;
253
+    }
308 254
 
309
-	} else {
310
-	    cli_dbgmsg("RAR: Can't decompress file %s\n", rarlist->item.Name);
311
-	    fclose(tmp);
312
-	    tmp = NULL;
313
-	    ret = CL_ERAR; /* WinRAR 3.0 ? */
314
-	    break;
315
-	}
255
+    if(!cli_leavetemps_flag)
256
+        cli_rmdirs(dir);
316 257
 
317
-	fclose(tmp);
318
-	tmp = NULL;
319
-	rarlist = rarlist->next;
258
+    free(dir);
259
+    metadata = metadata_tmp;
260
+    while (metadata) {
261
+    	metadata_tmp = metadata->next;
262
+    	free(metadata->filename);
263
+    	free(metadata);
264
+    	metadata = metadata_tmp;
320 265
     }
321
-
322
-    urarlib_freelist(rarlist_head);
323
-#ifdef CL_THREAD_SAFE
324
-    pthread_mutex_unlock(&cli_scanrar_mutex);
325
-    cli_scanrar_inuse = 0;
326
-    pthread_cleanup_pop(0);
327
-#endif
328
-    
329 266
     cli_dbgmsg("RAR: Exit code: %d\n", ret);
330 267
 
331 268
     return ret;
... ...
@@ -1391,7 +1319,7 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const
1391 1391
 
1392 1392
     switch(type) {
1393 1393
 	case CL_TYPE_RAR:
1394
-	    if(!DISABLE_RAR && SCAN_ARCHIVE && !cli_scanrar_inuse)
1394
+	    if(!DISABLE_RAR && SCAN_ARCHIVE)
1395 1395
 		ret = cli_scanrar(desc, virname, scanned, root, limits, options, arec, mrec);
1396 1396
 	    break;
1397 1397
 
... ...
@@ -13,15 +13,12 @@
13 13
 #include "unrarvm.h"
14 14
 #include "unrarfilter.h"
15 15
 #include "unrar20.h"
16
+#include "unrar15.h"
17
+#include "clamav.h"
18
+#include "others.h"
16 19
 
17 20
 #define int64to32(x) ((uint)(x))
18 21
 
19
-#ifdef RAR_DEBUG
20
-#define cli_dbgmsg printf
21
-#else
22
-static void cli_dbgmsg(){};
23
-#endif
24
-
25 22
 #ifdef RAR_HIGH_DEBUG
26 23
 #define rar_dbgmsg printf
27 24
 #else
... ...
@@ -125,62 +122,6 @@ static uint32_t rar_endian_convert_32(uint32_t v)
125 125
 }
126 126
 #endif
127 127
 
128
-int cli_readn(int fd, void *buff, unsigned int count)
129
-{
130
-        int retval;
131
-        unsigned int todo;
132
-        void *current;
133
-
134
-
135
-        todo = count;
136
-        current = buff;
137
-
138
-
139
-        do {
140
-                retval = read(fd, current, todo);
141
-                if (retval == 0) {
142
-                        return (count - todo);
143
-                }
144
-                if (retval < 0) {
145
-                        return -1;
146
-                }
147
-                todo -= retval;
148
-                current += retval;
149
-        } while (todo > 0);
150
-
151
-
152
-        return count;
153
-}
154
-
155
-/* Function: writen
156
-        Try hard to write the specified number of bytes
157
-*/
158
-int cli_writen(int fd, void *buff, unsigned int count)
159
-{
160
-        int retval;
161
-        unsigned int todo;
162
-        unsigned char *current;
163
-
164
-
165
-        todo = count;
166
-        current = (unsigned char *) buff;
167
-
168
-        do {
169
-                retval = write(fd, current, todo);
170
-                if (retval < 0) {
171
-                        if (errno == EINTR) {
172
-                                continue;
173
-                        }
174
-                        return -1;
175
-                }
176
-                todo -= retval;
177
-                current += retval;
178
-        } while (todo > 0);
179
-
180
-
181
-        return count;
182
-}
183
-
184 128
 static uint64_t copy_file_data(int ifd, int ofd, uint64_t len)
185 129
 {
186 130
 	unsigned char data[8192];
... ...
@@ -213,10 +154,10 @@ static int is_rar_archive(int fd)
213 213
 		return FALSE;
214 214
 	}
215 215
 	
216
-	if (memcmp(&mark, rar_hdr, SIZEOF_MARKHEAD) == 0) {
216
+	if (memcmp(&mark, &rar_hdr[0], SIZEOF_MARKHEAD) == 0) {
217 217
 		return TRUE;
218 218
 	}
219
-	if (memcmp(&mark, rar_hdr, SIZEOF_MARKHEAD) == 0) {
219
+	if (memcmp(&mark, &rar_hdr[1], SIZEOF_MARKHEAD) == 0) {
220 220
 		return TRUE;
221 221
 	}
222 222
 
... ...
@@ -224,6 +165,33 @@ static int is_rar_archive(int fd)
224 224
 	return FALSE;
225 225
 }
226 226
 
227
+static int is_sfx_rar_archive(int fd)
228
+{
229
+	unsigned char buff[8192];
230
+	const mark_header_t rar_hdr = {0x52, 0x61, 0x72, 0x21, 0x1a, 0x07, 0x00};
231
+	off_t offset=0, size, pos;
232
+	
233
+	lseek(fd, 0, SEEK_SET);
234
+	for (;;) {
235
+		size = cli_readn(fd, buff, 8192);
236
+		if ((size == 0) || (size <= 9)) {
237
+			return FALSE;
238
+		}
239
+		for (pos=0 ; pos < size-9 ; pos++) {
240
+			if (buff[0] == 0x52) {
241
+				if (memcmp(buff, &rar_hdr, 7) == 0) {
242
+					offset += pos;
243
+					lseek(fd, offset, SEEK_SET);
244
+					return TRUE;
245
+				}
246
+			}
247
+		}
248
+		offset += size-9;
249
+		lseek(fd, offset, SEEK_SET);
250
+	}
251
+	return FALSE;
252
+}
253
+	
227 254
 static void insert_old_dist(unpack_data_t *unpack_data, unsigned int distance)
228 255
 {
229 256
 	unpack_data->old_dist[3] = unpack_data->old_dist[2];
... ...
@@ -1325,7 +1293,7 @@ static int rar_unpack(int fd, int method, int solid, unpack_data_t *unpack_data)
1325 1325
 	return retval;
1326 1326
 }
1327 1327
 
1328
-static int cli_unrar(int fd, const char *dirname)
1328
+rar_metadata_t *cli_unrar(int fd, const char *dirname, const struct cl_limits *limits)
1329 1329
 {
1330 1330
 	main_header_t *main_hdr;
1331 1331
 	int ofd;
... ...
@@ -1333,7 +1301,9 @@ static int cli_unrar(int fd, const char *dirname)
1333 1333
 	file_header_t *file_header;
1334 1334
 	unsigned char filename[1024];
1335 1335
 	unpack_data_t *unpack_data;
1336
+	rar_metadata_t *metadata=NULL, *metadata_tail=NULL, *new_metadata;
1336 1337
 	
1338
+	cli_dbgmsg("in cli_unrar\n");
1337 1339
 	if (!is_rar_archive(fd)) {
1338 1340
 		return FALSE;
1339 1341
 	}
... ...
@@ -1349,7 +1319,7 @@ static int cli_unrar(int fd, const char *dirname)
1349 1349
 	
1350 1350
 	main_hdr = read_header(fd, MAIN_HEAD);
1351 1351
 	if (!main_hdr) {
1352
-		return FALSE;
1352
+		return metadata;
1353 1353
 	}
1354 1354
 	cli_dbgmsg("Head CRC: %.4x\n", main_hdr->head_crc);
1355 1355
 	cli_dbgmsg("Head Type: %.2x\n", main_hdr->head_type);
... ...
@@ -1357,12 +1327,12 @@ static int cli_unrar(int fd, const char *dirname)
1357 1357
 	cli_dbgmsg("Head Size: %.4x\n", main_hdr->head_size);
1358 1358
 	if (main_hdr->head_size < SIZEOF_NEWMHD) {
1359 1359
 		free(main_hdr);
1360
-		return FALSE;
1360
+		return metadata;
1361 1361
 	}
1362 1362
 	if (main_hdr->head_size > SIZEOF_NEWMHD) {
1363 1363
 		if (!lseek(fd, main_hdr->head_size - SIZEOF_NEWMHD, SEEK_CUR)) {
1364 1364
 			free(main_hdr);
1365
-			return FALSE;
1365
+			return metadata;
1366 1366
 		}
1367 1367
 	}
1368 1368
 	for (;;) {
... ...
@@ -1370,9 +1340,43 @@ static int cli_unrar(int fd, const char *dirname)
1370 1370
 		if (!file_header) {
1371 1371
 			break;
1372 1372
 		}
1373
+		new_metadata = malloc(sizeof(rar_metadata_t));
1374
+		if (!new_metadata) {
1375
+			break;
1376
+		}
1377
+		new_metadata->pack_size = file_header->pack_size;
1378
+		new_metadata->unpack_size = file_header->unpack_size;
1379
+		new_metadata->crc = file_header->file_crc;
1380
+		new_metadata->method = file_header->method;
1381
+		new_metadata->filename = strdup(file_header->filename);
1382
+		new_metadata->next = NULL;
1383
+		new_metadata->encrypted = FALSE;
1384
+		if (metadata_tail == NULL) {
1385
+			metadata_tail = metadata = new_metadata;
1386
+		} else {
1387
+			metadata_tail->next = new_metadata;
1388
+			metadata_tail = new_metadata;
1389
+		}
1390
+		if (limits) {
1391
+			if (limits->maxratio && file_header->unpack_size && file_header->pack_size) {
1392
+				if(file_header->unpack_size / file_header->pack_size >= limits->maxratio) {
1393
+					free(file_header->filename);
1394
+					free(file_header);
1395
+					break;
1396
+				}
1397
+			}
1398
+
1399
+			if (limits->maxfilesize && (metadata->unpack_size > (unsigned int) limits->maxfilesize)) {
1400
+				free(file_header->filename);
1401
+				free(file_header);
1402
+				break;
1403
+			}
1404
+		}
1405
+
1373 1406
 		if (file_header->flags & LHD_PASSWORD) {
1374 1407
 			cli_dbgmsg("PASSWORDed file: %s\n", file_header->filename);
1375
-		} else {
1408
+			metadata_tail->encrypted = TRUE;
1409
+		} else if (metadata->unpack_size) {
1376 1410
 			snprintf(filename, 1024, "%s/%lu.ura", dirname, file_count);
1377 1411
 			ofd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0600);
1378 1412
 			if (ofd < 0) {
... ...
@@ -1397,7 +1401,7 @@ static int cli_unrar(int fd, const char *dirname)
1397 1397
 				cli_dbgmsg("Computed File CRC: 0x%x\n", unpack_data->unp_crc^0xffffffff);
1398 1398
 				if (unpack_data->unp_crc != 0xffffffff) {
1399 1399
 					if (file_header->file_crc != (unpack_data->unp_crc^0xffffffff)) {
1400
-						printf("CRC error. Please send file to trog.");
1400
+						cli_warnmsg("RAR CRC error. Please send file to trog@clamav.net");
1401 1401
 					}
1402 1402
 				}
1403 1403
 			}
... ...
@@ -1408,7 +1412,7 @@ static int cli_unrar(int fd, const char *dirname)
1408 1408
 			cli_dbgmsg("ERROR: seek failed: %ld\n", file_header->next_offset);
1409 1409
 			free(file_header->filename);
1410 1410
 			free(file_header);
1411
-			return FALSE;
1411
+			return metadata;
1412 1412
 		}
1413 1413
 		free(file_header->filename);
1414 1414
 		free(file_header);
... ...
@@ -1420,32 +1424,5 @@ static int cli_unrar(int fd, const char *dirname)
1420 1420
 	init_filters(unpack_data);
1421 1421
 	unpack_free_data(unpack_data);
1422 1422
 	free(unpack_data);
1423
-	return TRUE;
1424
-}
1425
-
1426
-int main(int argc, char *argv[])
1427
-{
1428
-	int fd, retval, i;
1429
-
1430
-	if (argc == 1) {
1431
-		printf("Usage: %s <filename>\n", argv[0]);
1432
-		exit(-1);
1433
-	}
1434
-	
1435
-	for (i=1 ; i < argc ; i++) {
1436
-		printf("%s: ", argv[i]);
1437
-		fd = open(argv[i], O_RDONLY);
1438
-		if (fd == -1) {
1439
-			printf("Open failed\n");
1440
-			exit(-1);
1441
-		}
1442
-		retval = cli_unrar(fd, ".");
1443
-		if (!retval) {
1444
-			printf(" FAILED\n");
1445
-		} else {
1446
-			printf(" OK\n");
1447
-		}
1448
-		close(fd);
1449
-	}
1450
-	return retval;
1423
+	return metadata;
1451 1424
 }
... ...
@@ -13,10 +13,24 @@ struct unpack_data_tag;
13 13
 #include "unrarvm.h"
14 14
 #include "unrarcmd.h"
15 15
 #include "unrarfilter.h"
16
+#include "clamav.h"
16 17
 
17 18
 #define FALSE (0)
18 19
 #define TRUE (1)
20
+#ifndef MIN
19 21
 #define MIN(a,b) ((a < b) ? a : b)
22
+#endif
23
+
24
+typedef struct rar_metadata_tag
25
+{
26
+	uint32_t pack_size;
27
+	uint32_t unpack_size;
28
+	uint32_t crc;
29
+	int encrypted;
30
+	uint8_t method;
31
+	unsigned char *filename;
32
+	struct rar_metadata_tag *next;
33
+} rar_metadata_t;
20 34
 
21 35
 #define SIZEOF_MARKHEAD 7
22 36
 #define SIZEOF_NEWMHD 13
... ...
@@ -251,6 +265,7 @@ enum BLOCK_TYPES
251 251
 	BLOCK_PPM
252 252
 };
253 253
 
254
+rar_metadata_t *cli_unrar(int fd, const char *dirname, const struct cl_limits *limits);
254 255
 unsigned int rar_get_char(int fd, unpack_data_t *unpack_data);
255 256
 void addbits(unpack_data_t *unpack_data, int bits);
256 257
 unsigned int getbits(unpack_data_t *unpack_data);
... ...
@@ -6,7 +6,9 @@
6 6
 
7 7
 #define FALSE (0)
8 8
 #define TRUE (1)
9
+#ifndef MIN
9 10
 #define MIN(a,b) ((a < b) ? a : b)
11
+#endif
10 12
 
11 13
 #define RARVM_MEMSIZE	0x40000
12 14
 #define RARVM_MEMMASK	(RARVM_MEMSIZE-1)