@@ -1,3 +1,7 @@

+Tue May  3 02:09:08 CEST 2005 (tk)

+----------------------------------

+  * libclamav: activate PDF code (patch by NJH)

+

 Sat Apr 30 02:50:11 CEST 2005 (tk)

 ----------------------------------

   * libclamav/scanners.c: do not report I/O error with encrypted zips

@@ -136,7 +136,9 @@ libclamav_la_SOURCES = \

 	unrar/unrar20.c \

 	unrar/unrarcmd.c \

 	unrar/unrarfilter.h \

-	unrar/unrarppm.h

+	unrar/unrarppm.h \

+	pdf.c \

+	pdf.h

 lib_LTLIBRARIES = libclamav.la

@@ -87,7 +87,8 @@ am_libclamav_la_OBJECTS = matcher-ac.lo matcher-bm.lo matcher.lo \

 	lzxd.lo mszipd.lo qtmd.lo system.lo upx.lo htmlnorm.lo \

 	chmunpack.lo rebuildpe.lo petite.lo fsg.lo line.lo untar.lo \

 	special.lo binhex.lo is_tar.lo tnef.lo unrar15.lo unrarvm.lo \

-	unrar.lo unrarfilter.lo unrarppm.lo unrar20.lo unrarcmd.lo

+	unrar.lo unrarfilter.lo unrarppm.lo unrar20.lo unrarcmd.lo \

+	pdf.lo

 libclamav_la_OBJECTS = $(am_libclamav_la_OBJECTS)

 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)

 depcomp = $(SHELL) $(top_srcdir)/depcomp

@@ -331,7 +332,9 @@ libclamav_la_SOURCES = \

 	unrar/unrar20.c \

 	unrar/unrarcmd.c \

 	unrar/unrarfilter.h \

-	unrar/unrarppm.h

+	unrar/unrarppm.h \

+	pdf.c \

+	pdf.h

 lib_LTLIBRARIES = libclamav.la

 all: all-am

@@ -425,6 +428,7 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mszipd.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ole2_extract.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/others.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdf.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/petite.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qtmd.Plo@am__quote@

@@ -109,7 +109,7 @@ static const struct cli_magic_s cli_magic[] = {

     /* Others */

     {0,  "\320\317\021\340\241\261\032\341", 8, "OLE2 container", CL_TYPE_MSOLE2},

-    //{0,  "\%PDF-",  5, "PDF document", CL_TYPE_PDF},

+    {0,  "\%PDF-",			 5, "PDF document", CL_TYPE_PDF},

     /* Ignored types */

@@ -15,7 +15,7 @@

  *  along with this program; if not, write to the Free Software

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

  */

-static	char	const	rcsid[] = "$Id: pdf.c,v 1.4 2005/05/01 11:47:49 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: pdf.c,v 1.5 2005/05/03 00:10:46 kojm Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -65,6 +65,8 @@ cli_pdf(const char *dir, int desc)

 	char *buf;

 	const char *p, *q;

+	cli_dbgmsg("in cli_pdf()\n");

+

 	if(fstat(desc, &statb) < 0)

 		return CL_EOPEN;

@@ -16,4 +16,9 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

  */

+#ifndef __PDF_H

+#define __PDF_H

+

 int cli_pdf(const char *dir, int desc);

+

+#endif

@@ -1232,6 +1232,30 @@ static int cli_scanjpeg(int desc, const char **virname)

     return ret;

 }

+static int cli_scanpdf(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)

+{

+	int ret;

+	char *dir = cli_gentemp(NULL);

+

+

+    if(mkdir(dir, 0700)) {

+	cli_dbgmsg("Can't create temporary directory for PDF file %s\n", dir);

+	free(dir);

+	return CL_ETMPDIR;

+    }

+

+    ret = cli_pdf(dir, desc);

+

+    if(ret == CL_CLEAN)

+	ret = cli_scandir(dir, virname, scanned, root, limits, options, arec, mrec);

+

+    if(!cli_leavetemps_flag)

+	cli_rmdirs(dir);

+

+    free(dir);

+    return ret;

+}

+

 static int cli_scantnef(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)

 {

 	int ret;

@@ -1424,6 +1448,11 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const

 	    ret = cli_scanjpeg(desc, virname);

 	    break;

+	case CL_TYPE_PDF:

+	    if(SCAN_ARCHIVE)    /* you may wish to change this line */

+		ret = cli_scanpdf(desc, virname, scanned, root, limits, options, arec, mrec);

+	    break;

+

 	case CL_TYPE_DATA:

 	    /* it could be a false positive and a standard DOS .COM file */

 	    {