MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-25 04:19:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Kind of a cheesy fix for #26, and not strictly correct, but close enough. Better would be to declare a path separator char in the os stuff.

Browse Source
This commit is contained in:
Ron Pedde 2006-03-31 09:41:27 +00:00
parent 994c8efa8e
commit 8fc0ab5272
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/scan-xml.c
View File

@ -188,19 +188,24 @@ int scan_xml_translate_path(char *pold, char *pnew) {
if(!path_found) { if(!path_found) {
strcpy(working_path,pold); strcpy(working_path,pold);
DPRINTF(E_DBG,L_SCAN,"Translating %s\n",pold); DPRINTF(E_DBG,L_SCAN,"Translating %s, base %s\n",pold,scan_xml_file);
/* let's try to find the path by brute force. /* let's try to find the path by brute force.
* We'll assume that it is under the xml file somewhere * We'll assume that it is under the xml file somewhere
*/ */
while(!path_found && ((current = strrchr(working_path,'/')))) { while(!path_found && ((current = strrchr(working_path,'/')))) {
strcpy(base_path,scan_xml_file); realpath(scan_xml_file,base_path);
DPRINTF(E_DBG,L_SCAN,"New base: %s\n",base_path);
// strcpy(base_path,scan_xml_file);
pbase = strrchr(base_path,'/'); pbase = strrchr(base_path,'/');
if(!pbase) pbase = strrchr(base_path,'\\');
if(!pbase) return FALSE; if(!pbase) return FALSE;
strcpy(pbase,pold + (current-working_path)); strcpy(pbase,pold + (current-working_path));
if(base_path[strlen(base_path)-1] == '/') if((base_path[strlen(base_path)-1] == '/') ||
(base_path[strlen(base_path)-1] == '\\')) {
base_path[strlen(base_path)-1] = '\0'; base_path[strlen(base_path)-1] = '\0';
}
DPRINTF(E_DBG,L_SCAN,"Trying %s\n",base_path); DPRINTF(E_DBG,L_SCAN,"Trying %s\n",base_path);
if(scan_xml_is_file(base_path)) { if(scan_xml_is_file(base_path)) {
@ -216,11 +221,14 @@ int scan_xml_translate_path(char *pold, char *pnew) {
strcpy(base_path,scan_xml_file); strcpy(base_path,scan_xml_file);
pbase = strrchr(base_path,'/'); pbase = strrchr(base_path,'/');
if(!pbase) pbase = strrchr(base_path,'\\');
if(!pbase) return FALSE; if(!pbase) return FALSE;
strcpy(pbase,pold + discard); strcpy(pbase,pold + discard);
if(base_path[strlen(base_path)-1] == '/') if((base_path[strlen(base_path)-1] == '/') ||
(base_path[strlen(base_path)-1] == '\\')) {
base_path[strlen(base_path)-1] = '\0'; base_path[strlen(base_path)-1] = '\0';
}
realpath(base_path,pnew); realpath(base_path,pnew);