Commit 09f630849f5a9cc540b1289cdd7a034b171fa7d4
2020-03-20T15:33:01
use one consistent way to compute the Git URL to write to the config file
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
diff --git a/got/got.c b/got/got.c
index 9d94bcc..7436614 100644
--- a/got/got.c
+++ b/got/got.c
@@ -944,17 +944,19 @@ cmd_clone(int argc, char *argv[])
if (error)
goto done;
+ if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
+ host, port ? ":" : "", port ? port : "",
+ server_path[0] != '/' ? "/" : "", server_path) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
if (strcmp(proto, "git") == 0) {
#ifndef PROFILE
if (pledge("stdio rpath wpath cpath fattr flock proc exec "
"sendfd dns inet unveil", NULL) == -1)
err(1, "pledge");
#endif
- git_url = strdup(argv[0]);
- if (git_url == NULL) {
- error = got_error_from_errno("strdup");
- goto done;
- }
} else if (strcmp(proto, "git+ssh") == 0 ||
strcmp(proto, "ssh") == 0) {
#ifndef PROFILE
@@ -962,11 +964,6 @@ cmd_clone(int argc, char *argv[])
"sendfd unveil", NULL) == -1)
err(1, "pledge");
#endif
- if (asprintf(&git_url, "ssh://%s:%s/%s", host, port,
- server_path) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
} else if (strcmp(proto, "http") == 0 ||
strcmp(proto, "git+http") == 0) {
error = got_error_path(proto, GOT_ERR_NOT_IMPL);