summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-08-01 00:29:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-08-01 07:38:30 (GMT)
commite663674722d8a64a208d8c176d5bfc340c04b964 (patch)
tree65a56b68ff6a1bc7d1eb20ad1b3af9c23c297a10 /dir.c
parente5392c51469c25851f9c6e53165d75fc61901768 (diff)
downloadgit-e663674722d8a64a208d8c176d5bfc340c04b964.zip
git-e663674722d8a64a208d8c176d5bfc340c04b964.tar.gz
git-e663674722d8a64a208d8c176d5bfc340c04b964.tar.bz2
Add functions get_relative_cwd() and is_inside_dir()
The function get_relative_cwd() works just as getcwd(), only that it takes an absolute path as additional parameter, returning the prefix of the current working directory relative to the given path. If the cwd is no subdirectory of the given path, it returns NULL. is_inside_dir() is just a trivial wrapper over get_relative_cwd(). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c38
1 files changed, 38 insertions, 0 deletions
diff --git a/dir.c b/dir.c
index 8d8faf5..b3329f4 100644
--- a/dir.c
+++ b/dir.c
@@ -642,3 +642,41 @@ file_exists(const char *f)
struct stat sb;
return stat(f, &sb) == 0;
}
+
+/*
+ * get_relative_cwd() gets the prefix of the current working directory
+ * relative to 'dir'. If we are not inside 'dir', it returns NULL.
+ * As a convenience, it also returns NULL if 'dir' is already NULL.
+ */
+char *get_relative_cwd(char *buffer, int size, const char *dir)
+{
+ char *cwd = buffer;
+
+ /*
+ * a lazy caller can pass a NULL returned from get_git_work_tree()
+ * and rely on this function to return NULL.
+ */
+ if (!dir)
+ return NULL;
+ if (!getcwd(buffer, size))
+ die("can't find the current directory: %s", strerror(errno));
+
+ if (!is_absolute_path(dir))
+ dir = make_absolute_path(dir);
+
+ while (*dir && *dir == *cwd) {
+ dir++;
+ cwd++;
+ }
+ if (*dir)
+ return NULL;
+ if (*cwd == '/')
+ return cwd + 1;
+ return cwd;
+}
+
+int is_inside_dir(const char *dir)
+{
+ char buffer[PATH_MAX];
+ return get_relative_cwd(buffer, sizeof(buffer), dir) != NULL;
+}