diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-15 21:45:29 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-15 21:45:29 +0000 |
commit | fa344d6f7dc2ea771814828989c4e04d62ee5764 (patch) | |
tree | 432e8e5f7e15d73448e305456e73e2091888491d | |
parent | 04f628f283376826f0e6f097d77611e044b42d4e (diff) | |
download | mpv-fa344d6f7dc2ea771814828989c4e04d62ee5764.tar.bz2 mpv-fa344d6f7dc2ea771814828989c4e04d62ee5764.tar.xz |
fallback to USERPROFILE environment variable for caching CSS keys when
HOME is not set (for MinGW builds running outside of MinGW).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18110 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libmpdvdkit2/libdvdcss.c | 4 | ||||
-rw-r--r-- | libmpdvdkit2/libdvdcss_changes.diff | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/libmpdvdkit2/libdvdcss.c b/libmpdvdkit2/libdvdcss.c index 524c098656..6dc28514a7 100644 --- a/libmpdvdkit2/libdvdcss.c +++ b/libmpdvdkit2/libdvdcss.c @@ -301,6 +301,10 @@ extern dvdcss_t dvdcss_open ( char *psz_target ) { psz_home = getenv( "HOME" ); } + if( psz_home == NULL ) + { + psz_home = getenv( "USERPROFILE" ); + } /* Cache our keys in ${HOME}/.dvdcss/ */ if( psz_home ) diff --git a/libmpdvdkit2/libdvdcss_changes.diff b/libmpdvdkit2/libdvdcss_changes.diff index 9b719c395a..3ebb25950a 100644 --- a/libmpdvdkit2/libdvdcss_changes.diff +++ b/libmpdvdkit2/libdvdcss_changes.diff @@ -70,3 +70,14 @@ #include "common.h" #include "css.h" +@@ -301,6 +301,10 @@ + { + psz_home = getenv( "HOME" ); + } ++ if( psz_home == NULL ) ++ { ++ psz_home = getenv( "USERPROFILE" ); ++ } + + /* Cache our keys in ${HOME}/.dvdcss/ */ + if( psz_home ) |