[PATCH] Dates in KoZip

[Nicolas Goutte]

The attached patch is for the file koffice/lib/store/kozip.cpp

The patch adds correct date and time to the file entries.

As I do not have KDE CVS HEAD, somebody will have to port this patch to KZip 
in kdelibs CVS HEAD.

One problem of the patch is that it include <sys/time.h> unconditionally.

Have a nice day/evening/night!
-------------- next part --------------
--- kozip.cpp.orig	Mon Apr 29 22:34:35 2002
+++ kozip.cpp	Mon Jun  3 21:36:42 2002
@@ -19,9 +19,12 @@
    Boston, MA 02111-1307, USA.
 */
 
+#include <sys/time.h>
+
 #include <qfile.h>
 #include <qdir.h>
 #include <time.h>
+#include <qdatetime.h>
 #include <kdebug.h>
 #include <qptrlist.h>
 #include <kmimetype.h>
@@ -31,6 +34,44 @@
 #include "kozip.h"
 #include "kolimitediodevice.h"
 
+static void transformToMsDos(const QDateTime& dt, char* buffer)
+{
+    if ( dt.isValid() )
+    {
+        Q_UINT16 time =
+             ( ( ( ( dt.time().hour() ) ) & 0x1f ) << 11 )      // 5 bit hour
+             + ( ( ( ( dt.time().minute() ) ) & 0x3f ) << 5 )   // 6 bit minute
+             + ( ( ( ( dt.time().second() >> 1 ) ) & 0x1f ) );  // 5 bit double seconds
+
+        buffer[0]=char( time & 0xff );          // Least significant byte of time
+        buffer[1]=char( ( time >> 8 ) & 0xff ); // Most significant byte of time
+
+        Q_UINT16 date =
+             ( ( ( ( dt.date().year() - 1980 ) ) & 0x7f ) << 9 )    // 7 bit year 1980-based
+             + ( ( ( ( dt.date().month() ) ) & 0xf ) << 5 )         // 4 bit month
+             + ( ( ( ( dt.date().day() ) ) & 0x1f ) );              // 5 bit day
+
+        buffer[2]=char( date & 0xff );          // Least significant byte of date
+        buffer[3]=char( ( date >> 8 ) & 0xff ); // Most significant byte of date
+
+    }
+    else
+    {
+        // We have no valid date, so assume 1980-01-01 midnight
+        buffer[0]=0;
+        buffer[1]=0;
+        buffer[2]=33;
+        buffer[3]=0;
+    }
+}
+
+static int getActualTime( void )
+{
+    timeval value;
+    gettimeofday( &value, NULL );
+    return value.tv_sec;
+}
+
 ////////////////////////////////////////////////////////////////////////
 /////////////////////////// KoZip ///////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
@@ -194,7 +235,8 @@
 
             bool isdir = false;
             int access = 0777; // TODO available in zip file?
-            int time = 1234; // TODO fill time field
+            int time = getActualTime();
+
 	    QString entryName;
 
             if ( name.right(1) == "/" ) // Entries with a trailing slash are directories
@@ -341,10 +383,14 @@
             buffer[ 10 ] = 0; // compression method, stored
         buffer[ 11 ] = 0;
 
+#if 1
+        transformToMsDos( it.current()->datetime(), &buffer[ 12 ] );
+#else
         buffer[ 12 ] = 0; //dummy last mod file time
 	buffer[ 13 ] = 0;
         buffer[ 14 ] = 0; //dummy last mod file date
 	buffer[ 15 ] = 0;
+#endif
 
         uLong mycrc = it.current()->crc32();
 	buffer[ 16 ] = (uchar)(mycrc % 256); //crc checksum
@@ -504,8 +550,10 @@
         parentDir = findOrCreate( dir );
     }
 
+    int time = getActualTime();
+
     // construct a KoZipFileEntry and add it to list
-    KoZipFileEntry * e = new KoZipFileEntry( this, fileName, 0777, time( 0 ), user, group, QString::null,
+    KoZipFileEntry * e = new KoZipFileEntry( this, fileName, 0777, time, user, group, QString::null,
                                            name, device()->at() + 30 + name.length(), // start
                                            0 /*size unknown yet*/, d->m_compression, 0 /*csize unknown yet*/ );
     e->setHeaderStart( device()->at() );
@@ -535,10 +583,14 @@
     buffer[ 8 ] = (uchar)(e->encoding() % 256); // compression method
     buffer[ 9 ] = (uchar)(e->encoding() / 256);
 
+#if 1
+    transformToMsDos( e->datetime(), &buffer[ 10 ] );
+#else
     buffer[ 10 ] = 0; //dummy last mod file time
     buffer[ 11 ] = 0;
     buffer[ 12 ] = 0; //dummy last mod file date
     buffer[ 13 ] = 0;
+#endif
 
     buffer[ 14 ] = 'C'; //dummy crc
     buffer[ 15 ] = 'R';