git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Karsten Blees <karsten.blees@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, Stepan Kasal <kasal@ucw.cz>
Cc: Johannes Sixt <j6t@kdbg.org>,
	GIT Mailing-list <git@vger.kernel.org>,
	 msysGit <msysgit@googlegroups.com>
Subject: [PATCH 2/2] config: use chmod() instead of fchmod()
Date: Wed, 16 Jul 2014 00:54:30 +0200	[thread overview]
Message-ID: <53C5B126.6020404@gmail.com> (raw)
In-Reply-To: <53C5B0A1.4060502@gmail.com>

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 <blees@dcon.de>
---
 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

-- 
-- 
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.

You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en

--- 
You received this message because you are subscribed to the Google Groups "msysGit" group.
To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

  parent reply	other threads:[~2014-07-15 22:54 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-10 20:05 Topic sk/mingw-unicode-spawn-args breaks tests Johannes Sixt
2014-07-11 19:49 ` Karsten Blees
2014-07-12  7:50   ` Stepan Kasal
2014-07-15  0:21     ` Johannes Schindelin
2014-07-15 13:43     ` [PATCH 0/3] fix test suite with mingw-unicode patches Stepan Kasal
2014-07-15 13:43       ` [PATCH 1/3] Win32: Unicode file name support (except dirent) Stepan Kasal
2014-07-15 13:43       ` [PATCH 2/3] Win32: Unicode file name support (dirent) Stepan Kasal
2014-07-15 13:43       ` [PATCH 3/3] tests: do not pass iso8859-1 encoded parameter Stepan Kasal
2014-07-15 13:53       ` [PATCH 0/3] fix test suite with mingw-unicode patches Stepan Kasal
2014-07-15 18:20       ` Junio C Hamano
2014-07-15 22:52         ` Karsten Blees
2014-07-15 22:53           ` [PATCH 1/2] MinGW: fix compile error due to missing ELOOP Karsten Blees
2014-07-15 23:42             ` Jonathan Nieder
2014-07-15 23:57               ` Karsten Blees
2014-07-16 17:43             ` Junio C Hamano
2014-07-15 22:54           ` Karsten Blees [this message]
2014-07-16  5:33             ` [PATCH 2/2] config: use chmod() instead of fchmod() Johannes Sixt
2014-07-16 10:53               ` Karsten Blees
2014-07-16 22:16             ` Junio C Hamano
2014-07-17  8:57               ` Karsten Blees
2014-07-16  9:29           ` [PATCH 0/3] fix test suite with mingw-unicode patches Stepan Kasal
2014-07-16 11:01             ` Thomas Braun
2014-07-17 15:36             ` [PATCH 0/6] mingw test fixes Stepan Kasal
2014-07-17 15:37               ` [PATCH 1/6] MinGW: Skip test redirecting to fd 4 Stepan Kasal
2014-07-17 18:41                 ` Junio C Hamano
2014-07-17 20:06                   ` Johannes Schindelin
2014-07-17 20:18                   ` Karsten Blees
2014-07-17 20:38                     ` Junio C Hamano
2014-07-17 15:37               ` [PATCH 2/6] Disable t0110's high-bit test on Windows Stepan Kasal
2014-07-17 18:20                 ` Karsten Blees
2014-07-18 18:26                   ` Junio C Hamano
2014-07-19 19:37                     ` [PATCH] t0110/MinGW: skip tests that pass arbitrary bytes on the command line Karsten Blees
2014-07-21 16:41                       ` Junio C Hamano
2014-07-17 15:37               ` [PATCH 3/6] MinGW: disable legacy encoding tests Stepan Kasal
2014-07-17 15:37               ` [PATCH 4/6] t4210: skip command-line encoding tests on mingw Stepan Kasal
2014-07-18  9:52                 ` Erik Faye-Lund
2014-07-21 16:59                   ` Junio C Hamano
2014-07-21 17:45                     ` Johannes Schindelin
2014-07-21 19:21                       ` Johannes Sixt
2014-07-21 20:07                     ` Junio C Hamano
2014-07-21 22:29                       ` Junio C Hamano
2014-07-21 22:39                         ` Junio C Hamano
2014-07-21 22:30                       ` [PATCH 2/2] test prerequisites: enumerate with commas Junio C Hamano
2014-07-17 15:37               ` [PATCH 5/6] t9902: mingw-specific fix for gitfile link files Stepan Kasal
2014-07-17 20:42                 ` Junio C Hamano
2014-07-17 15:37               ` [PATCH 6/6] t800[12]: work around MSys limitation Stepan Kasal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=53C5B126.6020404@gmail.com \
    --to=karsten.blees@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    --cc=kasal@ucw.cz \
    --cc=msysgit@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).