Merge pull request #7812 from dhalbert/merge-8.0.x-to-main

jepler · web-flow · commit 703b8b22727f · 2023-03-29T14:28:34.000-05:00
Merge #7810 from 8.0.x to main
diff --git a/shared-module/os/getenv.c b/shared-module/os/getenv.c
@@ -72,7 +72,7 @@ STATIC void close_file(file_arg *active_file) {
     // nothing
 }
 STATIC bool is_eof(file_arg *active_file) {
-    return f_eof(active_file);
+    return f_eof(active_file) || f_error(active_file);
 }
 
 // Return 0 if there is no next character (EOF).

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ STATIC void close_file(file_arg *active_file) {`
`72`	`72`	`// nothing`
`73`	`73`	`}`
`74`	`74`	`STATIC bool is_eof(file_arg *active_file) {`
`75`		`- return f_eof(active_file);`
	`75`	`+ return f_eof(active_file) \|\| f_error(active_file);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`// Return 0 if there is no next character (EOF).`