ustar: Move SOURCE_DATE_EPOCH code to opk/write

This way it runs only once (without resorting to static variables)
across all headers in all ustar archives.  Also, opk/write now prints an
informative error message.

1 files changed, 2 insertions, 24 deletions

diff --git a/src/ustar.c b/src/ustar.c
index a2ab0f8..88ae7b6 100644
--- a/src/ustar.c
+++ b/src/ustar.c
@@ -265,31 +265,13 @@ opkg_opk_ustar_read(struct opkg_opk_ustar *ustar, char **buffer, size_t *size)
 	return OPKG_OPK_OK;
 }
 
-static int
-_opkg_opk_ustar_source_date_epoch(int64_t *mtime)
-{
-	char *env;
-	char *end;
-
-	env = getenv("SOURCE_DATE_EPOCH");
-	if (env == NULL) {
-		return OPKG_OPK_ERROR;
-	}
-	*mtime = strtol(env, &end, 10);
-	if (*end != '\0') {
-		return OPKG_OPK_ERROR;
-	}
-	return OPKG_OPK_OK;
-}
-
 int
 opkg_opk_ustar_write_header(struct opkg_opk_ustar *ustar,
 		struct opkg_opk_dirent *dirent, uint16_t mode,
 		uid_t uid, const char *uname, gid_t gid, const char *gname,
-		uint64_t size, char type, const char *linkname)
+		uint64_t size, int64_t mtime, char type, const char *linkname)
 {
 	size_t    linkname_len;
-	int64_t   mtime;
 	uint32_t  chksum;
 	size_t    i;
 	char     *header_uc;
@@ -307,6 +289,7 @@ opkg_opk_ustar_write_header(struct opkg_opk_ustar *ustar,
 	strncpy(ustar->header.uname, uname, sizeof(ustar->header.uname));
 	strncpy(ustar->header.gname, gname, sizeof(ustar->header.gname));
 	sprintf(ustar->header.size, "%o", size);
+	sprintf(ustar->header.mtime, "%o", mtime);
 	switch (type) {
 		case '-':  /* Regular file */
 			*ustar->header.typeflag = '0';
@@ -338,11 +321,6 @@ opkg_opk_ustar_write_header(struct opkg_opk_ustar *ustar,
 	memset(ustar->header.linkname, 0,
 			sizeof(ustar->header.linkname) - linkname_len);
 
-	if (_opkg_opk_ustar_source_date_epoch(&mtime) == OPKG_OPK_ERROR) {
-		return OPKG_OPK_ERROR;
-	}
-	sprintf(ustar->header.mtime, "%o", mtime);
-
 	strcpy(ustar->header.magic, "ustar");
 	memcpy(ustar->header.version, "00", 2);
 	chksum = 0;