ark: Drop support for unzip v5

Signed-off-by: mio <stigma@disroot.org>

1 files changed, 6 insertions, 51 deletions

diff --git a/ark/zip.cpp b/ark/zip.cpp
index 88bd97d..598f5fd 100644
--- a/ark/zip.cpp
+++ b/ark/zip.cpp
@@ -51,66 +51,21 @@ ZipArch::ZipArch( ArkWidget *_gui, const TQString & _fileName )
   verifyCompressUtilityIsAvailable( m_archiver_program );
   verifyUncompressUtilityIsAvailable( m_unarchiver_program );
 
-  // Compatibility with unzip v5 and v6.
-  //  - unzip 5 prints dates as MM-DD-YY.
-  //  - unzip 6 prints dates as YYYY-MM-DD.
-  // Presume version 6 as it was released in 2009.
-  bool unzipV5 = false;
-  if (m_bUnarchUtilityIsAvailable)
-  {
-    TDEProcIO proc;
-    proc << m_unarchiver_program;
-    proc << "-v";
-    if (proc.start(TDEProcIO::Block))
-    {
-      proc.wait();
-      if (proc.normalExit() && proc.exitStatus() == 0)
-      {
-        TQString line;
-        proc.readln(line);
-        auto parts = TQStringList::split(' ', line);
-        unzipV5 = (parts.size() >= 2) && (parts[1][0] == '5');
-      }
-    }
-  }
-
   m_headerString = "----";
+  m_fixYear = 7;
+  m_fixMonth = 8;
+  m_fixDay = 9;
   m_fixTime = 10;
   m_dateCol = 5;
   m_numCols = 7;
 
-  if (unzipV5)
-  {
-    kdDebug(1601) << "ZipArch: unzip v5 detected." << endl;
-    m_repairYear = 9;
-    m_fixMonth = 7;
-    m_fixDay = 8;
-  }
-  else
-  {
-    m_fixYear = 7;
-    m_fixMonth = 8;
-    m_fixDay = 9;
-  }
-
   m_archCols.append( new ArchColumns( 1, TQRegExp( "[0-9]+" ) ) );
   m_archCols.append( new ArchColumns( 2, TQRegExp( "[^\\s]+" ) ) );
   m_archCols.append( new ArchColumns( 3, TQRegExp( "[0-9]+" ) ) );
   m_archCols.append( new ArchColumns( 4, TQRegExp( "[0-9.]+%" ) ) );
-
-  if (unzipV5)
-  {
-    m_archCols.append( new ArchColumns( 7, TQRegExp( "[01][0-9]" ), 2 ) );
-    m_archCols.append( new ArchColumns( 8, TQRegExp( "[0-3][0-9]" ), 2 ) );
-    m_archCols.append( new ArchColumns( 9, TQRegExp( "[0-9][0-9]" ), 2 ) );
-  }
-  else
-  {
-    m_archCols.append( new ArchColumns( 7, TQRegExp( "[0-9]{4}" ), 4 ) );
-    m_archCols.append( new ArchColumns( 8, TQRegExp( "[01][0-9]" ), 2 ) );
-    m_archCols.append( new ArchColumns( 9, TQRegExp( "[0-3][0-9]" ), 2 ) );
-  }
-
+  m_archCols.append( new ArchColumns( 7, TQRegExp( "[0-9]{4}" ), 4 ) );
+  m_archCols.append( new ArchColumns( 8, TQRegExp( "[01][0-9]" ), 2 ) );
+  m_archCols.append( new ArchColumns( 9, TQRegExp( "[0-3][0-9]" ), 2 ) );
   m_archCols.append( new ArchColumns( 10, TQRegExp( "[0-9:]+" ), 6 ) );
   m_archCols.append( new ArchColumns( 6, TQRegExp( "[a-fA-F0-9]+ {2}" ) ) );
   m_archCols.append( new ArchColumns( 0, TQRegExp( "[^\\n]+" ), 4096 ) );