Commit 4723f050ac989935cd1dafa2a20f2eb40742b689
2020-07-23T14:22:36
more fixes for setting/getting file index entry filetype and permissions
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
diff --git a/lib/fileindex.c b/lib/fileindex.c
index c4e79c0..acc2c26 100644
--- a/lib/fileindex.c
+++ b/lib/fileindex.c
@@ -53,18 +53,35 @@ struct got_fileindex {
#define GOT_FILEIDX_MAX_ENTRIES INT_MAX
};
-uint16_t
-got_fileindex_perms_from_st(struct stat *sb)
+mode_t
+got_fileindex_entry_perms_get(struct got_fileindex_entry *ie)
+{
+ return ((ie->mode & GOT_FILEIDX_MODE_PERMS) >>
+ GOT_FILEIDX_MODE_PERMS_SHIFT);
+}
+
+void
+got_fileindex_entry_perms_set(struct got_fileindex_entry *ie, mode_t mode)
{
- uint16_t perms = (sb->st_mode & (S_IRWXU | S_IRWXG | S_IRWXO));
- return (perms << GOT_FILEIDX_MODE_PERMS_SHIFT);
+ ie->mode &= ~GOT_FILEIDX_MODE_PERMS;
+ ie->mode |= ((mode << GOT_FILEIDX_MODE_PERMS_SHIFT) &
+ GOT_FILEIDX_MODE_PERMS);
}
mode_t
got_fileindex_perms_to_st(struct got_fileindex_entry *ie)
{
- mode_t perms = (ie->mode >> GOT_FILEIDX_MODE_PERMS_SHIFT);
- return (S_IFREG | (perms & (S_IRWXU | S_IRWXG | S_IRWXO)));
+ mode_t perms = got_fileindex_entry_perms_get(ie);
+ int type = got_fileindex_entry_filetype_get(ie);
+ uint32_t ftype;
+
+ if (type == GOT_FILEIDX_MODE_REGULAR_FILE ||
+ type == GOT_FILEIDX_MODE_BAD_SYMLINK)
+ ftype = S_IFREG;
+ else
+ ftype = S_IFLNK;
+
+ return (ftype | (perms & (S_IRWXU | S_IRWXG | S_IRWXO)));
}
const struct got_error *
@@ -95,11 +112,15 @@ got_fileindex_entry_update(struct got_fileindex_entry *ie,
ie->uid = sb.st_uid;
ie->gid = sb.st_gid;
ie->size = (sb.st_size & 0xffffffff);
- if (S_ISLNK(sb.st_mode))
- ie->mode = GOT_FILEIDX_MODE_SYMLINK;
- else {
- ie->mode = GOT_FILEIDX_MODE_REGULAR_FILE;
- ie->mode |= got_fileindex_perms_from_st(&sb);
+ if (S_ISLNK(sb.st_mode)) {
+ got_fileindex_entry_filetype_set(ie,
+ GOT_FILEIDX_MODE_SYMLINK);
+ got_fileindex_entry_perms_set(ie, 0);
+ } else {
+ got_fileindex_entry_filetype_set(ie,
+ GOT_FILEIDX_MODE_REGULAR_FILE);
+ got_fileindex_entry_perms_set(ie,
+ sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO));
}
}