fix broken initialization of f_data_opts, don't clean STREAM_IS_PIPE flag

okbob · okbob · commit eca3cf6887c5 · 2021-11-07T19:50:18.000+01:00
diff --git a/src/inputs.c b/src/inputs.c
@@ -623,6 +623,7 @@ open_data_stream(Options *opts)
 		 * in open time. But it doesn't look like robust solution.
 		 */
 		f_data = fopen(locpathname, mode);
+		f_data_opts = 0;
 		if (!f_data)
 		{
 			/* save errno, and prepare error message */
@@ -648,8 +649,6 @@ open_data_stream(Options *opts)
 
 	if (f_data)
 	{
-		f_data_opts = 0;
-
 		if (fstat(fileno(f_data), &statbuf) != 0)
 		{
 			current_state->_errno = errno;
@@ -823,6 +822,8 @@ open_data_stream(Options *opts)
 void
 close_data_stream(void)
 {
+//leave("close file");
+
 	if (close_f_data)
 	{
 		fclose(f_data);

Original file line number	Diff line number	Diff line change
`@@ -623,6 +623,7 @@ open_data_stream(Options *opts)`
`623`	`623`	`* in open time. But it doesn't look like robust solution.`
`624`	`624`	`*/`
`625`	`625`	`f_data = fopen(locpathname, mode);`
	`626`	`+ f_data_opts = 0;`
`626`	`627`	`if (!f_data)`
`627`	`628`	`{`
`628`	`629`	`/* save errno, and prepare error message */`
`@@ -648,8 +649,6 @@ open_data_stream(Options *opts)`
`648`	`649`
`649`	`650`	`if (f_data)`
`650`	`651`	`{`
`651`		`- f_data_opts = 0;`
`652`		`-`
`653`	`652`	`if (fstat(fileno(f_data), &statbuf) != 0)`
`654`	`653`	`{`
`655`	`654`	`current_state->_errno = errno;`
`@@ -823,6 +822,8 @@ open_data_stream(Options *opts)`
`823`	`822`	`void`
`824`	`823`	`close_data_stream(void)`
`825`	`824`	`{`
	`825`	`+//leave("close file");`
	`826`	`+`
`826`	`827`	`if (close_f_data)`
`827`	`828`	`{`
`828`	`829`	`fclose(f_data);`