oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

ArchiveLookup: move code to FindSlash()

Browse Source
This commit is contained in:
Max Kellermann 2013-10-17 00:44:57 +02:00
parent fd9dd9343b
commit 15c2538532
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ArchiveLookup.cxx
View File

@ -29,6 +29,17 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
gcc_pure
static char *
FindSlash(char *p, size_t i)
{
for (; i > 0; --i)
if (p[i] == '/')
return p + i;
return nullptr;
}
gcc_pure gcc_pure
static const char * static const char *
FindSuffix(const char *p, size_t i) FindSuffix(const char *p, size_t i)
@ -88,14 +99,14 @@ archive_lookup(char *pathname, const char **archive,
break; break;
} }
} }
//find one dir up //find one dir up
while (idx > 0) { char *slash = FindSlash(pathdupe, idx);
if (pathdupe[idx] == '/') { if (slash == nullptr)
pathdupe[idx] = 0; break;
break;
} *slash = 0;
idx--; idx = slash - pathdupe;
}
} }
g_free(pathdupe); g_free(pathdupe);
return ret; return ret;