Karsten Blees <karsten.bl...@gmail.com> writes:

> There is no fchmod() on native Windows platforms (MinGW and MSVC), and the
> equivalent Win32 API (SetFileInformationByHandle) requires Windows Vista.
>
> Use chmod() instead.
>
> Signed-off-by: Karsten Blees <bl...@dcon.de>
> ---

I am wondering if it is saner to just revert the fchmod() patch and
replace it with something along the lines of

http://thread.gmane.org/gmane.comp.version-control.git/251682/focus=253219

Having said that, these are the only two callers of fchmod()
currently in our code base, so I'll queue this patch to allow us to
kick the problem-can down the road ;-)

Thanks.

>  config.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/config.c b/config.c
> index ba882a1..9767c4b 100644
> --- a/config.c
> +++ b/config.c
> @@ -1636,8 +1636,8 @@ int git_config_set_multivar_in_file(const char 
> *config_filename,
>                       MAP_PRIVATE, in_fd, 0);
>               close(in_fd);
>  
> -             if (fchmod(fd, st.st_mode & 07777) < 0) {
> -                     error("fchmod on %s failed: %s",
> +             if (chmod(lock->filename, st.st_mode & 07777) < 0) {
> +                     error("chmod on %s failed: %s",
>                               lock->filename, strerror(errno));
>                       ret = CONFIG_NO_WRITE;
>                       goto out_free;
> @@ -1815,8 +1815,8 @@ int git_config_rename_section_in_file(const char 
> *config_filename,
>  
>       fstat(fileno(config_file), &st);
>  
> -     if (fchmod(out_fd, st.st_mode & 07777) < 0) {
> -             ret = error("fchmod on %s failed: %s",
> +     if (chmod(lock->filename, st.st_mode & 07777) < 0) {
> +             ret = error("chmod on %s failed: %s",
>                               lock->filename, strerror(errno));
>               goto out;
>       }
> -- 
> 2.0.1.779.g26aeac4.dirty
>
> -- 
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to