emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-create(8): store file mtime in metadata for upcoming changes.

Browse Source
This commit is contained in:
Juan RP 2015-02-22 18:20:32 +01:00
parent ae8ce64542
commit 2cae0cba01
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -1,5 +1,8 @@
xbps-0.44 (???): xbps-0.44 (???):
* xbps-create(8): modification time of regular files and links is now stored
in the package files metadata, will be used in a future version.
* libxbps: file timestamps stored in binary packages are now restored while * libxbps: file timestamps stored in binary packages are now restored while
unpacking as regular user. unpacking as regular user.

12
bin/xbps-create/main.c
View File

@ -1,5 +1,5 @@
/*- /*-
* Copyright (c) 2012-2014 Juan Romero Pardines. * Copyright (c) 2012-2015 Juan Romero Pardines.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -57,6 +57,7 @@
struct xentry { struct xentry {
TAILQ_ENTRY(xentry) entries; TAILQ_ENTRY(xentry) entries;
uint64_t mtime;
char *file, *type, *target, *hash; char *file, *type, *target, *hash;
ino_t inode; ino_t inode;
}; };
@ -272,6 +273,8 @@ ftw_cb(const char *fpath, const struct stat *sb, int type, struct FTW *ftwbuf _u
*/ */
xe->type = strdup("links"); xe->type = strdup("links");
assert(xe->type); assert(xe->type);
/* store modification time for regular files and links */
xe->mtime = (uint64_t)sb->st_mtime;
buf = malloc(sb->st_size+1); buf = malloc(sb->st_size+1);
assert(buf); assert(buf);
r = readlink(fpath, buf, sb->st_size+1); r = readlink(fpath, buf, sb->st_size+1);
@ -348,6 +351,8 @@ ftw_cb(const char *fpath, const struct stat *sb, int type, struct FTW *ftwbuf _u
die("failed to process hash for %s:", fpath); die("failed to process hash for %s:", fpath);
xe->inode = sb->st_ino; xe->inode = sb->st_ino;
/* store modification time for regular files and links */
xe->mtime = (uint64_t)sb->st_mtime;
} else if (type == FTW_D || type == FTW_DP) { } else if (type == FTW_D || type == FTW_DP) {
/* directory */ /* directory */
@ -409,8 +414,11 @@ process_xentry(const char *key, const char *mutable_files)
xbps_dictionary_set_cstring(d, "file", p); xbps_dictionary_set_cstring(d, "file", p);
if (xe->target) if (xe->target)
xbps_dictionary_set_cstring(d, "target", xe->target); xbps_dictionary_set_cstring(d, "target", xe->target);
else if (xe->hash) if (xe->hash)
xbps_dictionary_set_cstring(d, "sha256", xe->hash); xbps_dictionary_set_cstring(d, "sha256", xe->hash);
if (xe->mtime)
xbps_dictionary_set_uint64(d, "mtime", xe->mtime);
xbps_array_add(a, d); xbps_array_add(a, d);
xbps_object_release(d); xbps_object_release(d);
} }