@@ -1,3 +1,10 @@

+Sun Jun 13 14:26:33 CEST 2004 (tk)

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

+  * clamscan: --unace is no longer supported (when invoked on a splitted

+	      archive with missing components it was waiting for the user

+	      to specify where the extra files are, with "-y" even). Problem

+	      found by Lloyd Kamara <l.kamara*imperial.ac.uk>)

+

 Sun Jun 13 04:03:01 CEST 2004 (tk)

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

   * freshclam, clamd: log version and platform information (requested by

@@ -227,7 +227,6 @@ void help(void)

     mprintf("    --max-recursion=#n                   Maximal recursion level\n");

     mprintf("    --unzip[=FULLPATH]                   Enable support for .zip files\n");

     mprintf("    --unrar[=FULLPATH]                   Enable support for .rar files\n");

-    mprintf("    --unace[=FULLPATH]                   Enable support for .ace files\n");

     mprintf("    --arj[=FULLPATH]                     Enable support for .arj files\n");

     mprintf("    --unzoo[=FULLPATH]                   Enable support for .zoo files\n");

     mprintf("    --lha[=FULLPATH]                     Enable support for .lha files\n");

@@ -82,10 +82,9 @@ int scanmanager(const struct optstruct *opt)

     }

 #endif

-    if(optl(opt, "unzip") || optl(opt, "unrar") || optl(opt, "unace") ||

-       optl(opt, "arj") || optl(opt, "unzoo") || optl(opt, "jar") ||

-       optl(opt, "lha") || optl(opt, "tar") || optl(opt, "tgz") ||

-       optl(opt, "deb"))

+    if(optl(opt, "unzip") || optl(opt, "unrar") || optl(opt, "arj") ||

+       optl(opt, "unzoo") || optl(opt, "jar") || optl(opt, "lha") ||

+       optl(opt, "tar") || optl(opt, "tgz") || optl(opt, "deb"))

 	    compression = 1;

     /* now initialize the database */

@@ -464,7 +463,6 @@ int scanfile(const char *filename, struct cl_node *root, const struct passwd *us

     if((cli_strbcasestr(filename, ".zip") && optl(opt, "unzip"))

     || (cli_strbcasestr(filename, ".rar") && optl(opt, "unrar"))

-    || (cli_strbcasestr(filename, ".ace") && optl(opt, "unace"))

     || (cli_strbcasestr(filename, ".arj") && optl(opt, "arj"))

     || (cli_strbcasestr(filename, ".zoo") && optl(opt, "unzoo"))

     || (cli_strbcasestr(filename, ".jar") && optl(opt, "jar"))

@@ -584,13 +582,6 @@ int scancompressed(const char *filename, struct cl_node *root, const struct pass

 	else

 	    ret = clamav_unpack("unrar", args, gendir, user, opt);

-    } else if(cli_strbcasestr(filename, ".ace")) { 

-	char *args[] = { "unace", "x", "-y", (char *) filename, NULL };

-	if((userprg = getargl(opt, "unace")))

-	    ret = clamav_unpack(userprg, args, gendir, user, opt);

-	else

-	    ret = clamav_unpack("unace", args, gendir, user, opt);

-

     } else if(cli_strbcasestr(filename, ".arj")) { 

         char *args[] = { "arj", "x","-y", (char *) filename, NULL };

         if((userprg = getargl(opt, "arj")))

@@ -86,7 +86,7 @@ int main(int argc, char **argv)

 	    {"stdout", 0, 0, 0},

 	    {"unzip", 2, 0, 0},

 	    {"unrar", 2, 0, 0},

-	    {"unace", 2, 0, 0},

+	    {"unace", 2, 0, 0}, /* not used */

 	    {"unarj", 2, 0, 0}, /* not used */

 	    {"arj", 2, 0, 0},

 	    {"zoo", 2, 0, 0}, /* not used */