Test return value of finish_connect()

Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/fetch-pack.c b/fetch-pack.c
index 377feded1ccafdece86499d1917d297145fd28ac..1b4d8272dce834d10b16ecbcea7ae2fa974fc856 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -519,7 +519,7 @@ int main(int argc, char **argv)
        ret = fetch_pack(fd, nr_heads, heads);
        close(fd[0]);
        close(fd[1]);
        ret = fetch_pack(fd, nr_heads, heads);
        close(fd[0]);
        close(fd[1]);

-       finish_connect(pid);
+       ret |= finish_connect(pid);

 
        if (!ret && nr_heads) {
                /* If the heads to pull were given, we should have
 
        if (!ret && nr_heads) {
                /* If the heads to pull were given, we should have


@@ -534,5 +534,5 @@ int main(int argc, char **argv)
                        }
        }
 
                        }
        }
 

-       return ret;
+       return !!ret;

 }
 }

diff --git a/peek-remote.c b/peek-remote.c
index 87f1543fec05e88fd1bc554740993397f0aa3807..353da002b4c7632ed66c1b3ceacaa985ec137627 100644 (file)
--- a/peek-remote.c
+++ b/peek-remote.c
@@ -66,6 +66,6 @@ int main(int argc, char **argv)
        ret = peek_remote(fd, flags);
        close(fd[0]);
        close(fd[1]);
        ret = peek_remote(fd, flags);
        close(fd[0]);
        close(fd[1]);

-       finish_connect(pid);
-       return ret;
+       ret |= finish_connect(pid);
+       return !!ret;

 }
 }

diff --git a/send-pack.c b/send-pack.c
index ac4501d34154301030cf98ff122eb233095417b7..5172ef8be82daf88b19c976ce88463f8b647d933 100644 (file)
--- a/send-pack.c
+++ b/send-pack.c
@@ -408,6 +408,6 @@ int main(int argc, char **argv)
        ret = send_pack(fd[0], fd[1], nr_heads, heads);
        close(fd[0]);
        close(fd[1]);
        ret = send_pack(fd[0], fd[1], nr_heads, heads);
        close(fd[0]);
        close(fd[1]);

-       finish_connect(pid);
-       return ret;
+       ret |= finish_connect(pid);
+       return !!ret;

 }
 }