forked from len0rd/rockbox
volume_strip() now ignores multiple leading slashes like the rest of the path handling code. Fixes the stats plugin only counting the internal flash on Ondio, and other potential problems. Posix says multiple slashes are legal. * More precise volume name check.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10155 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
2ef6afe0a0
commit
f9b20914e6
1 changed files with 10 additions and 7 deletions
|
@ -47,11 +47,14 @@ static const char* vol_names = "<HD%d>";
|
|||
static int strip_volume(const char* name, char* namecopy)
|
||||
{
|
||||
int volume = 0;
|
||||
const char *temp = name;
|
||||
|
||||
if (name[1] == vol_names[0] ) /* a '<' quickly identifies our volumes */
|
||||
while (*temp && strchr("/", *temp)) /* skip all leading slashes */
|
||||
++temp;
|
||||
|
||||
if (*temp && !strncmp(temp, vol_names, VOL_ENUM_POS))
|
||||
{
|
||||
const char* temp;
|
||||
temp = name + 1 + VOL_ENUM_POS; /* behind '/' and special name */
|
||||
temp += VOL_ENUM_POS; /* behind special name */
|
||||
volume = atoi(temp); /* number is following */
|
||||
temp = strchr(temp, '/'); /* search for slash behind */
|
||||
if (temp != NULL)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue