From e3e46cdbd45c2e7383df9de1787e23489dc66dbc Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Sun, 28 Oct 2012 17:16:22 +0100 Subject: [PATCH] Introduce new function real_path_if_valid() The function is like real_path(), except that it returns NULL on error instead of dying. Signed-off-by: Michael Haggerty Signed-off-by: Jeff King --- abspath.c | 5 +++++ cache.h | 1 + 2 files changed, 6 insertions(+) diff --git a/abspath.c b/abspath.c index f8a526f39..40cdc4621 100644 --- a/abspath.c +++ b/abspath.c @@ -153,6 +153,11 @@ const char *real_path(const char *path) return real_path_internal(path, 1); } +const char *real_path_if_valid(const char *path) +{ + return real_path_internal(path, 0); +} + static const char *get_pwd_cwd(void) { static char cwd[PATH_MAX + 1]; diff --git a/cache.h b/cache.h index a58df84bd..b0d75bcb0 100644 --- a/cache.h +++ b/cache.h @@ -714,6 +714,7 @@ static inline int is_absolute_path(const char *path) } int is_directory(const char *); const char *real_path(const char *path); +const char *real_path_if_valid(const char *path); const char *absolute_path(const char *path); const char *relative_path(const char *abs, const char *base); int normalize_path_copy(char *dst, const char *src); -- 2.26.2