Updated command-line switches.

Deprecated archive extraction options were removed and some switches
were renamed according to changes in ClamAV 0.101.0.

ClamAV seems to handle archive extraction fully on its own and thus
those options are not provided by clamscan anymore.

This relates to issue #15.

Signed-off-by: Mavridis Philippe <[email protected]>

6 files changed, 8 insertions, 399 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2edf96b..61810e0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -39,7 +39,7 @@ tde_add_executable( ${PROJECT_NAME} AUTOMOC
      ktview.cpp ktlistcron.cpp kticon.cpp
      activityviewer.cpp collectiondb.cpp
      configdialog.cpp klamavconfig.kcfgc
-     archivelimits.ui archivetypes.ui specialfiletypes.ui
+     archivelimits.ui specialfiletypes.ui
      firstrunwizard.ui logoptions.ui backend.ui
      k3bjobprogressosd_mod.cpp
 
diff --git a/src/archivetypes.ui b/src/archivetypes.ui
deleted file mode 100644
index 5e46914..0000000
--- a/src/archivetypes.ui
+++ /dev/null
@@ -1,221 +0,0 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>ArchiveTypes</class>
-<widget class="TQWidget">
-    <property name="name">
-        <cstring>ArchiveTypes</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>761</width>
-            <height>522</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>Archive Limits</string>
-    </property>
-    <hbox>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="TQGroupBox">
-            <property name="name">
-                <cstring>Archive_Types</cstring>
-            </property>
-            <property name="title">
-                <string>Archive Types</string>
-            </property>
-            <vbox>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="TQLayoutWidget">
-                    <property name="name">
-                        <cstring>layout8</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <widget class="TQCheckBox" row="6" column="0">
-                            <property name="name">
-                                <cstring>kcfg_ScanDeb</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Scan DEB packages using:</string>
-                            </property>
-                            <property name="accel">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="TQCheckBox" row="5" column="0">
-                            <property name="name">
-                                <cstring>kcfg_ScanJar</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Scan JAR packages using:</string>
-                            </property>
-                            <property name="accel">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="TQCheckBox" row="7" column="0">
-                            <property name="name">
-                                <cstring>kcfg_ScanTar</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Scan TAR files using:</string>
-                            </property>
-                            <property name="accel">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="TQCheckBox" row="4" column="0">
-                            <property name="name">
-                                <cstring>kcfg_ScanLzh</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Scan LZH archives using:</string>
-                            </property>
-                            <property name="accel">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="KURLComboRequester" row="7" column="1">
-                            <property name="name">
-                                <cstring>kcfg_TarUsing</cstring>
-                            </property>
-                        </widget>
-                        <widget class="TQCheckBox" row="3" column="0">
-                            <property name="name">
-                                <cstring>kcfg_ScanZoo</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Scan ZOO archives using:</string>
-                            </property>
-                            <property name="accel">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="KURLComboRequester" row="3" column="1">
-                            <property name="name">
-                                <cstring>kcfg_ZooUsing</cstring>
-                            </property>
-                        </widget>
-                        <widget class="KURLComboRequester" row="4" column="1">
-                            <property name="name">
-                                <cstring>kcfg_LzhUsing</cstring>
-                            </property>
-                        </widget>
-                        <widget class="KURLComboRequester" row="0" column="1">
-                            <property name="name">
-                                <cstring>kcfg_ZipUsing</cstring>
-                            </property>
-                        </widget>
-                        <widget class="TQCheckBox" row="1" column="0">
-                            <property name="name">
-                                <cstring>kcfg_ScanRar</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Scan RAR archives using:</string>
-                            </property>
-                            <property name="accel">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="TQCheckBox" row="0" column="0">
-                            <property name="name">
-                                <cstring>kcfg_ScanZip</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Scan &amp;ZIP archives using:</string>
-                            </property>
-                            <property name="accel">
-                                <string>Alt+Z</string>
-                            </property>
-                        </widget>
-                        <widget class="KURLComboRequester" row="5" column="1">
-                            <property name="name">
-                                <cstring>kcfg_JarUsing</cstring>
-                            </property>
-                        </widget>
-                        <widget class="KURLComboRequester" row="1" column="1">
-                            <property name="name">
-                                <cstring>kcfg_RarUsing</cstring>
-                            </property>
-                        </widget>
-                        <widget class="KURLComboRequester" row="6" column="1">
-                            <property name="name">
-                                <cstring>kcfg_DebUsing</cstring>
-                            </property>
-                        </widget>
-                        <widget class="KURLComboRequester" row="8" column="1">
-                            <property name="name">
-                                <cstring>kcfg_TgzUsing</cstring>
-                            </property>
-                        </widget>
-                        <widget class="TQCheckBox" row="8" column="0">
-                            <property name="name">
-                                <cstring>kcfg_ScanTgz</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Scan TGZ archives using:</string>
-                            </property>
-                            <property name="accel">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="KURLComboRequester" row="2" column="1">
-                            <property name="name">
-                                <cstring>kcfg_ArjUsing</cstring>
-                            </property>
-                        </widget>
-                        <widget class="TQCheckBox" row="2" column="0">
-                            <property name="name">
-                                <cstring>kcfg_ScanArj</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Scan ARJ archives using:</string>
-                            </property>
-                            <property name="accel">
-                                <string></string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </vbox>
-        </widget>
-    </hbox>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
-</UI>
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index 94466db..b363550 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -16,7 +16,6 @@ email                : [email protected]
 #include "configdialog.h"
 #include "backend.h"
 #include "archivelimits.h"
-#include "archivetypes.h"
 #include "specialfiletypes.h"
 /* #include "autoscanoptions.h" */
 #include "logoptions.h"
@@ -56,7 +55,6 @@ KlamavConfigDialog::KlamavConfigDialog( TQWidget *parent, const char* name, TDEC
     // IMPORTANT Don't simply change the page names, they are used as identifiers in other parts of the app.
             m_klambackend = new KlamBackend( 0, "Scanning Backend" );
             m_archivelimits = new ArchiveLimits( 0, "Archive Limits" );
-            m_archivetypes = new ArchiveTypes( 0, "Archive Types" );
 	    m_emailprotection = new Sigtool ( 0, "E-mail protection" );
             m_specialfiletypes = new SpecialFileTypes( 0, "File Types" );
 	    /* m_autoscanoptions = new AutoScanOptions( 0, "Auto-Scan" ); */
@@ -68,7 +66,6 @@ KlamavConfigDialog::KlamavConfigDialog( TQWidget *parent, const char* name, TDEC
     slotToggleClamdscan( m_klambackend->kcfg_ScannerClamdscan->isOn() ); // initial state
 
     addPage( m_archivelimits, i18n( "Archive Limits" ), "ark", i18n( "Configure Archive Limits" ) );
-    addPage( m_archivetypes,   i18n( "Archive Types" ), "application-x-tarz", i18n( "Configure Archive Types" ) );
     addPage( m_emailprotection, i18n( "E-mail protection" ), "email", i18n( "Set up your e-mail client to use Klammail" ) );
     addPage( m_specialfiletypes, i18n( "File Types" ), "folder", i18n( "Configure File Types" ) );
     /* addPage( m_autoscanoptions, i18n( "Auto-Scan" ), "filefind", i18n( "Configure Auto-Scan" ) ); */
@@ -96,7 +93,6 @@ void KlamavConfigDialog::slotToggleClamdscan(bool on)
 {
         m_klambackend->kcfg_ClamdMultiscan->setEnabled(on);
         m_archivelimits->setEnabled(!on);
-        m_archivetypes->setEnabled(!on);
         m_specialfiletypes->setEnabled(!on);
 }
 
diff --git a/src/configdialog.h b/src/configdialog.h
index 8bb26af..951c571 100644
--- a/src/configdialog.h
+++ b/src/configdialog.h
@@ -48,7 +48,6 @@ class KlamavConfigDialog : public TDEConfigDialog
 
 	class KlamBackend *m_klambackend;
         class ArchiveLimits  *m_archivelimits;
-        class ArchiveTypes  *m_archivetypes;
         class SpecialFileTypes     *m_specialfiletypes;
 	class Sigtool	*m_emailprotection;
 	class AutoScanOptions     *m_autoscanoptions;
diff --git a/src/klamavconfig.kcfg b/src/klamavconfig.kcfg
index 017730f..6b05806 100644
--- a/src/klamavconfig.kcfg
+++ b/src/klamavconfig.kcfg
@@ -44,99 +44,6 @@
     </entry>
 </group>
 
-<group name="ArchiveTypes"> 
-    <entry name="ScanDeb" type="Bool">
-        <label>Scan DEB files</label>
-        <whatsthis>Scan DEB files using the named program.</whatsthis>
-        <default>false</default>
-    </entry>
-    <entry name="DebUsing" type="String">
-        <label>Program to scan DEB files.</label>
-        <whatsthis>Scan DEB files using the named program.</whatsthis>
-    </entry>
-
-    <entry name="ScanTar" type="Bool">
-        <label>Scan TAR files</label>
-        <whatsthis>Scan TAR files using the named program.</whatsthis>
-	<default>false</default>
-    </entry>
-    <entry name="TarUsing" type="String">
-        <label>Program to scan TAR files.</label>
-        <whatsthis>Scan TAR files using the named program.</whatsthis>
-    </entry>
-
-    <entry name="ScanJar" type="Bool">
-        <label>Scan JAR files</label>
-        <whatsthis>Scan JAR files using the named program.</whatsthis>
-	<default>false</default>
-    </entry>
-    <entry name="JarUsing" type="String">
-        <label>Program to scan JAR files.</label>
-        <whatsthis>Scan JAR files using the named program.</whatsthis>
-    </entry>
-
-    <entry name="ScanLzh" type="Bool">
-        <label>Scan LZH files</label>
-        <whatsthis>Scan LZH files using the named program.</whatsthis>
-	<default>false</default>
-    </entry>
-    <entry name="LzhUsing" type="String">
-        <label>Program to scan LZH files.</label>
-        <whatsthis>Scan LZH files using the named program.</whatsthis>
-    </entry>
-
-    <entry name="ScanZoo" type="Bool">
-        <label>Scan Zoo files</label>
-        <whatsthis>Scan Zoo files using the named program.</whatsthis>
-	<default>false</default>
-    </entry>
-    <entry name="ZooUsing" type="String">
-        <label>Program to scan Zoo files.</label>
-        <whatsthis>Scan Zoo files using the named program.</whatsthis>
-    </entry>
-
-    <entry name="ScanRar" type="Bool">
-        <label>Scan RAR files</label>
-        <whatsthis>Scan RAR files using the named program.</whatsthis>
-	<default>false</default>
-    </entry>
-    <entry name="RarUsing" type="String">
-        <label>Program to scan RAR files.</label>
-        <whatsthis>Scan RAR files using the named program.</whatsthis>
-    </entry>
-
-    <entry name="ScanZip" type="Bool">
-        <label>Scan Zip files</label>
-        <whatsthis>Scan Zip files using the named program.</whatsthis>
-	<default>false</default>
-    </entry>
-    <entry name="ZipUsing" type="String">
-        <label>Program to scan Zip files.</label>
-        <whatsthis>Scan Zip files using the named program.</whatsthis>
-    </entry>
-
-    <entry name="ScanTgz" type="Bool">
-        <label>Scan TGZ files</label>
-        <whatsthis>Scan TGZ files using the named program.</whatsthis>
-	<default>false</default>
-    </entry>
-    <entry name="TgzUsing" type="String">
-        <label>Program to scan TGZ files.</label>
-        <whatsthis>Scan TGZ files using the named program.</whatsthis>
-    </entry>
-
-    <entry name="ScanArj" type="Bool">
-        <label>Scan ARJ files</label>
-        <whatsthis>Scan ARJ files using the named program.</whatsthis>
-	<default>false</default>
-    </entry>
-    <entry name="ArjUsing" type="String">
-        <label>Program to scan ARJ files.</label>
-        <whatsthis>Scan ARJ files using the named program.</whatsthis>
-    </entry>
-
-</group>
-
 <group name="FileTypes"> 
     <entry name="VirusEncrypted" type="Bool">
         <label>Mark Encrypted Files as Suspicious</label>
diff --git a/src/scanviewer.cpp b/src/scanviewer.cpp
index 0e5e702..c6efd93 100644
--- a/src/scanviewer.cpp
+++ b/src/scanviewer.cpp
@@ -384,7 +384,7 @@ void ScanViewer::slotScan(const TQStringList & filepattern, int mode, bool recur
         for (TQStringList::Iterator ita = lastQuarLocations.begin(); ita == lastQuarLocations.begin() ; ita++){
                 quarloc = *ita;
         }
-        excludes += TQString(" --exclude=%1 ").arg(quarloc);
+        excludes += TQString(" --exclude-dir=%1 ").arg(quarloc);
     }
 
 
@@ -419,96 +419,24 @@ void ScanViewer::slotScan(const TQStringList & filepattern, int mode, bool recur
 //         options += "--block-max ";
 
     if (KlamavConfig::virusEncrypted())
-        options += "--block-encrypted ";
+        options += "--alert-encrypted ";
 
     if (!(KlamavConfig::scanMail()))
-        options += "--no-mail ";
+        options += "--scan-mail=no ";
 
     if (!(KlamavConfig::scanHTML()))
-        options += "--no-html ";
+        options += "--scan-html=no ";
 
     if (!(KlamavConfig::scanPE()))
-        options += "--no-pe ";
+        options += "--scan-pe=no ";
 
     if (!(KlamavConfig::scanMacros()))
-        options += "--no-ole2 ";
+        options += "--scan-ole2=no ";
 
     if (KlamavConfig::virusBroken())
-        options += "--detect-broken ";
+        options += "--alert-broken ";
 
 
-    if (KlamavConfig::scanZip()){
-        options += "--unzip";
-        if ((KlamavConfig::zipUsing()) != "")
-            options += "="+(KlamavConfig::zipUsing())+" ";
-        else
-            options+=" ";
-    }
-
-    if (KlamavConfig::scanRar()){
-        options += "--unrar";
-        if ((KlamavConfig::rarUsing()) != "")
-            options += "="+(KlamavConfig::rarUsing())+" ";
-        else
-            options+=" ";
-    }
-
-    if (KlamavConfig::scanArj()){
-        options += "--arj";
-        if ((KlamavConfig::arjUsing()) != "")
-            options += "="+(KlamavConfig::arjUsing())+" ";
-        else
-            options+=" ";
-    }
-
-    if (KlamavConfig::scanZoo()){
-        options += "--unzoo";
-        if ((KlamavConfig::zooUsing()) != "")
-            options += "="+(KlamavConfig::zooUsing())+" ";
-        else
-            options+=" ";
-    }
-
-    if (KlamavConfig::scanLzh()){
-        options += "--lha";
-        if ((KlamavConfig::lzhUsing()) != "")
-            options += "="+(KlamavConfig::lzhUsing())+" ";
-        else
-            options+=" ";
-    }
-
-    if (KlamavConfig::scanJar()){
-        options += "--jar";
-        if ((KlamavConfig::jarUsing()) != "")
-            options += "="+(KlamavConfig::jarUsing())+" ";
-        else
-            options+=" ";
-    }
-
-    if (KlamavConfig::scanDeb()){
-        options += "--deb";
-        if ((KlamavConfig::debUsing()) != "")
-            options += "="+(KlamavConfig::debUsing())+" ";
-        else
-            options+=" ";
-    }
-
-    if (KlamavConfig::scanTar()){
-        options += "--tar";
-        if ((KlamavConfig::tarUsing()) != "")
-            options += "="+(KlamavConfig::tarUsing())+" ";
-        else
-            options+=" ";
-    }
-
-    if (KlamavConfig::scanTgz()){
-        options += "--tgz";
-        if ((KlamavConfig::tgzUsing()) != "")
-            options += "="+(KlamavConfig::tgzUsing())+" ";
-        else
-            options+=" ";
-    }
-
     if(clamdscan) {
         // make sure that clamd is running
         FILE* clamdpid;