Merge branch 'rs/mingw-tighten-mkstemp' into maint

gitster · gitster · commit a75163119c0f · 2022-08-05T15:51:36.000-07:00
mkstemp() emulation on Windows has been improved.
source: &lt;7265e37f-fd29-3579-b840-19a1df52a59f@web.de&gt;

* rs/mingw-tighten-mkstemp:
  mingw: avoid mktemp() in mkstemp() implementation
diff --git a/compat/mingw.c b/compat/mingw.c
@@ -1059,10 +1059,7 @@ char *mingw_mktemp(char *template)
 
 int mkstemp(char *template)
 {
-	char *filename = mktemp(template);
-	if (!filename)
-		return -1;
-	return open(filename, O_RDWR | O_CREAT, 0600);
+	return git_mkstemp_mode(template, 0600);
 }
 
 int gettimeofday(struct timeval *tv, void *tz)

Original file line number	Diff line number	Diff line change
`@@ -1059,10 +1059,7 @@ char mingw_mktemp(char template)`
`1059`	`1059`
`1060`	`1060`	`int mkstemp(char *template)`
`1061`	`1061`	`{`
`1062`		`- char *filename = mktemp(template);`
`1063`		`- if (!filename)`
`1064`		`- return -1;`
`1065`		`- return open(filename, O_RDWR \| O_CREAT, 0600);`
	`1062`	`+ return git_mkstemp_mode(template, 0600);`
`1066`	`1063`	`}`
`1067`	`1064`
`1068`	`1065`	`int gettimeofday(struct timeval tv, void tz)`