diff options
| author | wm4 <wm4@mplayer2.org> | 2012-03-16 18:57:23 +0100 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-03-16 19:14:44 +0100 |
| commit | 6de8120822c2dd9c50ef23b4977421651396f1ae (patch) | |
| tree | 11a977608cfc9f50cffbce4a879dd8e9b33b029c /stream/stream_cddb.c | |
| parent | 0eb21226cbfdd200f2aea5d3a9db2cdbff4773a5 (diff) | |
| parent | a8168102668337f3c11619bea7e744fc245adff1 (diff) | |
| download | mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.bz2 mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.xz | |
Merge remote-tracking branch 'origin/master' into my_master
Conflicts:
command.c
mp_core.h
mplayer.c
screenshot.c
Diffstat (limited to 'stream/stream_cddb.c')
| -rw-r--r-- | stream/stream_cddb.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/stream/stream_cddb.c b/stream/stream_cddb.c index afc512e5b7..aab557ab86 100644 --- a/stream/stream_cddb.c +++ b/stream/stream_cddb.c @@ -36,11 +36,8 @@ #include <unistd.h> #include <string.h> #include <limits.h> +#include "osdep/io.h" #if defined(__MINGW32__) || defined(__CYGWIN__) -#ifdef __MINGW32__ -#include <path.h> -#define mkdir(a,b) mkdir(a) -#endif #include <windows.h> #if HAVE_WINSOCK2_H #include <winsock2.h> @@ -53,6 +50,7 @@ #include <sys/stat.h> #include "mp_msg.h" +#include "path.h" #if defined(__linux__) #include <linux/cdrom.h> @@ -472,7 +470,6 @@ static int cddb_read_cache(cddb_data_t *cddb_data) static int cddb_write_cache(cddb_data_t *cddb_data) { // We have the file, save it for cache. - struct stat file_stat; char file_name[100]; int file_fd, ret; int wrote = 0; @@ -481,8 +478,7 @@ static int cddb_write_cache(cddb_data_t *cddb_data) return -1; // Check if the CDDB cache dir exist - ret = stat(cddb_data->cache_dir, &file_stat); - if (ret < 0) { + if (!mp_path_exists(cddb_data->cache_dir)) { // Directory not present, create it. ret = mkdir(cddb_data->cache_dir, 0755); #ifdef __MINGW32__ |