[PATCH v4 3/8] Introduce new function real_path_if_valid()
From: Michael Haggerty <hidden>
Date: 2016-06-15 22:55:08
Subsystem:
the rest · Maintainer:
Linus Torvalds
The function is like real_path(), except that it returns NULL on error instead of dying. Signed-off-by: Michael Haggerty <redacted> --- abspath.c | 5 +++++ cache.h | 1 + 2 files changed, 6 insertions(+)
diff --git a/abspath.c b/abspath.c
index f8a526f..40cdc46 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 a58df84..b0d75bc 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);
--
1.8.0