Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-30 08:34:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

don't require .xwd's extension to be omitted for file to be found!

Browse source
This commit is contained in:
Eric House 2020-04-24 21:36:16 -07:00
parent 1c0348dbf1
commit 267a24619a
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
xwords4/linux/linuxmain.c
View file

@ -2156,14 +2156,24 @@ getDictPath( const LaunchParams *params, const char* name,
XP_Bool success = XP_FALSE;
GSList* iter;
result[0] = '\0';
for ( iter = params->dictDirs; !!iter; iter = iter->next ) {
for ( iter = params->dictDirs; !!iter && !success; iter = iter->next ) {
const char* path = iter->data;
char buf[256];
int len = snprintf( buf, VSIZE(buf), "%s/%s.xwd", path, name );
if ( len < VSIZE(buf) && file_exists( buf ) ) {
snprintf( result, resultLen, "%s", buf );
success = XP_TRUE;
break;
for ( bool firstPass = true; ; firstPass = false ) {
char buf[256];
int len = snprintf( buf, VSIZE(buf), "%s/%s%s", path, name,
firstPass ? "" : ".xwd" );
XP_ASSERT( len < VSIZE(buf) );
if ( len < VSIZE(buf) && file_exists( buf ) ) {
snprintf( result, resultLen, "%s", buf );
success = XP_TRUE;
break;
} else {
XP_LOGFF( "nothing found at %s", buf );
if ( !firstPass ) {
break;
}
}
}
}
XP_LOGF( "%s(%s)=>%d", __func__, name, success );