MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-28 08:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #413 from chme/realpath

Browse Source 
[misc] Replace m_realpath with realpath from stdlib.h
This commit is contained in:
ejurgensen 2017-08-12 21:52:30 +02:00 committed by GitHub
commit 2d3d641f41
4 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/httpd.c
View File

@ -1006,7 +1006,7 @@ serve_file(struct evhttp_request *req, char *uri)
}
else if (S_ISLNK(sb.st_mode))
{
deref = m_realpath(path);
deref = realpath(path, NULL);
if (!deref)
{
DPRINTF(E_LOG, L_HTTPD, "Could not dereference %s: %s\n", path, strerror(errno));

2
src/library/filescanner.c
View File

@ -909,7 +909,7 @@ bulk_scan(int flags)
parent_id = process_parent_directories(path);
deref = m_realpath(path);
deref = realpath(path, NULL);
if (!deref)
{
DPRINTF(E_LOG, L_SCAN, "Skipping library directory %s, could not dereference: %s\n", path, strerror(errno));

21
src/misc.c
View File

@ -512,27 +512,6 @@ keyval_sort(struct keyval *kv)
}
char *
m_realpath(const char *pathname)
{
char buf[PATH_MAX];
char *ret;
ret = realpath(pathname, buf);
if (!ret)
return NULL;
ret = strdup(buf);
if (!ret)
{
DPRINTF(E_LOG, L_MISC, "Out of memory for realpath\n");
return NULL;
}
return ret;
}
char **
m_readfile(const char *path, int num_lines)
{

3
src/misc.h
View File

@ -77,9 +77,6 @@ void
keyval_sort(struct keyval *kv);
char *
m_realpath(const char *pathname);
char **
m_readfile(const char *path, int num_lines);