Merge remote-tracking branch 'origin/master' into my_master

Conflicts:
	command.c
	mp_core.h
	mplayer.c
	screenshot.c

1 files changed, 16 insertions, 2 deletions

diff --git a/path.c b/path.c
index b99d694df5..b6b87d4e9b 100644
--- a/path.c
+++ b/path.c
@@ -27,14 +27,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include "config.h"
 #include "mp_msg.h"
 #include "path.h"
 
 #ifdef CONFIG_MACOSX_BUNDLE
 #include <CoreFoundation/CoreFoundation.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <unistd.h>
 #elif defined(__MINGW32__)
 #include <windows.h>
@@ -46,6 +47,7 @@
 #include "talloc.h"
 
 #include "osdep/osdep.h"
+#include "osdep/io.h"
 
 char *get_path(const char *filename){
 	char *homedir;
@@ -232,3 +234,15 @@ char *mp_path_join(void *talloc_ctx, struct bstr p1, struct bstr p2)
     return talloc_asprintf(talloc_ctx, "%.*s%s%.*s", BSTR_P(p1),
                            have_separator ? "" : "/", BSTR_P(p2));
 }
+
+bool mp_path_exists(const char *path)
+{
+    struct stat st;
+    return mp_stat(path, &st) == 0;
+}
+
+bool mp_path_isdir(const char *path)
+{
+    struct stat st;
+    return mp_stat(path, &st) == 0 && S_ISDIR(st.st_mode);
+}