in try_read_file_sync - treat ENOTDIR as ENOENT

dannyzaken · dannyzaken · commit e9a75a8a9eb2 · 2025-05-27T18:05:02.000+03:00
ENOTDIR is relevant for cases where a directory in the middle of the path is a file and not a directory

Signed-off-by: Danny Zaken &lt;dannyzaken@gmail.com&gt;
diff --git a/src/util/fs_utils.js b/src/util/fs_utils.js
@@ -142,14 +142,19 @@ function try_read_file_sync(file_name) {
     try {
         return fs.readFileSync(file_name, 'utf8');
     } catch (err) {
-        if (err.code === 'ENOENT') {
+        if (is_not_exist_err_code(err)) {
             // file does not exist
             return;
         }
         throw err;
     }
 }
 
+// returns true if the error is ENOENT or ENOTDIR
+// ENOTDIR is relevant for cases where a directory in the middle of the path is a file and not a directory
+function is_not_exist_err_code(err) {
+    return err && (err.code === 'ENOENT' || err.code === 'ENOTDIR');
+}
 
 // returns the first line in the file that contains the substring
 async function find_line_in_file(file_name, line_sub_string) {

Original file line number	Diff line number	Diff line change
`@@ -142,14 +142,19 @@ function try_read_file_sync(file_name) {`
`142`	`142`	`try {`
`143`	`143`	`return fs.readFileSync(file_name, 'utf8');`
`144`	`144`	`} catch (err) {`
`145`		`- if (err.code === 'ENOENT') {`
	`145`	`+ if (is_not_exist_err_code(err)) {`
`146`	`146`	`// file does not exist`
`147`	`147`	`return;`
`148`	`148`	`}`
`149`	`149`	`throw err;`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`
	`153`	`+// returns true if the error is ENOENT or ENOTDIR`
	`154`	`+// ENOTDIR is relevant for cases where a directory in the middle of the path is a file and not a directory`
	`155`	`+function is_not_exist_err_code(err) {`
	`156`	`+ return err && (err.code === 'ENOENT' \|\| err.code === 'ENOTDIR');`
	`157`	`+}`
`153`	`158`
`154`	`159`	`// returns the first line in the file that contains the substring`
`155`	`160`	`async function find_line_in_file(file_name, line_sub_string) {`