mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2024-12-14 04:04:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

make_URI: use vlc_getcwd()

Browse Source 
This lifts the PATH_MAX characters limit, and should fix encoding on
POSIX non-UTF-8 systems.
This commit is contained in:
Rémi Denis-Courmont 2011-07-11 18:49:19 +03:00
parent 5110789433
commit 2e92359b38
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/text/strings.c
View File

@ -47,6 +47,7 @@
#include <vlc_strings.h>
#include <vlc_url.h>
#include <vlc_charset.h>
#include <vlc_fs.h>
#include <libvlc.h>
#include <errno.h>
@ -1129,13 +1130,15 @@ char *make_URI (const char *path, const char *scheme)
else
if (path[0] != DIR_SEP_CHAR)
{ /* Relative path: prepend the current working directory */
char cwd[PATH_MAX];
char *cwd, *ret;
if (getcwd (cwd, sizeof (cwd)) == NULL) /* FIXME: UTF8? */
if ((cwd = vlc_getcwd ()) == NULL)
return NULL;
if (asprintf (&buf, "%s/%s", cwd, path) == -1)
return NULL;
char *ret = make_URI (buf, scheme);
if (asprintf (&buf, "%s"DIR_SEP"%s", cwd, path) == -1)
buf = NULL;
free (cwd);
ret = (buf != NULL) ? make_URI (buf, scheme) : NULL;
free (buf);
return ret;
}