zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-06-01 09:32:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

reorder calls to fluid_file_test

Browse source
This commit is contained in:
derselbst 2019-02-03 14:28:31 +01:00
parent ff6377a3bd
commit 12dd1c7653
3 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/midi/fluid_midi.c
View file

@ -92,24 +92,23 @@ static int fluid_midi_file_get_division(fluid_midi_file *midifile);
*/ */
int fluid_is_midifile(const char *filename) int fluid_is_midifile(const char *filename)
{ {
FILE *fp = FLUID_FOPEN(filename, "rb"); FILE *fp;
uint32_t id; uint32_t id;
int retcode = FALSE; int retcode = FALSE;
do do
{ {
if(fp == NULL) if(!fluid_file_test(filename, G_FILE_TEST_IS_REGULAR))
{ {
return retcode; return retcode;
} }
// file exists and we have permission to open it // file seems to exist and is a regular file or a symlink to such
// now, test whether it's acutally a regular file or a symlink to such if((fp = FLUID_FOPEN(filename, "rb")) == NULL)
if(!fluid_file_test(filename, G_FILE_TEST_IS_REGULAR))
{ {
break; return retcode;
} }
if(FLUID_FREAD(&id, sizeof(id), 1, fp) != 1) if(FLUID_FREAD(&id, sizeof(id), 1, fp) != 1)
{ {
break; break;

13
src/sfloader/fluid_sffile.c
View file

@ -334,24 +334,23 @@ static int fluid_sffile_read_wav(SFData *sf, unsigned int start, unsigned int en
*/ */
int fluid_is_soundfont(const char *filename) int fluid_is_soundfont(const char *filename)
{ {
FILE *fp = FLUID_FOPEN(filename, "rb"); FILE *fp;
uint32_t fcc; uint32_t fcc;
int retcode = FALSE; int retcode = FALSE;
do do
{ {
if(fp == NULL) if(!fluid_file_test(filename, G_FILE_TEST_IS_REGULAR))
{ {
return retcode; return retcode;
} }
// file exists and we have permission to open it // file seems to exist and is a regular file or a symlink to such
// now, test whether it's acutally a regular file or a symlink to such if((fp = FLUID_FOPEN(filename, "rb")) == NULL)
if(!fluid_file_test(filename, G_FILE_TEST_IS_REGULAR))
{ {
break; return retcode;
} }
if(FLUID_FREAD(&fcc, sizeof(fcc), 1, fp) != 1) if(FLUID_FREAD(&fcc, sizeof(fcc), 1, fp) != 1)
{ {
break; break;

13
src/sfloader/fluid_sfont.c
View file

@ -24,21 +24,26 @@
void *default_fopen(const char *path) void *default_fopen(const char *path)
{ {
FILE* handle = FLUID_FOPEN(path, "rb"); FILE* handle;
if(handle == NULL) if(!fluid_file_test(path, G_FILE_TEST_EXISTS))
{ {
FLUID_LOG(FLUID_ERR, "fluid_sfloader_load(): Specified file does not exists or insufficient permissions to open it! ('%s')", path); FLUID_LOG(FLUID_ERR, "fluid_sfloader_load(): Unable to load non-existent file. ('%s')", path);
return NULL; return NULL;
} }
if(!fluid_file_test(path, G_FILE_TEST_IS_REGULAR)) if(!fluid_file_test(path, G_FILE_TEST_IS_REGULAR))
{ {
FLUID_FCLOSE(handle);
FLUID_LOG(FLUID_ERR, "fluid_sfloader_load(): Refusing to load non-regular file! ('%s')", path); FLUID_LOG(FLUID_ERR, "fluid_sfloader_load(): Refusing to load non-regular file! ('%s')", path);
return NULL; return NULL;
} }
if((handle = FLUID_FOPEN(path, "rb")) == NULL)
{
FLUID_LOG(FLUID_ERR, "fluid_sfloader_load(): Specified file does not exists or insufficient permissions to open it! ('%s')", path);
return NULL;
}
return handle; return handle;
} }