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

Make utf8_to_fs_playlist_path universally accessible

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@7115 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Eric Wong 2008-01-01 10:07:34 +00:00
parent 49f8660f35
commit 47efe42321
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/path.c
View File

@ -22,6 +22,7 @@
#include "conf.h" #include "conf.h"
#include "utf8.h" #include "utf8.h"
#include "utils.h" #include "utils.h"
#include "playlist.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -278,3 +279,10 @@ char *sanitizePathDup(char *path)
return xrealloc(ret, len + 1); return xrealloc(ret, len + 1);
} }
void utf8_to_fs_playlist_path(char *path_max_tmp, const char *utf8path)
{
utf8_to_fs_charset(path_max_tmp, (char *)utf8path);
rpp2app_r(path_max_tmp, path_max_tmp);
strncat(path_max_tmp, "." PLAYLIST_FILE_SUFFIX, MPD_PATH_MAX - 1);
}

8
src/path.h
View File

@ -75,7 +75,13 @@ char *sanitizePathDup(char *path);
/* this is actually like strlcpy (OpenBSD), but we don't actually want to /* this is actually like strlcpy (OpenBSD), but we don't actually want to
* blindly use it everywhere, only for paths that are OK to truncate (for * blindly use it everywhere, only for paths that are OK to truncate (for
* error reporting and such. * error reporting and such.
* dest must be MAXPATHLEN+1 bytes large (which is standard in mpd) */ * dest must be MPD_PATH_MAX bytes large (which is standard in mpd) */
void pathcpy_trunc(char *dest, const char *src); void pathcpy_trunc(char *dest, const char *src);
/*
* converts a path passed from a client into an absolute FS path.
* paths passed by clients do NOT have file suffixes in them
*/
void utf8_to_fs_playlist_path(char *path_max_tmp, const char *utf8path);
#endif #endif

11
src/storedPlaylist.c
View File

@ -52,17 +52,6 @@ static int valid_playlist_name(int err_fd, const char *utf8path)
return 1; return 1;
} }
/*
* converts a path passed from a client into an absolute, FS path
* paths passed by clients do NOT have file suffixes in them
*/
static void utf8_to_fs_playlist_path(char *path_max_tmp, const char *utf8path)
{
utf8_to_fs_charset(path_max_tmp, (char *)utf8path);
rpp2app_r(path_max_tmp, path_max_tmp);
strncat(path_max_tmp, "." PLAYLIST_FILE_SUFFIX, MPD_PATH_MAX - 1);
}
static unsigned int lengthOfStoredPlaylist(StoredPlaylist *sp) static unsigned int lengthOfStoredPlaylist(StoredPlaylist *sp)
{ {
return sp->list->numberOfNodes; return sp->list->numberOfNodes;