commit dcbfaba264df2f9f07e53f77e8178f5bfc7ae88e
author Denys Vlasenko <vda.linux@googlemail.com> Sun Nov 29 19:40:36 2009 +0100
committer Denys Vlasenko <vda.linux@googlemail.com> Sun Nov 29 19:40:36 2009 +0100
tree b5dfaa3715ded4f3c9a676b6cf636ad50bf04c9d
parent bf22475e9552b08feb31d40250ab293d2fd98234

fix improper utimes usage

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

archival/bbunzip.c

diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 22a0fd1..df674bc 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -105,15 +105,15 @@
 			if (status >= 0) {
 				/* TODO: restore other things? */
 				if (info.mtime) {
-					struct timeval times;
+					struct timeval times[2];
 
-					times.tv_sec = info.mtime;
-					times.tv_usec = 0;
+					times[1].tv_sec = times[0].tv_sec = info.mtime;
+					times[1].tv_usec = times[0].tv_usec = 0;
 					/* Note: we closed it first.
 					 * On some systems calling utimes
 					 * then closing resets the mtime
 					 * back to current time. */
-					utimes(new_name, &times); /* ignoring errors */
+					utimes(new_name, times); /* ignoring errors */
 				}
 
 				/* Delete _compressed_ file */

archival/libunarchive/data_extract_all.c

diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c
index 1100410..ae242df 100644
--- a/archival/libunarchive/data_extract_all.c
+++ b/archival/libunarchive/data_extract_all.c
@@ -148,11 +148,11 @@
 		}
 		/* same for utime */
 		if (archive_handle->ah_flags & ARCHIVE_RESTORE_DATE) {
-			struct timeval t;
+			struct timeval t[2];
 
-			t.tv_sec = file_header->mtime;
-			t.tv_usec = 0;
-			utimes(file_header->name, &t);
+			t[1].tv_sec = t[0].tv_sec = file_header->mtime;
+			t[1].tv_usec = t[0].tv_usec = 0;
+			utimes(file_header->name, t);
 		}
 	}
 }