Skip to content

Commit

Permalink
main : fix file existence check in main.cpp (ggerganov#1889)
Browse files Browse the repository at this point in the history
In commit dda4b0e of PR ggerganov#1872, I've introduced a check for the
existence of files before loading the model. However, I haven't
considered the case where whisper.cpp might read from stdin as well,
and in such cases, the checks should ignore the "-" argument as it
does not represent a regular file.

Additionally, this commit removes the usage of 'stat()' in favor of
the recently introduced function 'is_file_exist()' in common.cpp from
PR ggerganov#1871.

Apologies for the bug introduced in the previous PR and any
inconvenience it may have caused.
  • Loading branch information
Theldus authored Feb 22, 2024
1 parent efddbe0 commit 9fbf4a4
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions examples/main/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
#include <vector>
#include <cstring>

#include <sys/stat.h>

#if defined(_MSC_VER)
#pragma warning(disable: 4244 4267) // possible loss of data
#endif
Expand Down Expand Up @@ -845,10 +843,9 @@ int main(int argc, char ** argv) {

// remove non-existent files
for (auto it = params.fname_inp.begin(); it != params.fname_inp.end();) {
struct stat st;
const auto fname_inp = it->c_str();

if (stat(fname_inp, &st) == -1) {
if (*it != "-" && !is_file_exist(fname_inp)) {
fprintf(stderr, "error: input file not found '%s'\n", fname_inp);
it = params.fname_inp.erase(it);
continue;
Expand Down

0 comments on commit 9fbf4a4

Please sign in to comment.