diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-07-17 16:50:59 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-07-17 16:50:59 +0100 |
| commit | 35b16971490c92f53cb5264e68ba67fb7352629a (patch) | |
| tree | 5a17a0bc2f6abfae1d802e094c07b5b72aaa6d00 /src/xine-utils/utils.c | |
| parent | b70e34352e304cf03da32b688d84eec3c3ffacec (diff) | |
| parent | f1382ea01b368dc1d8044b368f602aad87f6468e (diff) | |
| download | xine-lib-35b16971490c92f53cb5264e68ba67fb7352629a.tar.gz xine-lib-35b16971490c92f53cb5264e68ba67fb7352629a.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/xine-engine/buffer.h => include/xine/buffer.h
rename : src/demuxers/demux_nsf.c => src/combined/nsf_demuxer.c
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libspucmml/xine_cmml_decoder.c => src/spu_dec/cmml_decoder.c
rename : src/libspudec/xine_spu_decoder.c => src/spu_dec/spu_decoder.c
rename : src/libspudvb/xine_spudvb_decoder.c => src/spu_dec/spudvb_decoder.c
rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_decoder.c
rename : src/libsputext/demux_sputext.c => src/spu_dec/sputext_demuxer.c
Diffstat (limited to 'src/xine-utils/utils.c')
| -rw-r--r-- | src/xine-utils/utils.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c index 8b01bd52b..8a9774b3d 100644 --- a/src/xine-utils/utils.c +++ b/src/xine-utils/utils.c @@ -415,11 +415,8 @@ const char *xine_get_pluginroot(void) { static char pluginroot[1024] = {0, }; if (!pluginroot[0]) { - char *sep, *sep2; - strcpy (pluginroot, xine_get_plugindir ()); - sep = strrchr (pluginroot, '/'); - sep2 = strrchr (pluginroot, '\\'); - *(sep < sep2 ? sep : sep2) = 0; + xine_get_rootdir(pluginroot, sizeof(pluginroot) - strlen(XINE_REL_PLUGINROOT) - 1); + strcat(pluginroot, XINE_DIRECTORY_SEPARATOR_STRING XINE_REL_PLUGINROOT); } return pluginroot; |