Commit 662f90e6ecb6ad0576de89d0af8872eab678eb79
2014-07-13T16:08:46
Move p_realpath logic to realpath.c
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60
diff --git a/src/unix/posix.h b/src/unix/posix.h
index 0c8732a..c428384 100644
--- a/src/unix/posix.h
+++ b/src/unix/posix.h
@@ -26,18 +26,12 @@ typedef int GIT_SOCKET;
#define p_unlink(p) unlink(p)
#define p_mkdir(p,m) mkdir(p, m)
#define p_fsync(fd) fsync(fd)
+extern char *p_realpath(const char *, char *);
#define p_recv(s,b,l,f) recv(s,b,l,f)
#define p_send(s,b,l,f) send(s,b,l,f)
#define p_inet_pton(a, b, c) inet_pton(a, b, c)
-/* The OpenBSD realpath function behaves differently */
-#if !defined(__OpenBSD__)
-# define p_realpath(p, po) realpath(p, po)
-#else
-char *p_realpath(const char *, char *);
-#endif
-
#define p_vsnprintf(b, c, f, a) vsnprintf(b, c, f, a)
#define p_snprintf(b, c, f, ...) snprintf(b, c, f, __VA_ARGS__)
#define p_mkstemp(p) mkstemp(p)
diff --git a/src/unix/realpath.c b/src/unix/realpath.c
index 15601bd..2e49150 100644
--- a/src/unix/realpath.c
+++ b/src/unix/realpath.c
@@ -6,7 +6,7 @@
*/
#include <git2/common.h>
-#ifdef __OpenBSD__
+#ifndef GIT_WIN32
#include <limits.h>
#include <stdlib.h>
@@ -16,15 +16,16 @@
char *p_realpath(const char *pathname, char *resolved)
{
char *ret;
-
if ((ret = realpath(pathname, resolved)) == NULL)
return NULL;
- /* Figure out if the file exists */
- if (!access(ret, F_OK))
- return ret;
-
- return NULL;
+#ifdef __OpenBSD__
+ /* The OpenBSD realpath function behaves differently,
+ * figure out if the file exists */
+ if (access(ret, F_OK) < 0)
+ ret = NULL;
+#endif
+ return ret;
}
#endif