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

path: removed pathcpy_trunc() 

There was only one user of pathcpy_trunc(), which can be eliminated.
This commit is contained in:
Max Kellermann 2008-10-20 22:18:42 +02:00
parent 49260e6db2
commit 1d385190a0
3 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/decoder_thread.c
View File

@ -39,11 +39,8 @@ static void decodeStart(void)
if (song_is_file(song))
map_song_fs(song, path_max_fs);
else {
char path_max_utf8[MPD_PATH_MAX];
song_get_url(song, path_max_utf8);
pathcpy_trunc(path_max_fs, path_max_utf8);
}
else
song_get_url(song, path_max_fs);
dc.current_song = dc.next_song; /* NEED LOCK */
if (openInputStream(&inStream, path_max_fs) < 0) {

13
src/path.c
View File

@ -189,19 +189,6 @@ char *rpp2app_r(char *dst, const char *rel_path)
return dst;
}
/* 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
* error reporting and such */
void pathcpy_trunc(char *dest, const char *src)
{
size_t len = strlen(src);
if (mpd_unlikely(len >= MPD_PATH_MAX))
len = MPD_PATH_MAX - 1;
memcpy(dest, src, len);
dest[len] = '\0';
}
char *sanitizePathDup(const char *path)
{
int len = strlen(path) + 1;

6
src/path.h
View File

@ -61,12 +61,6 @@ char *rpp2app_r(char *dst, const char *rel_path);
/* strips extra "///" and leading "/" and trailing "/" */
char *sanitizePathDup(const char *path);
/* 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
* error reporting and such.
* dest must be MPD_PATH_MAX bytes large (which is standard in mpd) */
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