diff --git a/main/cmd/unpack/pkg_unpack.c b/main/cmd/unpack/pkg_unpack.c index d72a0d5..b948f2d 100644 --- a/main/cmd/unpack/pkg_unpack.c +++ b/main/cmd/unpack/pkg_unpack.c @@ -122,7 +122,7 @@ static int change_permissions(int dirfd, image_entry_t *list, int flags) continue; } - if (!(flags & FLAG_NO_CHMOD) && !S_ISLNK(list->mode)) { + if (!(flags & UNPACK_NO_CHMOD) && !S_ISLNK(list->mode)) { if (fchmodat(dirfd, list->name, list->mode & 07777, 0)) { fprintf(stderr, "%s: chmod: %s\n", list->name, @@ -131,7 +131,7 @@ static int change_permissions(int dirfd, image_entry_t *list, int flags) } } - if (!(flags & FLAG_NO_CHOWN)) { + if (!(flags & UNPACK_NO_CHOWN)) { if (fchownat(dirfd, list->name, list->uid, list->gid, AT_SYMLINK_NOFOLLOW)) { fprintf(stderr, "%s: chown: %s\n", list->name, diff --git a/main/cmd/unpack/unpack.c b/main/cmd/unpack/unpack.c index bdcb087..c4e8562 100644 --- a/main/cmd/unpack/unpack.c +++ b/main/cmd/unpack/unpack.c @@ -26,10 +26,10 @@ static int cmd_unpack(int argc, char **argv) root = optarg; break; case 'o': - flags |= FLAG_NO_CHOWN; + flags |= UNPACK_NO_CHOWN; break; case 'm': - flags |= FLAG_NO_CHMOD; + flags |= UNPACK_NO_CHMOD; break; default: tell_read_help(argv[0]); diff --git a/main/cmd/unpack/unpack.h b/main/cmd/unpack/unpack.h index 74b5bbe..c7e4f65 100644 --- a/main/cmd/unpack/unpack.h +++ b/main/cmd/unpack/unpack.h @@ -18,8 +18,8 @@ #include "util.h" enum { - FLAG_NO_CHOWN = 0x01, - FLAG_NO_CHMOD = 0x02, + UNPACK_NO_CHOWN = 0x01, + UNPACK_NO_CHMOD = 0x02, }; int mkdir_p(const char *path);