From mboxrd@z Thu Jan 1 00:00:00 1970 From: mhagger@alum.mit.edu Subject: [PATCH v3 14/14] resolve_gitlink_ref_recursive(): change to work with struct ref_cache Date: Fri, 28 Oct 2011 13:14:41 +0200 Message-ID: <1319800481-15138-15-git-send-email-mhagger@alum.mit.edu> References: <1319800481-15138-1-git-send-email-mhagger@alum.mit.edu> Cc: git@vger.kernel.org, Jeff King , Drew Northup , Jakub Narebski , Heiko Voigt , Johan Herland , Julian Phillips , Michael Haggerty To: Junio C Hamano X-From: git-owner@vger.kernel.org Fri Oct 28 13:21:39 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RJkVF-0007n0-W6 for gcvg-git-2@lo.gmane.org; Fri, 28 Oct 2011 13:21:38 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932325Ab1J1LV1 (ORCPT ); Fri, 28 Oct 2011 07:21:27 -0400 Received: from mail.berlin.jpk.com ([212.222.128.130]:54868 "EHLO mail.berlin.jpk.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932368Ab1J1LVI (ORCPT ); Fri, 28 Oct 2011 07:21:08 -0400 Received: from michael.berlin.jpk.com ([192.168.100.152]) by mail.berlin.jpk.com with esmtp (Exim 4.50) id 1RJkIZ-00076m-C7; Fri, 28 Oct 2011 13:08:31 +0200 X-Mailer: git-send-email 1.7.7 In-Reply-To: <1319800481-15138-1-git-send-email-mhagger@alum.mit.edu> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Michael Haggerty resolve_gitlink_ref() and resolve_gitlink_ref_recursive(), together, basically duplicated the code in git_path_submodule(). So use that function instead. Signed-off-by: Michael Haggerty --- refs.c | 34 ++++++++++------------------------ 1 files changed, 10 insertions(+), 24 deletions(-) diff --git a/refs.c b/refs.c index 1867ff0..1c6de61 100644 --- a/refs.c +++ b/refs.c @@ -433,17 +433,19 @@ static int resolve_gitlink_packed_ref(struct ref_cache *refs, } static int resolve_gitlink_ref_recursive(struct ref_cache *refs, - char *name, int pathlen, const char *refname, unsigned char *sha1, int recursion) { - int fd, len = strlen(refname); + int fd, len; char buffer[128], *p; + char *path; - if (recursion > MAXDEPTH || len > MAXREFLEN) + if (recursion > MAXDEPTH || strlen(refname) > MAXREFLEN) return -1; - memcpy(name + pathlen, refname, len+1); - fd = open(name, O_RDONLY); + path = *refs->name + ? git_path_submodule(refs->name, "%s", refname) + : git_path("%s", refname); + fd = open(path, O_RDONLY); if (fd < 0) return resolve_gitlink_packed_ref(refs, refname, sha1); @@ -466,15 +468,14 @@ static int resolve_gitlink_ref_recursive(struct ref_cache *refs, while (isspace(*p)) p++; - return resolve_gitlink_ref_recursive(refs, name, pathlen, p, sha1, recursion+1); + return resolve_gitlink_ref_recursive(refs, p, sha1, recursion+1); } int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *sha1) { int len = strlen(path), retval; - char *submodule, *gitdir; + char *submodule; struct ref_cache *refs; - const char *tmp; while (len && path[len-1] == '/') len--; @@ -484,22 +485,7 @@ int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *sh refs = get_ref_cache(submodule); free(submodule); - gitdir = xmalloc(len + MAXREFLEN + 8); - memcpy(gitdir, path, len); - memcpy(gitdir + len, "/.git", 6); - len += 5; - - tmp = read_gitfile(gitdir); - if (tmp) { - free(gitdir); - len = strlen(tmp); - gitdir = xmalloc(len + MAXREFLEN + 3); - memcpy(gitdir, tmp, len); - } - gitdir[len] = '/'; - gitdir[++len] = '\0'; - retval = resolve_gitlink_ref_recursive(refs, gitdir, len, refname, sha1, 0); - free(gitdir); + retval = resolve_gitlink_ref_recursive(refs, refname, sha1, 0); return retval; } -- 1.7.7