From: Jeff King Date: Wed, 20 Feb 2013 20:00:43 +0000 (-0500) Subject: send-pack: prefer prefixcmp over memcmp in receive_status X-Git-Tag: v1.8.3-rc0~148^2~15 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f9e3e498c113e987c2b8662485db5461cad1c36;p=git send-pack: prefer prefixcmp over memcmp in receive_status This code predates prefixcmp, so it used memcmp along with static sizes. Replacing these memcmps with prefixcmp makes the code much more readable, and the lack of static sizes will make refactoring it in future patches simpler. Note that we used to be unnecessarily liberal in parsing the "unpack" status line, and would accept "unpack ok\njunk". No version of git has ever produced that, and it violates the BNF in Documentation/technical/pack-protocol.txt. Let's take this opportunity to tighten the check by converting the prefix comparison into a strcmp. While we're in the area, let's also fix a vague error message that does not follow our usual conventions (it writes directly to stderr and does not use the "error:" prefix). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/send-pack.c b/send-pack.c index 97ab336097..e91cbe2c95 100644 --- a/send-pack.c +++ b/send-pack.c @@ -109,9 +109,9 @@ static int receive_status(int in, struct ref *refs) char line[1000]; int ret = 0; int len = packet_read_line(in, line, sizeof(line)); - if (len < 10 || memcmp(line, "unpack ", 7)) + if (prefixcmp(line, "unpack ")) return error("did not receive remote status"); - if (memcmp(line, "unpack ok\n", 10)) { + if (strcmp(line, "unpack ok\n")) { char *p = line + strlen(line) - 1; if (*p == '\n') *p = '\0'; @@ -125,9 +125,8 @@ static int receive_status(int in, struct ref *refs) len = packet_read_line(in, line, sizeof(line)); if (!len) break; - if (len < 3 || - (memcmp(line, "ok ", 3) && memcmp(line, "ng ", 3))) { - fprintf(stderr, "protocol error: %s\n", line); + if (prefixcmp(line, "ok ") && prefixcmp(line, "ng ")) { + error("invalid ref status from remote: %s", line); ret = -1; break; }