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

compat: make p_open able to accept optional mode when passing the O_CREAT flag

Browse Source 
This has the nice side effect of making test_attr_repo__staging_properly_normalizes_line_endings_according_to_gitattributes_directives() test pass again on Windows. This test started to fail after commit 674a198 was applied.
This commit is contained in:
nulltoken 2012-05-06 13:04:12 +02:00
parent 9b62e40ecd
commit 3191ae89c6
5 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/posix.c
View File

@ -12,9 +12,20 @@
#ifndef GIT_WIN32
int p_open(const char *path, int flags)
int p_open(const char *path, int flags, ...)
{
return open(path, flags | O_BINARY);
mode_t mode = 0;
if (flags & O_CREAT)
{
va_list arg_list;
va_start(arg_list, flags);
mode = va_arg(arg_list, mode_t);
va_end(arg_list);
}
return open(path, flags | O_BINARY, mode);
}
int p_creat(const char *path, mode_t mode)

2
src/posix.h
View File

@ -42,7 +42,7 @@ extern int p_write(git_file fd, const void *buf, size_t cnt);
#define p_close(fd) close(fd)
#define p_umask(m) umask(m)
extern int p_open(const char *path, int flags);
extern int p_open(const char *path, int flags, ...);
extern int p_creat(const char *path, mode_t mode);
extern int p_getcwd(char *buffer_out, size_t size);
extern int p_rename(const char *from, const char *to);

2
src/win32/posix.h
View File

@ -45,7 +45,7 @@ extern int p_chmod(const char* path, mode_t mode);
extern int p_rmdir(const char* path);
extern int p_access(const char* path, mode_t mode);
extern int p_fsync(int fd);
extern int p_open(const char *path, int flags);
extern int p_open(const char *path, int flags, ...);
extern int p_creat(const char *path, mode_t mode);
extern int p_getcwd(char *buffer_out, size_t size);
extern int p_rename(const char *from, const char *to);

20
src/win32/posix_w32.c
View File

@ -217,13 +217,27 @@ int p_readlink(const char *link, char *target, size_t target_len)
return dwRet;
}
int p_open(const char *path, int flags)
int p_open(const char *path, int flags, ...)
{
int fd;
wchar_t* buf = gitwin_to_utf16(path);
wchar_t* buf;
mode_t mode = 0;
buf = gitwin_to_utf16(path);
if (!buf)
return -1;
fd = _wopen(buf, flags | _O_BINARY);
if (flags & O_CREAT)
{
va_list arg_list;
va_start(arg_list, flags);
mode = va_arg(arg_list, mode_t);
va_end(arg_list);
}
fd = _wopen(buf, flags | _O_BINARY, mode);
git__free(buf);
return fd;
}

2
tests-clar/clar_helpers.c
View File

@ -30,7 +30,7 @@ void cl_git_mkfile(const char *filename, const char *content)
void cl_git_write2file(const char *filename, const char *new_content, int flags)
{
int fd = open(filename, flags, 0644);
int fd = p_open(filename, flags, 0644);
cl_assert(fd >= 0);
if (!new_content)
new_content = "\n";