From: Stefan Beller <sbeller@google.com>
To: sbeller@google.com, git@vger.kernel.org
Cc: gitster@pobox.com, jens.lehmann@web.de, j6t@kdbg.org
Subject: [PATCHv2] Porting resolve_relative_url from shell to C
Date: Wed, 16 Dec 2015 16:26:38 -0800 [thread overview]
Message-ID: <1450311999-3992-1-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1449709654-30189-1-git-send-email-sbeller@google.com>
A new version of the patch, which spells out more its intent and
may actually work in Windows.
Any comment welcome,
Thanks,
Stefan
Stefan Beller (1):
submodule: Port resolve_relative_url from shell to C
builtin/submodule--helper.c | 151 ++++++++++++++++++++++++++++++++++++++++++++
git-submodule.sh | 81 ++----------------------
2 files changed, 155 insertions(+), 77 deletions(-)
interdiff to previous version:
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index f48b5b5..b925bed 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -31,6 +31,36 @@ static const char *get_default_remote(void)
return xstrdup(dest);
}
+static int has_same_dir_prefix(const char *str, const char **out)
+{
+#ifdef GIT_WINDOWS_NATIVE
+ return skip_prefix(str, "./", out)
+ || skip_prefix(str, ".\\", out);
+#else
+ return skip_prefix(str, "./", out);
+#endif
+}
+
+static int has_upper_dir_prefix(const char *str, const char **out)
+{
+#ifdef GIT_WINDOWS_NATIVE
+ return skip_prefix(str, "../", out)
+ || skip_prefix(str, "..\\", out);
+#else
+ return skip_prefix(str, "../", out);
+#endif
+}
+
+static char *last_dir_separator(const char *str)
+{
+#ifdef GIT_WINDOWS_NATIVE
+ return strrchr(str, "/")
+ || strrchr(str, "\\");
+#else
+ return strrchr(str, '/');
+#endif
+}
+
/*
* The function takes at most 2 arguments. The first argument is the
* URL that navigates to the submodule origin repo. When relative, this URL
@@ -64,13 +94,14 @@ static const char *relative_url(const char *url, const char *up_path)
/* the repository is its own authoritative upstream */
remoteurl = xgetcwd();
- if (strip_suffix(remoteurl, "/", &len))
+ len = strlen(remoteurl);
+ if (is_dir_sep(remoteurl[len]))
remoteurl[len] = '\0';
- if (strchr(remoteurl, ':') || skip_prefix(remoteurl, "/", &out))
+ if (strchr(remoteurl, ':') || is_dir_sep(*remoteurl))
is_relative = 0;
- else if (skip_prefix(remoteurl, "./", &out) ||
- skip_prefix(remoteurl, "../", &out))
+ else if (has_same_dir_prefix(remoteurl, &out) ||
+ has_upper_dir_prefix(remoteurl, &out))
is_relative = 1;
else {
is_relative = 1;
@@ -80,11 +111,11 @@ static const char *relative_url(const char *url, const char *up_path)
}
while (url) {
- if (skip_prefix(url, "../", &out)) {
+ if (has_upper_dir_prefix(url, &out)) {
char *rfind;
url = out;
- rfind = strrchr(remoteurl, '/');
+ rfind = last_dir_separator(remoteurl);
if (rfind)
*rfind = '\0';
else {
@@ -99,7 +130,7 @@ static const char *relative_url(const char *url, const char *up_path)
remoteurl = ".";
}
}
- } else if (skip_prefix(url, "./", &out))
+ } else if (has_same_dir_prefix(url, &out))
url = out;
else
break;
@@ -107,7 +138,7 @@ static const char *relative_url(const char *url, const char *up_path)
strbuf_reset(&sb);
strbuf_addf(&sb, "%s%s%s", remoteurl, sep, url);
- if (!skip_prefix(sb.buf, "./", &out))
+ if (!has_same_dir_prefix(sb.buf, &out))
out = sb.buf;
out = xstrdup(out);
--
2.7.0.rc1.2.gfc39790.dirty
next prev parent reply other threads:[~2015-12-17 0:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-10 1:07 [PATCH] submodule: Port resolve_relative_url from shell to C Stefan Beller
2015-12-10 6:48 ` Johannes Sixt
2015-12-16 22:36 ` Stefan Beller
2015-12-17 0:26 ` Stefan Beller [this message]
2015-12-17 7:47 ` [PATCHv2] Porting " Torsten Bögershausen
2015-12-17 0:26 ` [PATCHv2] submodule: Port " Stefan Beller
2015-12-17 8:17 ` Eric Sunshine
2015-12-17 18:55 ` Johannes Sixt
2015-12-17 19:17 ` Johannes Sixt
2015-12-18 3:27 ` Jeff King
2016-01-11 20:17 ` Stefan Beller
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1450311999-3992-1-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=jens.lehmann@web.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).