Fix two error paths

In generic_open_file(), when an error is detected, return 1 to indicate
the failure.

In get_file_sizes(), when an error other than ENOENT is detected, fail
immediately and don't clear the error.

diff --git a/filesetup.c b/filesetup.c
index 1facccd79f995021c03b80dead4a103b067c9189..39c276a3d2203180772a1e9a88974dc545d360fd 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -609,6 +609,7 @@ open_again:
                }
 
                td_verror(td, __e, buf);
+               return 1;
        }
 
        if (!from_hash && f->fd != -1) {
@@ -661,6 +662,7 @@ static int get_file_sizes(struct thread_data *td)
                        if (td->error != ENOENT) {
                                log_err("%s\n", td->verror);
                                err = 1;
+                               break;
                        }
                        clear_error(td);
                }