Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/b2d810c17747e62ca8470... ...commit http://git.netsurf-browser.org/netsurf.git/commit/b2d810c17747e62ca847037... ...tree http://git.netsurf-browser.org/netsurf.git/tree/b2d810c17747e62ca847037c2... The branch, master has been updated via b2d810c17747e62ca847037c2a7c4b76c3874894 (commit) from ce645599c995acfdba432d05a7b38627350797a7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/b2d810c17747e62ca84... commit b2d810c17747e62ca847037c2a7c4b76c3874894 Author: Ole Loots <ole(a)monochrom.net&gt; Commit: Ole Loots <ole(a)monochrom.net&gt; use is_dir function when checking direntry. diff --git a/atari/settings.c b/atari/settings.c index 0192a97..0c87597 100644 --- a/atari/settings.c +++ b/atari/settings.c @@ -411,17 +411,20 @@ static char * toolbar_iconset_popup( int x, int y ) while (ep = readdir (dp)) { if (strlen(ep->d_name) < 3) continue; - snprintf(fullpath, PATH_MAX-1, "%s/%s", toolbar_folder, ep->d_name ); - if (stat(fullpath, &statbuf) == 0) { - if (S_ISDIR(statbuf.st_mode)) { - if (strcmp(ep->d_name, current) == 0) - selected = navail; + snprintf(fullpath, PATH_MAX-1, "%s/%s", toolbar_folder, ep->d_name ); + if (is_dir(fullpath)) { + if (strcmp(ep->d_name, current) == 0) + selected = navail; /* store the folder name: */ avail[navail] = malloc( strlen(ep->d_name)+1 ); sprintf( avail[navail], "%s", ep->d_name ); navail++; if( navail >= MAX_SETS ) - break; + break; + } + if (stat(fullpath, &statbuf) == 0) { + if (S_ISDIR(statbuf.st_mode)) { + } } } ----------------------------------------------------------------------- Summary of changes: atari/settings.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/atari/settings.c b/atari/settings.c index 0192a97..0c87597 100644 --- a/atari/settings.c +++ b/atari/settings.c @@ -411,17 +411,20 @@ static char * toolbar_iconset_popup( int x, int y ) while (ep = readdir (dp)) { if (strlen(ep->d_name) < 3) continue; - snprintf(fullpath, PATH_MAX-1, "%s/%s", toolbar_folder, ep->d_name ); - if (stat(fullpath, &statbuf) == 0) { - if (S_ISDIR(statbuf.st_mode)) { - if (strcmp(ep->d_name, current) == 0) - selected = navail; + snprintf(fullpath, PATH_MAX-1, "%s/%s", toolbar_folder, ep->d_name ); + if (is_dir(fullpath)) { + if (strcmp(ep->d_name, current) == 0) + selected = navail; /* store the folder name: */ avail[navail] = malloc( strlen(ep->d_name)+1 ); sprintf( avail[navail], "%s", ep->d_name ); navail++; if( navail >= MAX_SETS ) - break; + break; + } + if (stat(fullpath, &statbuf) == 0) { + if (S_ISDIR(statbuf.st_mode)) { + } } } -- NetSurf Browser