From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karthik Nayak Subject: [PATCH v3 2/3] sha1_file: implement changes for "cat-file --literally -t" Date: Thu, 5 Mar 2015 23:49:20 +0530 Message-ID: <1425579560-18898-1-git-send-email-karthik.188@gmail.com> References: <54F89D90.6090505@gmail.com> Cc: Karthik Nayak To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Mar 05 19:19:38 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YTaMz-0004Wx-QW for gcvg-git-2@plane.gmane.org; Thu, 05 Mar 2015 19:19:38 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758568AbbCESTd (ORCPT ); Thu, 5 Mar 2015 13:19:33 -0500 Received: from mail-pd0-f169.google.com ([209.85.192.169]:42708 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758549AbbCESTc (ORCPT ); Thu, 5 Mar 2015 13:19:32 -0500 Received: by pdbfl12 with SMTP id fl12so37037910pdb.9 for ; Thu, 05 Mar 2015 10:19:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=M55lrnePs8woG8NC6XhA3/JN4wwRoyDPdWvMILktgD4=; b=WAhtSbYdJwKByzrh+bxpH1wFlhQmtbsEeGbwEjT0oY0TonZEuteVlp91+k54npOx/v bBGX7EPJ4Wa70li9f638prCi3yrHCana5gD+jyclFk4Af9lNvUnmmfgiGUnoOCjtgh16 Su4WR/SJgaUZaw6AZdqqjf8qET94dgMjdLgKPZJm8sWv/OEV6DYoUjdU4a9AHaZbPVKv rlBYQW96nEP98zPOGU9euOHJeGLwXg1uhyGZU+WxF3ok114RCHLdmlrSVP5ofUErP4Jx ULdl84OHRoKu+NNHMl6PJiAtIcN1hrDajr3t8002AcFIlmzml2ebhtLIquY1PlAC4IlE kOwQ== X-Received: by 10.68.57.232 with SMTP id l8mr18274482pbq.42.1425579571685; Thu, 05 Mar 2015 10:19:31 -0800 (PST) Received: from ashley.localdomain ([103.227.98.178]) by mx.google.com with ESMTPSA id c9sm7610631pdo.13.2015.03.05.10.19.29 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Mar 2015 10:19:30 -0800 (PST) X-Mailer: git-send-email 2.3.1.167.g7f4ba4b.dirty In-Reply-To: <54F89D90.6090505@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Add "sha1_object_info_literally()" which is to be used when the "literally" option is given to get the type of object and return it. It internally uses "sha1_object_info_extended()". Add "unpack_sha1_header_literally()" to unpack sha headers which may be greater than 32 bytes, which is the threshold for a regular object header. This code is borrowed from the suggestions given by Junio C Hamano, it has been tested by me. Modify "sha1_loose_object_info()" to include a flag argument and also include changes to call "unpack_sha1_header_literally()" when the literally flag is passed. Also copies the obtained type to the typename field of object_info. Modify "sha1_object_info_extended()" to call the function "sha1_loose_object_info()" with flags. Signed-off-by: Karthik Nayak --- sha1_file.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 76 insertions(+), 7 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 69a60ec..b9e3922 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1564,6 +1564,36 @@ int unpack_sha1_header(git_zstream *stream, unsigned char *map, unsigned long ma return git_inflate(stream, 0); } +static int unpack_sha1_header_literally(git_zstream *stream, unsigned char *map, + unsigned long mapsize, + struct strbuf *header) +{ + unsigned char buffer[32], *cp; + unsigned long bufsiz = sizeof(buffer); + int status; + + /* Get the data stream */ + memset(stream, 0, sizeof(*stream)); + stream->next_in = map; + stream->avail_in = mapsize; + stream->next_out = buffer; + stream->avail_out = bufsiz; + + git_inflate_init(stream); + + do { + status = git_inflate(stream, 0); + strbuf_add(header, buffer, stream->next_out - buffer); + for (cp = buffer; cp < stream->next_out; cp++) + if (!*cp) + /* Found the NUL at the end of the header */ + return 0; + stream->next_out = buffer; + stream->avail_out = bufsiz; + } while (status == Z_OK); + return -1; +} + static void *unpack_sha1_rest(git_zstream *stream, void *buffer, unsigned long size, const unsigned char *sha1) { int bytes = strlen(buffer) + 1; @@ -2524,13 +2554,16 @@ struct packed_git *find_sha1_pack(const unsigned char *sha1, } static int sha1_loose_object_info(const unsigned char *sha1, - struct object_info *oi) + struct object_info *oi, + int flags) { - int status; + int status = 0; unsigned long mapsize, size; void *map; git_zstream stream; char hdr[32]; + struct strbuf hdrbuf = STRBUF_INIT; + char *hdrp; if (oi->delta_base_sha1) hashclr(oi->delta_base_sha1); @@ -2557,10 +2590,25 @@ static int sha1_loose_object_info(const unsigned char *sha1, return -1; if (oi->disk_sizep) *oi->disk_sizep = mapsize; - if (unpack_sha1_header(&stream, map, mapsize, hdr, sizeof(hdr)) < 0) - status = error("unable to unpack %s header", - sha1_to_hex(sha1)); - else if ((status = parse_sha1_header(hdr, &size)) < 0) + if ((flags & LOOKUP_LITERALLY)) { + if (unpack_sha1_header_literally(&stream, map, mapsize, &hdrbuf) < 0) + status = error("unable to unpack %s header with --literally", + sha1_to_hex(sha1)); + hdrp = hdrbuf.buf; + } else { + if (unpack_sha1_header(&stream, map, mapsize, hdr, sizeof(hdr)) < 0) { + status = error("unable to unpack %s header", + sha1_to_hex(sha1)); + } + hdrp = hdr; + } + if (status) + ; /* We're already checking for errors */ + else if ((flags & LOOKUP_LITERALLY)) { + size_t typelen = strcspn(hdrbuf.buf, " "); + strbuf_add(oi->typename, hdrbuf.buf, typelen); + } + else if ((status = parse_sha1_header(hdrp, &size)) < 0) status = error("unable to parse %s header", sha1_to_hex(sha1)); else if (oi->sizep) *oi->sizep = size; @@ -2568,6 +2616,10 @@ static int sha1_loose_object_info(const unsigned char *sha1, munmap(map, mapsize); if (oi->typep) *oi->typep = status; + if (oi->typename && 0 <= status && typename(status)) + strbuf_addstr(oi->typename, typename(status)); + if (hdrp == hdrbuf.buf) + strbuf_release(&hdrbuf); return 0; } @@ -2594,7 +2646,7 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi, if (!find_pack_entry(real, &e)) { /* Most likely it's a loose object. */ - if (!sha1_loose_object_info(real, oi)) { + if (!sha1_loose_object_info(real, oi, flags)) { oi->whence = OI_LOOSE; return 0; } @@ -2635,6 +2687,23 @@ int sha1_object_info(const unsigned char *sha1, unsigned long *sizep) return type; } +const char *sha1_object_info_literally(const unsigned char *sha1) +{ + enum object_type type; + struct strbuf sb = STRBUF_INIT; + struct object_info oi = {NULL}; + + oi.typename = &sb; + oi.typep = &type; + if (sha1_object_info_extended(sha1, &oi, LOOKUP_LITERALLY) < 0) + return NULL; + if (*oi.typep > 0) { + strbuf_release(oi.typename); + return typename(*oi.typep); + } + return oi.typename->buf; +} + static void *read_packed_sha1(const unsigned char *sha1, enum object_type *type, unsigned long *size) { -- 2.3.1.167.g7f4ba4b.dirty