bin/xbps-create: record file mode, uid, and gid

Author: classabbyamp

bin/xbps-create/main.c

@@ -66,6 +66,9 @@ struct xentry {
 	char *file, *target;
 	char sha256[XBPS_SHA256_SIZE];
 	ino_t inode;
+	uid_t uid;
+	gid_t gid;
+	mode_t mode;
 };
 
 static TAILQ_HEAD(xentry_head, xentry) xentry_list =
@@ -396,6 +399,10 @@ ftw_cb(const char *fpath, const struct stat *sb, const struct dirent *dir UNUSED
 		goto out;
 	}
 
+	xe->uid = (sb->st_uid == geteuid()) ? 0 : sb->st_uid;
+	xe->gid = (sb->st_gid == getegid()) ? 0 : sb->st_gid;
+	xe->mode = sb->st_mode;
+
 	if (S_ISLNK(sb->st_mode)) {
 		char buf[PATH_MAX];
 		ssize_t len;
@@ -530,7 +537,6 @@ ftw_cb(const char *fpath, const struct stat *sb, const struct dirent *dir UNUSED
 		xbps_dictionary_set_uint64(fileinfo, "inode", sb->st_ino);
 		xe->inode = sb->st_ino;
 		xe->size = (uint64_t)sb->st_size;
-
 	} else if (S_ISDIR(sb->st_mode)) {
 		/* directory */
 		xbps_dictionary_set_cstring_nocopy(fileinfo, "type", "dirs");
@@ -648,8 +654,10 @@ process_xentry(enum entry_type type, const char *mutable_files)
 			xbps_dictionary_set_cstring(d, "target", xe->target);
 		if (*xe->sha256)
 			xbps_dictionary_set_cstring(d, "sha256", xe->sha256);
-		if (xe->size)
-			xbps_dictionary_set_uint64(d, "size", xe->size);
+		xbps_dictionary_set_uint64(d, "size", xe->size);
+		xbps_dictionary_set_uint32(d, "uid", xe->uid);
+		xbps_dictionary_set_uint32(d, "gid", xe->gid);
+		xbps_dictionary_set_uint32(d, "mode", xe->mode);
 
 		xbps_array_add(a, d);
 		xbps_object_release(d);