cleanup of stdiop fsync

dwgebler · dwgebler · commit e018a8e915a8 · 2021-01-31T21:20:48.000Z
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
@@ -524,19 +524,21 @@ static int php_stdiop_sync(php_stream *stream)
 {
 	php_stdio_stream_data *data = (php_stdio_stream_data*)stream->abstract;
 	FILE *fp;
+	int fd;
 
 	if (php_stream_cast(stream, PHP_STREAM_AS_STDIO, (void**)&fp, REPORT_ERRORS) == FAILURE) {
-		return 1;
+		return -1;
 	}
 
 	if (php_stdiop_flush(stream) == 0) {
+		PHP_STDIOP_GET_FD(fd, data);
 		#ifdef PHP_WIN32
-		return _commit(fileno(fp));
+		return _commit(fd);
 		#else
-		return fsync(fileno(fp));
+		return fsync(fd);
 		#endif
 	}
-	return 1;
+	return -1;
 }
 
 static int php_stdiop_flush(php_stream *stream)

Original file line number	Diff line number	Diff line change
`@@ -524,19 +524,21 @@ static int php_stdiop_sync(php_stream *stream)`
`524`	`524`	`{`
`525`	`525`	`php_stdio_stream_data data = (php_stdio_stream_data)stream->abstract;`
`526`	`526`	`FILE *fp;`
	`527`	`+ int fd;`
`527`	`528`
`528`	`529`	`if (php_stream_cast(stream, PHP_STREAM_AS_STDIO, (void**)&fp, REPORT_ERRORS) == FAILURE) {`
`529`		`- return 1;`
	`530`	`+ return -1;`
`530`	`531`	`}`
`531`	`532`
`532`	`533`	`if (php_stdiop_flush(stream) == 0) {`
	`534`	`+ PHP_STDIOP_GET_FD(fd, data);`
`533`	`535`	`#ifdef PHP_WIN32`
`534`		`- return _commit(fileno(fp));`
	`536`	`+ return _commit(fd);`
`535`	`537`	`#else`
`536`		`- return fsync(fileno(fp));`
	`538`	`+ return fsync(fd);`
`537`	`539`	`#endif`
`538`	`540`	`}`
`539`		`- return 1;`
	`541`	`+ return -1;`
`540`	`542`	`}`
`541`	`543`
`542`	`544`	`static int php_stdiop_flush(php_stream *stream)`