X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fdentry.c;h=27937ab42a55a933e6833e34d5325bec7fdbd757;hp=c31655446521b4bd2b5e3eb0bbfcf65c73049001;hb=01efbb02603508a2272f859c87ec259560aa823d;hpb=7c08b0b067f48e80226e6b5466fd95feb43139e6

diff --git a/src/dentry.c b/src/dentry.c
index c3165544..27937ab4 100644
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -30,15 +30,17 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
+#include <errno.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <unistd.h>
+
 #include "wimlib_internal.h"
 #include "dentry.h"
 #include "io.h"
 #include "timestamp.h"
 #include "lookup_table.h"
 #include "sha1.h"
-#include <errno.h>
-#include <unistd.h>
-#include <sys/stat.h>
 
 /*
  * Returns true if @dentry has the UTF-8 file name @name that has length
@@ -78,6 +80,10 @@ void stbuf_to_dentry(const struct stat *stbuf, struct dentry *dentry)
 	else
 		dentry->hard_link = (u64)stbuf->st_ino |
 				   ((u64)stbuf->st_dev << (sizeof(ino_t) * 8));
+	/* Set timestamps */
+	dentry->creation_time = timespec_to_wim_timestamp(&stbuf->st_mtim);
+	dentry->last_write_time = timespec_to_wim_timestamp(&stbuf->st_mtim);
+	dentry->last_access_time = timespec_to_wim_timestamp(&stbuf->st_atim);
 }
 
 
@@ -413,6 +419,7 @@ struct file_attr_flag file_attr_flags[] = {
 int print_dentry(struct dentry *dentry, void *lookup_table)
 {
 	const u8 *hash;
+	struct lookup_table_entry *lte;
 
 	printf("[DENTRY]\n");
 	printf("Length            = %"PRIu64"\n", dentry->length);
@@ -423,17 +430,23 @@ int print_dentry(struct dentry *dentry, void *lookup_table)
 				file_attr_flags[i].name);
 	printf("Security ID       = %d\n", dentry->security_id);
 	printf("Subdir offset     = %"PRIu64"\n", dentry->subdir_offset);
-	/*printf("Unused1           = 0x%"PRIu64"\n", dentry->unused1);*/
-	/*printf("Unused2           = %"PRIu64"\n", dentry->unused2);*/
-	printf("Creation Time     = 0x%"PRIx64"\n", dentry->creation_time);
-	printf("Last Access Time  = 0x%"PRIx64"\n", dentry->last_access_time);
-	printf("Last Write Time   = 0x%"PRIx64"\n", dentry->last_write_time);
-	hash = dentry_stream_hash(dentry, 0);
-	if (hash) {
-		printf("Hash              = 0x"); 
-		print_hash(hash);
-		putchar('\n');
-	}
+#if 0
+	printf("Unused1           = 0x%"PRIu64"\n", dentry->unused1);
+	printf("Unused2           = %"PRIu64"\n", dentry->unused2);
+#endif
+#if 0
+	printf("Creation Time     = 0x%"PRIx64"\n");
+	printf("Last Access Time  = 0x%"PRIx64"\n");
+	printf("Last Write Time   = 0x%"PRIx64"\n");
+#endif
+
+	time_t creat_time = wim_timestamp_to_unix(dentry->creation_time);
+	time_t access_time = wim_timestamp_to_unix(dentry->last_access_time);
+	time_t mod_time = wim_timestamp_to_unix(dentry->last_write_time);
+	printf("Creation Time     = %s", asctime(localtime(&creat_time)));
+	printf("Last Access Time  = %s", asctime(localtime(&access_time)));
+	printf("Last Write Time   = %s", asctime(localtime(&mod_time)));
+
 	printf("Reparse Tag       = 0x%"PRIx32"\n", dentry->reparse_tag);
 	printf("Hard Link Group   = 0x%"PRIx64"\n", dentry->hard_link);
 	printf("Number of Alternate Data Streams = %hu\n", dentry->num_ads);
@@ -448,7 +461,17 @@ int print_dentry(struct dentry *dentry, void *lookup_table)
 	puts("\"");
 	printf("Short Name Length = %hu\n", dentry->short_name_len);
 	printf("Full Path (UTF-8) = \"%s\"\n", dentry->full_path_utf8);
-	print_lookup_table_entry(dentry_stream_lte(dentry, 0, lookup_table));
+	lte = dentry_stream_lte(dentry, 0, lookup_table);
+	if (lte) {
+		print_lookup_table_entry(lte);
+	} else {
+		hash = dentry_stream_hash(dentry, 0);
+		if (hash) {
+			printf("Hash              = 0x"); 
+			print_hash(hash);
+			putchar('\n');
+		}
+	}
 	for (u16 i = 0; i < dentry->num_ads; i++) {
 		printf("[Alternate Stream Entry %u]\n", i);
 		printf("Name = \"%s\"\n", dentry->ads_entries[i].stream_name_utf8);
@@ -1022,19 +1045,15 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
 	 * aligned on the next 8-byte boundary.  Here's an example of the
 	 * aligned data:
 	 *
-	 * 01000000400000006c786bbac58ede11b0bb00261870892ab6adb76fe63a3
-	 * e468fca86530d2effa16c786bbac58ede11b0bb00261870892a0000000000
-	 * 0000000000000000000000
+	 * 01000000 40000000 6c786bba c58ede11 b0bb0026 1870892a b6adb76f
+	 * e63a3e46 8fca8653 0d2effa1 6c786bba c58ede11 b0bb0026 1870892a
+	 * 00000000 00000000 00000000 00000000
 	 *
 	 * Here's one interpretation of how the data is laid out.
 	 *
 	 * struct unknown {
 	 * 	u32 field1; (always 0x00000001)
 	 * 	u32 field2; (always 0x40000000)
-	 * 	u16 field3;
-	 * 	u32 field4;
-	 * 	u32 field5;
-	 * 	u32 field6;
 	 * 	u8  data[48]; (???)
 	 * 	u64 reserved1; (always 0)
 	 * 	u64 reserved2; (always 0)