diff --git a/apps/bookmark.c b/apps/bookmark.c index cee9abdfa8..7d29c4f8f9 100644 --- a/apps/bookmark.c +++ b/apps/bookmark.c @@ -42,6 +42,7 @@ #include "plugin.h" #include "backdrop.h" #include "file.h" +#include "filefuncs.h" #define MAX_BOOKMARKS 10 #define MAX_BOOKMARK_SIZE 350 diff --git a/firmware/SOURCES b/firmware/SOURCES index baba51ca20..061c6323c8 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -39,9 +39,9 @@ common/disk.c #if !defined(SIMULATOR) || defined(__MINGW32__) || defined(__CYGWIN__) common/errno.c #endif /* !defined(SIMULATOR) || defined(__MINGW32__) || defined(__CYGWIN__) */ +common/filefuncs.c common/memcmp.c common/memchr.c -common/misc.c common/qsort.c common/random.c common/sprintf.c diff --git a/firmware/common/dir_uncached.c b/firmware/common/dir_uncached.c index ef9ce6f0af..5ec5c7fb41 100644 --- a/firmware/common/dir_uncached.c +++ b/firmware/common/dir_uncached.c @@ -26,6 +26,7 @@ #include "fat.h" #include "dir.h" #include "debug.h" +#include "filefuncs.h" #if ((defined(MEMORYSIZE) && (MEMORYSIZE > 8)) || MEM > 8) #define MAX_OPEN_DIRS 12 diff --git a/firmware/common/file.c b/firmware/common/file.c index b7bcbaba46..a7facc3d32 100644 --- a/firmware/common/file.c +++ b/firmware/common/file.c @@ -26,6 +26,7 @@ #include "dir_uncached.h" #include "debug.h" #include "dircache.h" +#include "filefuncs.h" #include "system.h" /* diff --git a/firmware/common/filefuncs.c b/firmware/common/filefuncs.c new file mode 100644 index 0000000000..ca9113250a --- /dev/null +++ b/firmware/common/filefuncs.c @@ -0,0 +1,52 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 by Björn Stenberg + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#include "config.h" +#include "dir.h" +#include "stdlib.h" +#include "string.h" + +#ifdef HAVE_MULTIVOLUME +/* returns on which volume this is, and copies the reduced name + (sortof a preprocessor for volume-decorated pathnames) */ +int strip_volume(const char* name, char* namecopy) +{ + int volume = 0; + const char *temp = name; + + while (*temp == '/') /* skip all leading slashes */ + ++temp; + + if (*temp && !strncmp(temp, VOL_NAMES, VOL_ENUM_POS)) + { + temp += VOL_ENUM_POS; /* behind special name */ + volume = atoi(temp); /* number is following */ + temp = strchr(temp, '/'); /* search for slash behind */ + if (temp != NULL) + name = temp; /* use the part behind the volume */ + else + name = "/"; /* else this must be the root dir */ + } + + strlcpy(namecopy, name, MAX_PATH); + + return volume; +} +#endif /* #ifdef HAVE_MULTIVOLUME */ diff --git a/firmware/export/filefuncs.h b/firmware/export/filefuncs.h new file mode 100644 index 0000000000..130c5ff4be --- /dev/null +++ b/firmware/export/filefuncs.h @@ -0,0 +1,31 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2009 by Maurus Cuelenaere + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#ifndef __INCLUDE_FILEFUNCS_H_ +#define __INCLUDE_FILEFUNCS_H_ + +#include "config.h" + +#ifdef HAVE_MULTIVOLUME +int strip_volume(const char* name, char* namecopy); +#endif + +#endif /* __INCLUDE_FILEFUNCS_H_ */