summaryrefslogtreecommitdiff
path: root/path.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-28 06:21:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-03-28 15:02:15 (GMT)
commit17e61b82887fb71800b0fcd39ffe89ddf4d2492e (patch)
tree626d729d96b73a838f84059bd85cd975bd668003 /path.c
parent3be1f18e1b15c28ac6c750ff1a42576fd981d0f5 (diff)
downloadgit-17e61b82887fb71800b0fcd39ffe89ddf4d2492e.zip
git-17e61b82887fb71800b0fcd39ffe89ddf4d2492e.tar.gz
git-17e61b82887fb71800b0fcd39ffe89ddf4d2492e.tar.bz2
set_shared_perm(): sometimes we know what the final mode bits should look like
adjust_shared_perm() first obtains the mode bits from lstat(2), expecting to find what the result of applying user's umask is, and then tweaks it as necessary. When the file to be adjusted is created with mkstemp(3), however, the mode thusly obtained does not have anything to do with user's umask, and we would need to start from 0444 in such a case and there is no point running lstat(2) for such a path. This introduces a new API set_shared_perm() to bypass the lstat(2) and instead force setting the mode bits to the desired value directly. adjust_shared_perm() becomes a thin wrapper to the function. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'path.c')
-rw-r--r--path.c25
1 files changed, 16 insertions, 9 deletions
diff --git a/path.c b/path.c
index 42898e0..8a0a674 100644
--- a/path.c
+++ b/path.c
@@ -311,16 +311,23 @@ char *enter_repo(char *path, int strict)
return NULL;
}
-int adjust_shared_perm(const char *path)
+int set_shared_perm(const char *path, int mode)
{
struct stat st;
- int mode, tweak, shared;
+ int tweak, shared, orig_mode;
- if (!shared_repository)
+ if (!shared_repository) {
+ if (mode)
+ return chmod(path, mode & ~S_IFMT);
return 0;
- if (lstat(path, &st) < 0)
- return -1;
- mode = st.st_mode;
+ }
+ if (!mode) {
+ if (lstat(path, &st) < 0)
+ return -1;
+ mode = st.st_mode;
+ orig_mode = mode;
+ } else
+ orig_mode = 0;
if (shared_repository < 0)
shared = -shared_repository;
else
@@ -344,9 +351,9 @@ int adjust_shared_perm(const char *path)
}
if (((shared_repository < 0
- ? (st.st_mode & (FORCE_DIR_SET_GID | 0777))
- : (st.st_mode & mode)) != mode) &&
- chmod(path, mode) < 0)
+ ? (orig_mode & (FORCE_DIR_SET_GID | 0777))
+ : (orig_mode & mode)) != mode) &&
+ chmod(path, (mode & ~S_IFMT)) < 0)
return -2;
return 0;
}