From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: gitster@pobox.com, git@vger.kernel.org, matled@gmx.net
Subject: [PATCH 2/9] Add functions get_relative_cwd() and is_inside_dir()
Date: Mon, 30 Jul 2007 00:24:24 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0707300024150.14781@racer.site> (raw)
In-Reply-To: <Pine.LNX.4.64.0707300016470.14781@racer.site>
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>
---
dir.c | 30 ++++++++++++++++++++++++++++++
dir.h | 3 +++
2 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/dir.c b/dir.c
index 8d8faf5..ef67d6f 100644
--- a/dir.c
+++ b/dir.c
@@ -642,3 +642,33 @@ file_exists(const char *f)
struct stat sb;
return stat(f, &sb) == 0;
}
+
+char *get_relative_cwd(char *buffer, int size, const char *dir)
+{
+ char *cwd = buffer;
+
+ if (!dir)
+ return 0;
+
+ if (!getcwd(buffer, size))
+ return 0;
+
+ 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;
+}
diff --git a/dir.h b/dir.h
index ec0e8ab..f55a87b 100644
--- a/dir.h
+++ b/dir.h
@@ -61,4 +61,7 @@ extern void add_exclude(const char *string, const char *base,
extern int file_exists(const char *);
extern struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathname, int len);
+extern char *get_relative_cwd(char *buffer, int size, const char *dir);
+extern int is_inside_dir(const char *dir);
+
#endif
--
1.5.3.rc3.28.g1406
next prev parent reply other threads:[~2007-07-29 23:24 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-29 23:23 [PATCH 0/9] work-tree clean ups Johannes Schindelin
2007-07-29 23:24 ` [PATCH 1/9] Add is_absolute_path() and make_absolute_path() Johannes Schindelin
2007-07-29 23:24 ` Johannes Schindelin [this message]
2007-07-29 23:24 ` [PATCH 3/9] white space fixes in setup.c Johannes Schindelin
2007-07-29 23:25 ` [PATCH 4/9] Clean up work-tree handling Johannes Schindelin
2007-07-29 23:25 ` [PATCH 5/9] Add set_git_dir() function Johannes Schindelin
2007-07-29 23:25 ` [PATCH 6/9] work-trees are allowed inside a git-dir Johannes Schindelin
2007-07-29 23:25 ` [PATCH 7/9] init: use get_git_work_tree() instead of rolling our own Johannes Schindelin
2007-07-29 23:26 ` [PATCH 8/9] Fix t1501 for updated work-tree logic Johannes Schindelin
2007-07-29 23:26 ` [PATCH 9/9] Fix t1500 for sane work-tree behavior Johannes Schindelin
2007-07-29 23:29 ` [UNWANTED PATCH] Die if core.bare = true and core.worktree is set Johannes Schindelin
2007-08-01 0:28 ` [PATCH 0/9] work-tree clean ups Johannes Schindelin
2007-08-01 0:28 ` [PATCH 1/4] Add is_absolute_path() and make_absolute_path() Johannes Schindelin
2007-08-01 0:29 ` [PATCH 2/4] Add functions get_relative_cwd() and is_inside_dir() Johannes Schindelin
2007-08-01 4:22 ` Junio C Hamano
2007-08-01 5:35 ` Junio C Hamano
2007-08-01 11:38 ` Johannes Schindelin
2007-08-01 15:26 ` [NOT-SERIOUS PATCH] Make get_relative_cwd() not accept NULL for a directory Johannes Schindelin
2007-08-01 16:58 ` Junio C Hamano
2007-08-01 18:26 ` [PATCH] get_relative_cwd(): clarify why it handles dir == NULL Johannes Schindelin
2007-08-01 0:29 ` [PATCH 3/4] Add set_git_dir() function Johannes Schindelin
2007-08-01 0:30 ` [PATCH 4/4] Clean up work-tree handling Johannes Schindelin
2007-08-01 5:17 ` Junio C Hamano
2007-08-01 11:46 ` Johannes Schindelin
2007-08-02 7:04 ` Junio C Hamano
2007-08-01 8:59 ` Junio C Hamano
2007-08-01 11:53 ` Johannes Schindelin
2007-08-01 0:55 ` [PATCH 0/9] work-tree clean ups Junio C Hamano
2007-08-01 1:13 ` Johannes Schindelin
2007-08-01 10:56 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0707300024150.14781@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=matled@gmx.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).