projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'jc/maint-log-grep-all-match-1' into maint
[git.git]
/
git-compat-util.h
diff --git
a/git-compat-util.h
b/git-compat-util.h
index 5bd9ad7d2a23773b1410ded9f4f241ebe4d4da00..000042d79352b4a7bb789d60e5324af92f29871a 100644
(file)
--- a/
git-compat-util.h
+++ b/
git-compat-util.h
@@
-153,6
+153,15
@@
#endif
#endif
#endif
#endif
+/* used on Mac OS X */
+#ifdef PRECOMPOSE_UNICODE
+#include "compat/precompose_utf8.h"
+#else
+#define precompose_str(in,i_nfd2nfc)
+#define precompose_argv(c,v)
+#define probe_utf8_pathname_composition(a,b)
+#endif
+
#ifndef NO_LIBGEN_H
#include <libgen.h>
#else
#ifndef NO_LIBGEN_H
#include <libgen.h>
#else
@@
-595,6
+604,12
@@
int rmdir_or_warn(const char *path);
*/
int remove_or_warn(unsigned int mode, const char *path);
*/
int remove_or_warn(unsigned int mode, const char *path);
+/* Call access(2), but warn for any error besides ENOENT. */
+int access_or_warn(const char *path, int mode);
+
+/* Warn on an inaccessible file that ought to be accessible */
+void warn_on_inaccessible(const char *path);
+
/* Get the passwd entry for the UID of the current process. */
struct passwd *xgetpwuid_self(void);
/* Get the passwd entry for the UID of the current process. */
struct passwd *xgetpwuid_self(void);