Fix open file mode

knizhnik · knizhnik · commit d6908b353889 · 2019-01-15T01:07:48.000+03:00
diff --git a/src/data.c b/src/data.c
@@ -711,7 +711,7 @@ restore_data_file(const char *to_path, pgFile *file, bool allow_truncate,
 	 * modified pages for differential restore. If the file does not exist,
 	 * re-open it with "w" to create an empty file.
 	 */
-	out = fio_fopen(to_path, PG_BINARY_W "+", FIO_DB_HOST);
+	out = fio_fopen(to_path, PG_BINARY_R "+", FIO_DB_HOST);
 	if (out == NULL)
 	{
 		int errno_tmp = errno;
diff --git a/src/utils/file.c b/src/utils/file.c
@@ -275,6 +275,8 @@ FILE* fio_fopen(char const* path, char const* mode, fio_location location)
 	else
 	{
 		f = fopen(path, mode);
+		if (f == NULL && strcmp(mode, PG_BINARY_R "+") == 0)
+			f = fopen(path,  PG_BINARY_W);
 	}
 	return f;
 }

Original file line number	Diff line number	Diff line change
`@@ -711,7 +711,7 @@ restore_data_file(const char to_path, pgFile file, bool allow_truncate,`
`711`	`711`	`* modified pages for differential restore. If the file does not exist,`
`712`	`712`	`* re-open it with "w" to create an empty file.`
`713`	`713`	`*/`
`714`		`- out = fio_fopen(to_path, PG_BINARY_W "+", FIO_DB_HOST);`
	`714`	`+ out = fio_fopen(to_path, PG_BINARY_R "+", FIO_DB_HOST);`
`715`	`715`	`if (out == NULL)`
`716`	`716`	`{`
`717`	`717`	`int errno_tmp = errno;`
Original file line number	Diff line number	Diff line change
`@@ -275,6 +275,8 @@ FILE* fio_fopen(char const* path, char const* mode, fio_location location)`
`275`	`275`	`else`
`276`	`276`	`{`
`277`	`277`	`f = fopen(path, mode);`
	`278`	`+ if (f == NULL && strcmp(mode, PG_BINARY_R "+") == 0)`
	`279`	`+ f = fopen(path, PG_BINARY_W);`
`278`	`280`	`}`
`279`	`281`	`return f;`
`280`	`282`	`}`