summaryrefslogtreecommitdiff
path: root/src/path.c
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2012-04-11 11:52:59 -0700
committerRussell Belfer <rb@github.com>2012-04-11 12:11:35 -0700
commit7784bcbbee972d1f00ea88655a5592fb44ca767d (patch)
tree75926bc03a5f7f072878af8eb3e0e37b7fa66d4f /src/path.c
parent1de77cd31432a1bdff060181c6d9ec25a412a0c2 (diff)
downloadlibgit2-7784bcbbee972d1f00ea88655a5592fb44ca767d.tar.gz
Refactor git_repository_open with new options
Add a new command `git_repository_open_ext` with extended options that control how searching for a repository will be done. The existing `git_repository_open` and `git_repository_discover` are reimplemented on top of it. We may want to change the default behavior of `git_repository_open` but this commit does not do that. Improve support for "gitdir" files where the work dir is separate from the repo and support for the "separate-git-dir" config. Also, add support for opening repos created with `git-new-workdir` script (although I have only confirmed that they can be opened, not that all functions work correctly). There are also a few minor changes that came up: - Fix `git_path_prettify` to allow in-place prettifying. - Fix `git_path_root` to support backslashes on Win32. This fix should help many repo open/discover scenarios - it is the one function called when opening before prettifying the path. - Tweak `git_config_get_string` to set the "out" pointer to NULL if the config value is not found. Allows some other cleanup. - Fix a couple places that should have been calling `git_repository_config__weakptr` and were not. - Fix `cl_git_sandbox_init` clar helper to support bare repos.
Diffstat (limited to 'src/path.c')
-rw-r--r--src/path.c25
1 files changed, 11 insertions, 14 deletions
diff --git a/src/path.c b/src/path.c
index 31d2e72f9..3c1a723ea 100644
--- a/src/path.c
+++ b/src/path.c
@@ -172,20 +172,22 @@ int git_path_root(const char *path)
if (isalpha(path[0]) && (path[1] == ':'))
offset += 2;
- /* Are we dealing with a network path? */
- else if (path[0] == '/' && path[1] == '/') {
+ /* Are we dealing with a windows network path? */
+ else if ((path[0] == '/' && path[1] == '/') ||
+ (path[0] == '\\' && path[1] == '\\'))
+ {
offset += 2;
-
+
/* Skip the computer name segment */
- while (*(path + offset) && *(path + offset) != '/')
+ while (path[offset] && path[offset] != '/' && path[offset] != '\\')
offset++;
}
#endif
- if (*(path + offset) == '/')
+ if (path[offset] == '/' || path[offset] == '\\')
return offset;
- return -1; /* Not a real error. Rather a signal than the path is not rooted */
+ return -1; /* Not a real error - signals that path is not rooted */
}
int git_path_prettify(git_buf *path_out, const char *path, const char *base)
@@ -193,26 +195,21 @@ int git_path_prettify(git_buf *path_out, const char *path, const char *base)
char buf[GIT_PATH_MAX];
assert(path && path_out);
- git_buf_clear(path_out);
/* construct path if needed */
if (base != NULL && git_path_root(path) < 0) {
if (git_buf_joinpath(path_out, base, path) < 0)
return -1;
-
path = path_out->ptr;
}
if (p_realpath(path, buf) == NULL) {
- giterr_set(GITERR_OS, "Failed to resolve path '%s': %s",
- path, strerror(errno));
+ giterr_set(GITERR_OS, "Failed to resolve path '%s'", path);
+ git_buf_clear(path_out);
return (errno == ENOENT) ? GIT_ENOTFOUND : -1;
}
- if (git_buf_sets(path_out, buf) < 0)
- return -1;
-
- return 0;
+ return git_buf_sets(path_out, buf);
}
int git_path_prettify_dir(git_buf *path_out, const char *path, const char *base)