projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hash-object: work within subdirectory.
[git.git]
/
connect.c
diff --git
a/connect.c
b/connect.c
index
a4d6d35
..
93f6f80
100644
(file)
--- a/
connect.c
+++ b/
connect.c
@@
-427,7
+427,7
@@
static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
memset(&sa, 0, sizeof sa);
sa.sin_family = he->h_addrtype;
sa.sin_port = htons(nport);
memset(&sa, 0, sizeof sa);
sa.sin_family = he->h_addrtype;
sa.sin_port = htons(nport);
- memcpy(&sa.sin_addr, ap, he->h_length);
+ memcpy(&sa.sin_addr,
*
ap, he->h_length);
if (connect(sockfd, (struct sockaddr *)&sa, sizeof sa) < 0) {
close(sockfd);
if (connect(sockfd, (struct sockaddr *)&sa, sizeof sa) < 0) {
close(sockfd);
@@
-455,6
+455,10
@@
static int rhost_len;
static int git_proxy_command_options(const char *var, const char *value)
{
if (!strcmp(var, "core.gitproxy")) {
static int git_proxy_command_options(const char *var, const char *value)
{
if (!strcmp(var, "core.gitproxy")) {
+ const char *for_pos;
+ int matchlen = -1;
+ int hostlen;
+
if (git_proxy_command)
return 0;
/* [core]
if (git_proxy_command)
return 0;
/* [core]
@@
-463,10
+467,7
@@
static int git_proxy_command_options(const char *var, const char *value)
* gitproxy = netcatter-2 for sample.xz
* gitproxy = netcatter-default
*/
* gitproxy = netcatter-2 for sample.xz
* gitproxy = netcatter-default
*/
- const char *for_pos = strstr(value, " for ");
- int matchlen = -1;
- int hostlen;
-
+ for_pos = strstr(value, " for ");
if (!for_pos)
/* matches everybody */
matchlen = strlen(value);
if (!for_pos)
/* matches everybody */
matchlen = strlen(value);