proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-21 22:21:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Take umask into account in filebuf_commit

Browse Source
This commit is contained in:
Edward Thomson 2013-11-04 15:46:32 -06:00 committed by Edward Thomson
parent 0e1115d287
commit f966acd133
4 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/git2/odb_backend.h
View File

@ -50,8 +50,8 @@ GIT_EXTERN(int) git_odb_backend_loose(
const char *objects_dir, const char *objects_dir,
int compression_level, int compression_level,
int do_fsync, int do_fsync,
mode_t dir_mode, unsigned int dir_mode,
mode_t file_mode); unsigned int file_mode);
/** /**
* Create a backend out of a single packfile * Create a backend out of a single packfile

6
src/filebuf.c
View File

@ -320,9 +320,13 @@ int git_filebuf_commit_at(git_filebuf *file, const char *path, mode_t mode)
int git_filebuf_commit(git_filebuf *file, mode_t mode) int git_filebuf_commit(git_filebuf *file, mode_t mode)
{ {
mode_t mask;
/* temporary files cannot be committed */ /* temporary files cannot be committed */
assert(file && file->path_original); assert(file && file->path_original);
p_umask(mask = p_umask(0));
file->flush_mode = Z_FINISH; file->flush_mode = Z_FINISH;
flush_buffer(file); flush_buffer(file);
@ -338,7 +342,7 @@ int git_filebuf_commit(git_filebuf *file, mode_t mode)
file->fd = -1; file->fd = -1;
if (p_chmod(file->path_lock, mode)) { if (p_chmod(file->path_lock, (mode & ~mask))) {
giterr_set(GITERR_OS, "Failed to set attributes for file at '%s'", file->path_lock); giterr_set(GITERR_OS, "Failed to set attributes for file at '%s'", file->path_lock);
goto on_error; goto on_error;
} }

4
src/odb_loose.c
View File

@ -902,8 +902,8 @@ int git_odb_backend_loose(
const char *objects_dir, const char *objects_dir,
int compression_level, int compression_level,
int do_fsync, int do_fsync,
mode_t dir_mode, unsigned int dir_mode,
mode_t file_mode) unsigned int file_mode)
{ {
loose_backend *backend; loose_backend *backend;
size_t objects_dirlen; size_t objects_dirlen;

34
tests-clar/core/filebuf.c
View File

@ -90,3 +90,37 @@ void test_core_filebuf__5(void)
cl_must_pass(p_unlink(test)); cl_must_pass(p_unlink(test));
} }
/* make sure git_filebuf_commit takes umask into account */
void test_core_filebuf__umask(void)
{
git_filebuf file = GIT_FILEBUF_INIT;
char test[] = "test";
struct stat statbuf;
mode_t mask, os_mask;
#ifdef GIT_WIN32
os_mask = 0600;
#else
os_mask = 0777;
#endif
p_umask(mask = p_umask(0));
cl_assert(file.buffer == NULL);
cl_git_pass(git_filebuf_open(&file, test, 0));
cl_assert(file.buffer != NULL);
cl_git_pass(git_filebuf_printf(&file, "%s\n", "libgit2 rocks"));
cl_assert(file.buffer != NULL);
cl_git_pass(git_filebuf_commit(&file, 0666));
cl_assert(file.buffer == NULL);
cl_must_pass(p_stat("test", &statbuf));
cl_assert_equal_i(statbuf.st_mode & os_mask, (0666 & ~mask) & os_mask);
cl_must_pass(p_unlink(test));
}