X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Futil.c;h=9fd2d89556819500d9c602cce6f99a60cf45c02c;hp=1210900bcaee61e72952e58dfe39b8b7f5e0e25a;hb=45030287af1e8e76b0feb1cfc3011a0ef2b37d0d;hpb=679bc6cb9016715339aac4ae6b2d5371c6262935 diff --git a/src/shared/util.c b/src/shared/util.c index 1210900bc..9fd2d8955 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -7758,11 +7758,14 @@ int same_fd(int a, int b) { return fa == fb; } -int chattr_fd(int fd, bool b, int mask) { - int old_attr, new_attr; +int chattr_fd(int fd, bool b, unsigned mask) { + unsigned old_attr, new_attr; assert(fd >= 0); + if (mask == 0) + return 0; + if (ioctl(fd, FS_IOC_GETFLAGS, &old_attr) < 0) return -errno; @@ -7780,9 +7783,14 @@ int chattr_fd(int fd, bool b, int mask) { return 0; } -int chattr_path(const char *p, bool b, int mask) { +int chattr_path(const char *p, bool b, unsigned mask) { _cleanup_close_ int fd = -1; + assert(p); + + if (mask == 0) + return 0; + fd = open(p, O_RDWR|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW); if (fd < 0) return -errno;