[PATCH v2 2/4] archive: use packet_reader for communications

[Josh Steadmon]

Using packet_reader will simplify version detection and capability
handling, which will make implementation of protocol v2 support in
git-archive easier.

This refactoring does not change the behavior of "git archive".

Signed-off-by: Josh Steadmon 
---
 builtin/archive.c | 23 ++-
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/builtin/archive.c b/builtin/archive.c
index e74f675390..4eb547c5b7 100644
--- a/builtin/archive.c
+++ b/builtin/archive.c
@@ -27,10 +27,11 @@ static int run_remote_archiver(int argc, const char **argv,
   const char *remote, const char *exec,
   const char *name_hint)
 {
-   char *buf;
int fd[2], i, rv;
struct transport *transport;
struct remote *_remote;
+   struct packet_reader reader;
+   enum packet_read_status status;
 
_remote = remote_get(remote);
if (!_remote->url[0])
@@ -38,6 +39,8 @@ static int run_remote_archiver(int argc, const char **argv,
transport = transport_get(_remote, _remote->url[0]);
transport_connect(transport, "git-upload-archive", exec, fd);
 
+   packet_reader_init(&reader, fd[0], NULL, 0, PACKET_READ_CHOMP_NEWLINE);
+
/*
 * Inject a fake --format field at the beginning of the
 * arguments, with the format inferred from our output
@@ -53,18 +56,20 @@ static int run_remote_archiver(int argc, const char **argv,
packet_write_fmt(fd[1], "argument %s\n", argv[i]);
packet_flush(fd[1]);
 
-   buf = packet_read_line(fd[0], NULL);
-   if (!buf)
+   status = packet_reader_read(&reader);
+
+   if (status != PACKET_READ_NORMAL || reader.pktlen <= 0)
die(_("git archive: expected ACK/NAK, got a flush packet"));
-   if (strcmp(buf, "ACK")) {
-   if (starts_with(buf, "NACK "))
-   die(_("git archive: NACK %s"), buf + 5);
-   if (starts_with(buf, "ERR "))
-   die(_("remote error: %s"), buf + 4);
+   if (strcmp(reader.line, "ACK")) {
+   if (starts_with(reader.line, "NACK "))
+   die(_("git archive: NACK %s"), reader.line + 5);
+   if (starts_with(reader.line, "ERR "))
+   die(_("remote error: %s"), reader.line + 4);
die(_("git archive: protocol error"));
}
 
-   if (packet_read_line(fd[0], NULL))
+   status = packet_reader_read(&reader);
+   if (status == PACKET_READ_NORMAL && reader.pktlen > 0)
die(_("git archive: expected a flush"));
 
/* Now, start reading from fd[0] and spit it out to stdout */
-- 
2.19.0.605.g01d371f741-goog

Re: [PATCH v2 2/4] archive: use packet_reader for communications

[Stefan Beller]

On Wed, Sep 26, 2018 at 6:25 PM Josh Steadmon  wrote:
>
> Using packet_reader will simplify version detection and capability
> handling, which will make implementation of protocol v2 support in
> git-archive easier.
>
> This refactoring does not change the behavior of "git archive".
>
> Signed-off-by: Josh Steadmon 

This patch is
Reviewed-by: Stefan Beller 

Thanks!

> ---
>  builtin/archive.c | 23 ++-
>  1 file changed, 14 insertions(+), 9 deletions(-)
>
> diff --git a/builtin/archive.c b/builtin/archive.c
> index e74f675390..4eb547c5b7 100644
> --- a/builtin/archive.c
> +++ b/builtin/archive.c
> @@ -27,10 +27,11 @@ static int run_remote_archiver(int argc, const char 
> **argv,
>const char *remote, const char *exec,
>const char *name_hint)
>  {
> -   char *buf;
> int fd[2], i, rv;
> struct transport *transport;
> struct remote *_remote;
> +   struct packet_reader reader;
> +   enum packet_read_status status;
>
> _remote = remote_get(remote);
> if (!_remote->url[0])
> @@ -38,6 +39,8 @@ static int run_remote_archiver(int argc, const char **argv,
> transport = transport_get(_remote, _remote->url[0]);
> transport_connect(transport, "git-upload-archive", exec, fd);
>
> +   packet_reader_init(&reader, fd[0], NULL, 0, 
> PACKET_READ_CHOMP_NEWLINE);
> +
> /*
>  * Inject a fake --format field at the beginning of the
>  * arguments, with the format inferred from our output
> @@ -53,18 +56,20 @@ static int run_remote_archiver(int argc, const char 
> **argv,
> packet_write_fmt(fd[1], "argument %s\n", argv[i]);
> packet_flush(fd[1]);
>
> -   buf = packet_read_line(fd[0], NULL);
> -   if (!buf)
> +   status = packet_reader_read(&reader);
> +
> +   if (status != PACKET_READ_NORMAL || reader.pktlen <= 0)
> die(_("git archive: expected ACK/NAK, got a flush packet"));
> -   if (strcmp(buf, "ACK")) {
> -   if (starts_with(buf, "NACK "))
> -   die(_("git archive: NACK %s"), buf + 5);
> -   if (starts_with(buf, "ERR "))
> -   die(_("remote error: %s"), buf + 4);
> +   if (strcmp(reader.line, "ACK")) {
> +   if (starts_with(reader.line, "NACK "))
> +   die(_("git archive: NACK %s"), reader.line + 5);
> +   if (starts_with(reader.line, "ERR "))
> +   die(_("remote error: %s"), reader.line + 4);
> die(_("git archive: protocol error"));
> }
>
> -   if (packet_read_line(fd[0], NULL))
> +   status = packet_reader_read(&reader);
> +   if (status == PACKET_READ_NORMAL && reader.pktlen > 0)
> die(_("git archive: expected a flush"));
>
> /* Now, start reading from fd[0] and spit it out to stdout */
> --
> 2.19.0.605.g01d371f741-goog
>