Skip to content

Commit

Permalink
Introduce new function real_path_if_valid()
Browse files Browse the repository at this point in the history
The function is like real_path(), except that it returns NULL on error
instead of dying.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Jeff King <peff@peff.net>
  • Loading branch information
mhagger authored and peff committed Oct 29, 2012
1 parent d6052ab commit e3e46cd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
5 changes: 5 additions & 0 deletions abspath.c
Expand Up @@ -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];
Expand Down
1 change: 1 addition & 0 deletions cache.h
Expand Up @@ -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);
Expand Down

0 comments on commit e3e46cd

Please sign in to comment.