From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Contreras Subject: [PATCH v5 1/2] sha1-name: pass len argument to interpret_branch_name() Date: Mon, 2 Sep 2013 01:34:29 -0500 Message-ID: <1378103670-3394-2-git-send-email-felipe.contreras@gmail.com> References: <1378103670-3394-1-git-send-email-felipe.contreras@gmail.com> Cc: Stefano Lattarini , Felipe Contreras To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Sep 02 08:39:25 2013 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 1VGNnH-0004yX-Ox for gcvg-git-2@plane.gmane.org; Mon, 02 Sep 2013 08:39:24 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757390Ab3IBGjT (ORCPT ); Mon, 2 Sep 2013 02:39:19 -0400 Received: from mail-ob0-f172.google.com ([209.85.214.172]:57647 "EHLO mail-ob0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756950Ab3IBGjQ (ORCPT ); Mon, 2 Sep 2013 02:39:16 -0400 Received: by mail-ob0-f172.google.com with SMTP id er7so4201656obc.3 for ; Sun, 01 Sep 2013 23:39:16 -0700 (PDT) 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=WLz3/TAYBri91Xf1p+78iv+WzjBlGjWmdM/L3FCOOH0=; b=dEG73AiwZgI7PY5gujH/H/OBLuZqE8K9eaxSy3rhY1palwPaVil3O99jhWhlkU8ml+ g9Vx8eQyuf2s6kQfpFS/cep8ixVFWe9/RH8VGYmdYWfDBiZ1zt/2zpVkCPcmPXa35F9F zWPIbTdjJrPXw5Qd19Gznasc7dLy4c/GJsZpxVQFFwOh0bf7QvQIXEeZo6jqNpKoX6od qU62yelJdHnas/Zv2DiBZf+sVn7Y1fI9JUlPwcRYh+4suTSBzpX8YL1TCfM3+4yd5S0d NJsR0h4lmUnFZaFITLc1HXjBngkKZUfNsnQ867zsRDK19srjwAAV2pZubG3HSMchpXRF ASKg== X-Received: by 10.60.119.33 with SMTP id kr1mr17701oeb.62.1378103956109; Sun, 01 Sep 2013 23:39:16 -0700 (PDT) Received: from localhost (187-162-140-241.static.axtel.net. [187.162.140.241]) by mx.google.com with ESMTPSA id nw5sm11941637obc.9.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 01 Sep 2013 23:39:15 -0700 (PDT) X-Mailer: git-send-email 1.8.4-338-gefd7fa6 In-Reply-To: <1378103670-3394-1-git-send-email-felipe.contreras@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This is useful to make sure we don't step outside the boundaries of what we are interpreting at the moment. For example while interpreting foobar@{u}~1, the job of interpret_branch_name() ends right before ~1, but there's no way to figure that out inside the function, unless the len argument is passed. So let's do that. Signed-off-by: Felipe Contreras --- cache.h | 2 +- refs.c | 2 +- revision.c | 2 +- sha1_name.c | 10 ++++++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cache.h b/cache.h index 85b544f..9fbc5fa 100644 --- a/cache.h +++ b/cache.h @@ -893,7 +893,7 @@ extern char *resolve_refdup(const char *ref, unsigned char *sha1, int reading, i extern int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref); extern int dwim_log(const char *str, int len, unsigned char *sha1, char **ref); -extern int interpret_branch_name(const char *str, struct strbuf *); +extern int interpret_branch_name(const char *str, int len, struct strbuf *); extern int get_sha1_mb(const char *str, unsigned char *sha1); extern int refname_match(const char *abbrev_name, const char *full_name, const char **rules); diff --git a/refs.c b/refs.c index 7922261..8fd5faf 100644 --- a/refs.c +++ b/refs.c @@ -1951,7 +1951,7 @@ static int remove_empty_directories(const char *file) static char *substitute_branch_name(const char **string, int *len) { struct strbuf buf = STRBUF_INIT; - int ret = interpret_branch_name(*string, &buf); + int ret = interpret_branch_name(*string, *len, &buf); if (ret == *len) { size_t size; diff --git a/revision.c b/revision.c index 84ccc05..3ef1384 100644 --- a/revision.c +++ b/revision.c @@ -200,7 +200,7 @@ static void add_pending_object_with_mode(struct rev_info *revs, revs->no_walk = 0; if (revs->reflog_info && obj->type == OBJ_COMMIT) { struct strbuf buf = STRBUF_INIT; - int len = interpret_branch_name(name, &buf); + int len = interpret_branch_name(name, 0, &buf); int st; if (0 < len && name[len] && buf.len) diff --git a/sha1_name.c b/sha1_name.c index 65ad066..93197b9 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -1012,7 +1012,7 @@ static int reinterpret(const char *name, int namelen, int len, struct strbuf *bu int ret; strbuf_add(buf, name + len, namelen - len); - ret = interpret_branch_name(buf->buf, &tmp); + ret = interpret_branch_name(buf->buf, buf->len, &tmp); /* that data was not interpreted, remove our cruft */ if (ret < 0) { strbuf_setlen(buf, used); @@ -1046,14 +1046,16 @@ static int reinterpret(const char *name, int namelen, int len, struct strbuf *bu * If the input was ok but there are not N branch switches in the * reflog, it returns 0. */ -int interpret_branch_name(const char *name, struct strbuf *buf) +int interpret_branch_name(const char *name, int namelen, struct strbuf *buf) { char *cp; struct branch *upstream; - int namelen = strlen(name); int len = interpret_nth_prior_checkout(name, buf); int tmp_len; + if (!namelen) + namelen = strlen(name); + if (!len) { return len; /* syntax Ok, not enough switches */ } else if (len > 0) { @@ -1100,7 +1102,7 @@ int interpret_branch_name(const char *name, struct strbuf *buf) int strbuf_branchname(struct strbuf *sb, const char *name) { int len = strlen(name); - int used = interpret_branch_name(name, sb); + int used = interpret_branch_name(name, len, sb); if (used == len) return 0; -- 1.8.4-338-gefd7fa6