Ticket #11120: 0001-Add-support-for-creation-times.patch

src/add-ons/kernel/file_systems/fat/dir.c

@@ -49 +49 @@
     uint32 cluster;
     uint32 size;
     uint32 time;
+    uint32 ctime;
 };
 
 
@@ -195 +196 @@
             oinfo->cluster += 0x10000*read16(buffer,0x14);
         oinfo->size = read32(buffer,0x1c);
         oinfo->time = read32(buffer,0x16);
+        oinfo->ctime = read32(buffer,0x0e);
     }
 
     diri_next_entry(iter);
@@ -578 +580 @@
     uint32 cluster;
     uint32 size;
     time_t time;
+    time_t ctime;
 };
 
 
@@ -728 +731 @@
     memcpy(buffer, nshort, 11);
     buffer[0x0b] = info->mode;
     memset(buffer+0xc, 0, 0x16-0xc);
+    i = time_t2dos(info->ctime);
+    buffer[0x0e] = i & 0xff;
+    buffer[0x0f] = (i >> 8) & 0xff;
+    buffer[0x10] = (i >> 16) & 0xff;
+    buffer[0x11] = (i >> 24) & 0xff;
     i = time_t2dos(info->time);
     buffer[0x16] = i & 0xff;
     buffer[0x17] = (i >> 8) & 0xff;
@@ -905 +913 @@
     info.cluster = node->cluster;
     info.size = node->st_size;
     info.time = node->st_time;
+    info.ctime = node->st_ctim;
 
     return _create_dir_entry_(vol, dir, &info, (char *)nshort,
         (char *)nlong, len, ns, ne);
@@ -1020 +1029 @@
     } else
         entry->end_cluster = 0;
     entry->st_time = dos2time_t(info.time);
+    entry->st_ctim = dos2time_t(info.ctime);
 #if TRACK_FILENAME
     entry->filename = malloc(sizeof(filename) + 1);
     if (entry->filename) strcpy(entry->filename, filename);

src/add-ons/kernel/file_systems/fat/dosfs.c

@@ -111 +111 @@
         kprintf("\nvnid %Lx, dir vnid %Lx\n", n->vnid, n->dir_vnid);
         kprintf("iteration %lx, si=%lx, ei=%lx, cluster=%lx\n",
             n->iteration, n->sindex, n->eindex, n->cluster);
-        kprintf("mode %lx, size %Lx, time %lx\n",
-            n->mode, n->st_size, n->st_time);
+        kprintf("mode %lx, size %Lx, time %lx, ctim %lx\n",
+            n->mode, n->st_size, n->st_time, n->st_ctim);
         kprintf("end cluster = %lx\n", n->end_cluster);
         if (n->mime) kprintf("mime type %s\n", n->mime);
     }
@@ -651 +651 @@
     vol->root_vnode.sindex = vol->root_vnode.eindex = 0xffffffff;
     vol->root_vnode.mode = FAT_SUBDIR;
     time(&(vol->root_vnode.st_time));
+    vol->root_vnode.st_ctim = vol->root_vnode.st_time;
     vol->root_vnode.mime = NULL;
     vol->root_vnode.dirty = false;
     dlist_add(vol, vol->root_vnode.vnid);
@@ -1151 +1152 @@
 
     switch (code) {
         case 10002 : /* return real creation time */
-                if (buf) *(bigtime_t *)buf = node->st_time;
+                if (buf) *(bigtime_t *)buf = node->st_ctim;
                 break;
         case 10003 : /* return real last modification time */
                 if (buf) *(bigtime_t *)buf = node->st_time;

src/add-ons/kernel/file_systems/fat/dosfs.h

@@ -86 +86 @@
     uint32      mode;           // dos-style attributes
     off_t       st_size;        // in bytes
     time_t      st_time;
+    time_t      st_ctim;
 
     uint32      end_cluster;    // last cluster of the data
 

src/add-ons/kernel/file_systems/fat/file.c

@@ -94 +94 @@
     buffer[0x0b] = node->mode; // file attributes
 
     memset(buffer+0xc, 0, 0x16-0xc);
+    i = time_t2dos(node->st_ctim);
+    buffer[0x0e] = i & 0xff;
+    buffer[0x0f] = (i >> 8) & 0xff;
+    buffer[0x10] = (i >> 16) & 0xff;
+    buffer[0x11] = (i >> 24) & 0xff;
     i = time_t2dos(node->st_time);
     buffer[0x16] = i & 0xff;
     buffer[0x17] = (i >> 8) & 0xff;
@@ -181 +186 @@
     st->st_blocks = (node->st_size + 511) / 512;
     st->st_blksize = 0x10000; /* this value was chosen arbitrarily */
     st->st_atim.tv_sec = st->st_mtim.tv_sec = st->st_ctim.tv_sec
-        = st->st_crtim.tv_sec = node->st_time;
+        = node->st_time;
     st->st_atim.tv_nsec = st->st_mtim.tv_nsec = st->st_ctim.tv_nsec
         = st->st_crtim.tv_nsec = 0;
+    st->st_crtim.tv_sec = node->st_ctim;
 
     UNLOCK_VOL(vol);
 
@@ -254 +260 @@
         dirty = true;
     }
 
+    if (mask & B_STAT_CREATION_TIME) {
+        DPRINTF(0, ("setting creation time\n"));
+        // As a file's modification time is also set when it is created,
+        // the archive bit should be set automatically.
+        node->st_ctim = st->st_crtime;
+        dirty = true;
+    }
+
     if (dirty) {
         write_vnode_entry(vol, node);
 
@@ -806 +820 @@
         dummy.mode = 0;
         dummy.st_size = 0;
         time(&(dummy.st_time));
+        dummy.st_ctim = dummy.st_time;
 
         if ((result = create_dir_entry(vol, dir, &dummy, name, &(dummy.sindex), &(dummy.eindex))) != B_OK) {
             dprintf("dosfs_create: error creating directory entry for %s (%s)\n", name, strerror(result));
@@ -906 +921 @@
     }
     dummy.st_size = vol->bytes_per_sector*vol->sectors_per_cluster;
     time(&(dummy.st_time));
+    dummy.st_ctim = dummy.st_time;
 
     dummy.vnid = GENERATE_DIR_CLUSTER_VNID(dummy.dir_vnid, dummy.cluster);
     // XXX: dangerous construct
@@ -938 +954 @@
     buffer[0] = buffer[0x20] = buffer[0x21] = '.';
     buffer[0x0b] = buffer[0x2b] = FAT_SUBDIR;
     i = time_t2dos(dummy.st_time);
+    buffer[0x0e] = i & 0xff;
+    buffer[0x0f] = (i >> 8) & 0xff;
+    buffer[0x10] = (i >> 16) & 0xff;
+    buffer[0x11] = (i >> 24) & 0xff;
     buffer[0x16] = i & 0xff;
     buffer[0x17] = (i >> 8) & 0xff;
     buffer[0x18] = (i >> 16) & 0xff;
     buffer[0x19] = (i >> 24) & 0xff;
+    i = time_t2dos(dir->st_ctim);
+    buffer[0x2e] = i & 0xff;
+    buffer[0x2f] = (i >> 8) & 0xff;
+    buffer[0x30] = (i >> 16) & 0xff;
+    buffer[0x31] = (i >> 24) & 0xff;
     i = time_t2dos(dir->st_time);
     buffer[0x36] = i & 0xff;
     buffer[0x37] = (i >> 8) & 0xff;