extern/whisper.cpp
1
0
Fork 1
mirror of https://github.com/ggerganov/whisper.cpp.git synced 2025-02-24 14:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

main : fix file existence check in main.cpp (#1889)

Browse Source 
In commit dda4b0e of PR #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 #1871.

Apologies for the bug introduced in the previous PR and any
inconvenience it may have caused.
This commit is contained in:
Davidson Francis 2024-02-22 10:01:08 -03:00 committed by GitHub
parent 59119f4f20
commit c56344b509
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/main/main.cpp
View File

@ -10,8 +10,6 @@
#include <vector> #include <vector>
#include <cstring> #include <cstring>
#include <sys/stat.h>
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma warning(disable: 4244 4267) // possible loss of data #pragma warning(disable: 4244 4267) // possible loss of data
#endif #endif
@ -845,10 +843,9 @@ int main(int argc, char ** argv) {
// remove non-existent files // remove non-existent files
for (auto it = params.fname_inp.begin(); it != params.fname_inp.end();) { for (auto it = params.fname_inp.begin(); it != params.fname_inp.end();) {
struct stat st;
const auto fname_inp = it->c_str(); 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); fprintf(stderr, "error: input file not found '%s'\n", fname_inp);
it = params.fname_inp.erase(it); it = params.fname_inp.erase(it);
continue; continue;