[PATCH 1/5] add open_nofollow() helper
- From
Jeff King <peff@peff.net>
- Date
- Nov 2, 2016, 13:06 UTC
- Message-ID
- <20161102130629.ijpugqeawbkj3s57@sigill.intra.peff.net>
- In-Reply-To
- <20161102130432.d3zprdul4sqgcfwu@sigill.intra.peff.net>
Some callers of open() would like to optionally use O_NOFOLLOW, but it is not available on all platforms. We could abstract this by publicly defining O_NOFOLLOW to 0 on those platforms, but that leaves us no room for any workarounds (e.g., by checking the file type via lstat()).
Instead, let's abstract it into its own function. We don't implement any workarounds here, but it it would be easy to add them later.
Signed-off-by: Jeff King <peff@peff.net> --- I didn't add the workaround because I think the current callers are OK with "best effort", and doing it non-racily is quite tricky (though we might also be OK with a racy version; we are not trying to beat /tmp races, but just making sure a checkout that we did is sane).
git-compat-util.h | 3 +++ wrapper.c | 8 ++++++++ 2 files changed, 11 insertions(+)
diff --git a/git-compat-util.h b/git-compat-util.h index 87237b092..a2cc33ebc 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -1080,6 +1080,9 @@ int access_or_die(const char *path, int mode, unsigned flag); /* Warn on an inaccessible file that ought to be accessible */ void warn_on_inaccessible(const char *path); +/* Open with O_NOFOLLOW, if available on this platform */ +int open_nofollow(const char *path, int flags); + #ifdef GMTIME_UNRELIABLE_ERRORS struct tm *git_gmtime(const time_t *); struct tm *git_gmtime_r(const time_t *, struct tm *); diff --git a/wrapper.c b/wrapper.c index e7f197996..6bc7f24f5 100644 --- a/wrapper.c +++ b/wrapper.c @@ -679,3 +679,11 @@ void sleep_millisec(int millisec) { poll(NULL, 0, millisec); } + +#ifndef O_NOFOLLOW +#define O_NOFOLLOW 0 +#endif +int open_nofollow(const char *path, int flags) +{ + return open(path, flags | O_NOFOLLOW); +}
-- 2.11.0.rc0.258.gf434c15