Merge branch 'maint'

diff --git a/git-compat-util.h b/git-compat-util.h
index b2e18954c03ff502053cb74d142faab7d2a8dacb..0272d043d0b82dc6ad0ff4836fe8db8ed1e1d960 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -26,6 +26,13 @@
 #include <sys/types.h>
 #include <dirent.h>
 
+/* On most systems <limits.h> would have given us this, but
+ * not on some systems (e.g. GNU/Hurd).
+ */
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
 #ifdef __GNUC__
 #define NORETURN __attribute__((__noreturn__))
 #else
@@ -84,6 +91,14 @@ extern char *gitstrcasestr(const char *haystack, const char *needle);
 extern size_t gitstrlcpy(char *, const char *, size_t);
 #endif
 
+static inline char* xstrdup(const char *str)
+{
+       char *ret = strdup(str);
+       if (!ret)
+               die("Out of memory, strdup failed");
+       return ret;
+}
+
 static inline void *xmalloc(size_t size)
 {
        void *ret = malloc(size);
@@ -172,7 +187,4 @@ static inline int sane_case(int x, int high)
        return x;
 }
 
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 256
-#endif
 #endif