MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

get file info from stat, rather than from scandir, fixing bug #196

This commit is contained in:
Ron Pedde 2006-08-26 03:44:43 +00:00
parent e1fe5d53a1
commit e00ad47a55
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/xml-rpc.c
View File

@ -17,6 +17,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/stat.h>
#include <time.h> #include <time.h>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
# include <unistd.h> # include <unistd.h>
@ -136,14 +137,14 @@ void xml_update_config(WS_CONNINFO *pwsc) {
badparms_len = (int)strlen(arg) + 1; badparms_len = (int)strlen(arg) + 1;
badparms = (char*)malloc(badparms_len); badparms = (char*)malloc(badparms_len);
if(!badparms) { if(!badparms) {
DPRINTF(E_FATAL,L_MISC,"xml_update_config: malloc\n"); DPRINTF(E_FATAL,L_XML,"xml_update_config: malloc\n");
} }
strcpy(badparms,arg); strcpy(badparms,arg);
} else { } else {
badparms_len += (int)strlen(arg) + 1; badparms_len += (int)strlen(arg) + 1;
badparms = (char*)realloc(badparms,badparms_len); badparms = (char*)realloc(badparms,badparms_len);
if(!badparms) { if(!badparms) {
DPRINTF(E_FATAL,L_MISC,"xml_update_config: malloc\n"); DPRINTF(E_FATAL,L_XML,"xml_update_config: malloc\n");
} }
strcat(badparms,","); strcat(badparms,",");
strcat(badparms,arg); strcat(badparms,arg);
@ -154,7 +155,7 @@ void xml_update_config(WS_CONNINFO *pwsc) {
} }
if(has_error) { if(has_error) {
DPRINTF(E_INF,L_MISC,"Bad parms; %s\n",badparms); DPRINTF(E_INF,L_XML,"Bad parms; %s\n",badparms);
xml_return_error(pwsc,500,badparms); xml_return_error(pwsc,500,badparms);
free(badparms); free(badparms);
return; return;
@ -367,10 +368,12 @@ void xml_handle(WS_CONNINFO *pwsc) {
return; return;
} }
#if(0) /* Turn this off until it's done in the web admin */
if(strcasecmp(method,"browse_path") == 0) { if(strcasecmp(method,"browse_path") == 0) {
xml_browse_path(pwsc); xml_browse_path(pwsc);
return; return;
} }
#endif
if(strcasecmp(method,"rescan") == 0) { if(strcasecmp(method,"rescan") == 0) {
xml_rescan(pwsc); xml_rescan(pwsc);
@ -405,12 +408,12 @@ void xml_browse_path(WS_CONNINFO *pwsc) {
int err; int err;
int ignore_dotfiles=1; int ignore_dotfiles=1;
int ignore_files=1; int ignore_files=1;
struct stat sb;
base_path = ws_getvar(pwsc, "path"); base_path = ws_getvar(pwsc, "path");
if(!base_path) if(!base_path)
base_path = PATHSEP_STR; base_path = PATHSEP_STR;
if(ws_getvar(pwsc,"show_dotfiles")) if(ws_getvar(pwsc,"show_dotfiles"))
ignore_dotfiles = 0; ignore_dotfiles = 0;
@ -443,24 +446,33 @@ void xml_browse_path(WS_CONNINFO *pwsc) {
if((!strcmp(pde->d_name,".")) || (!strcmp(pde->d_name,".."))) if((!strcmp(pde->d_name,".")) || (!strcmp(pde->d_name,"..")))
continue; continue;
if((pde->d_type & DT_REG) && (ignore_files))
snprintf(full_path,PATH_MAX,"%s%c%s",base_path,PATHSEP,pde->d_name);
realpath(full_path,resolved_path);
if(os_stat(resolved_path,&sb)) {
DPRINTF(E_WARN,L_XML,"Eror statting %s: %s\n",
resolved_path,strerror(errno));
continue;
}
if((sb.st_mode & S_IFREG) && (ignore_files))
continue; continue;
if((!(pde->d_type & DT_DIR)) && /* skip symlinks and devices and whatnot */
(!(pde->d_type & DT_REG))) if((!(sb.st_mode & S_IFDIR)) &&
(!(sb.st_mode & S_IFREG)))
continue; continue;
if((ignore_dotfiles) && (pde->d_name) && (pde->d_name[0] == '.')) if((ignore_dotfiles) && (pde->d_name) && (pde->d_name[0] == '.'))
continue; continue;
snprintf(full_path,PATH_MAX,"%s%c%s",base_path,PATHSEP,pde->d_name);
realpath(full_path,resolved_path);
readable = !access(resolved_path,R_OK); readable = !access(resolved_path,R_OK);
writable = !access(resolved_path,W_OK); writable = !access(resolved_path,W_OK);
if(pde->d_type & DT_DIR) { if(pde->d_type & DT_DIR) {
xml_push(pxml,"directory"); xml_push(pxml,"directory");
} else if((pde->d_type & DT_LNK) == DT_LNK) { } else if((sb.st_mode & S_IFLNK) == S_IFLNK) {
xml_push(pxml,"symlink"); xml_push(pxml,"symlink");
} else { } else {
xml_push(pxml,"file"); xml_push(pxml,"file");