Commit a95aeb489f32fa7e570ecad12fc236f0a0e237a3
2011-09-30T16:55:05
Use git_buf in the git request This is clearer and sidesteps the issue of what the return value of snprintf is on the particular OS we're running on. Signed-off-by: Carlos Martín Nieto <carlos@cmartin.tk>
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 42 43
diff --git a/src/transport_git.c b/src/transport_git.c
index bcc612b..a1c54ca 100644
--- a/src/transport_git.c
+++ b/src/transport_git.c
@@ -35,10 +35,11 @@ typedef struct {
*/
static int gen_proto(char **out, int *outlen, const char *cmd, const char *url)
{
- char *delim, *repo, *ptr;
+ char *delim, *repo;
char default_command[] = "git-upload-pack";
char host[] = "host=";
int len;
+ git_buf buf = GIT_BUF_INIT;
delim = strchr(url, '/');
if (delim == NULL)
@@ -53,17 +54,16 @@ static int gen_proto(char **out, int *outlen, const char *cmd, const char *url)
if (cmd == NULL)
cmd = default_command;
- len = 4 + strlen(cmd) + 1 + strlen(repo) + 1 + strlen(host) + (delim - url) + 2;
+ len = 4 + strlen(cmd) + 1 + strlen(repo) + 1 + strlen(host) + (delim - url) + 1 + 1;
- *out = git__malloc(len);
- if (*out == NULL)
- return GIT_ENOMEM;
+ git_buf_grow(&buf, len);
+
+ git_buf_printf(&buf, "%04x%s %s%c%s", len, cmd, repo, 0, host);
+ git_buf_put(&buf, url, delim - url);
+ git_buf_putc(&buf, '\0');
- *outlen = len - 1;
- ptr = *out;
- memset(ptr, 0x0, len);
- /* We expect the return value to be > len - 1 so don't bother checking it */
- snprintf(ptr, len -1, "%04x%s %s%c%s%s", len - 1, cmd, repo, 0, host, url);
+ *outlen = len;
+ *out = buf.ptr;
return GIT_SUCCESS;
}