From mboxrd@z Thu Jan 1 00:00:00 1970 From: mhagger@alum.mit.edu Subject: [PATCH 08/30] do_for_each_reflog(): use a strbuf to hold logfile name Date: Wed, 25 Apr 2012 00:45:14 +0200 Message-ID: <1335307536-26914-9-git-send-email-mhagger@alum.mit.edu> References: <1335307536-26914-1-git-send-email-mhagger@alum.mit.edu> Cc: git@vger.kernel.org, Jeff King , Jakub Narebski , Heiko Voigt , Johan Herland , Michael Haggerty To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed Apr 25 00:57:24 2012 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 1SMofh-00005X-Ug for gcvg-git-2@plane.gmane.org; Wed, 25 Apr 2012 00:57:22 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758481Ab2DXW5G (ORCPT ); Tue, 24 Apr 2012 18:57:06 -0400 Received: from ssh.berlin.jpk.com ([212.222.128.135]:60979 "EHLO eddie.berlin.jpk.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758470Ab2DXW5A (ORCPT ); Tue, 24 Apr 2012 18:57:00 -0400 Received: from michael.berlin.jpk.com (unknown [192.168.101.152]) by eddie.berlin.jpk.com (Postfix) with ESMTP id 4A9B624814A; Wed, 25 Apr 2012 00:46:01 +0200 (CEST) X-Mailer: git-send-email 1.7.10 In-Reply-To: <1335307536-26914-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 This simplifies the bookkeeping and allows an (artificial) restriction on refname component length to be removed. Signed-off-by: Michael Haggerty --- refs.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/refs.c b/refs.c index 1d25151..f43c255 100644 --- a/refs.c +++ b/refs.c @@ -2248,44 +2248,45 @@ static int do_for_each_reflog(const char *base, each_ref_fn fn, void *cb_data) int retval = 0; struct dirent *de; int baselen; - char *log; + struct strbuf log; if (!d) return *base ? errno : 0; baselen = strlen(base); - log = xmalloc(baselen + 257); - memcpy(log, base, baselen); - if (baselen && base[baselen-1] != '/') - log[baselen++] = '/'; + strbuf_init(&log, baselen + 257); + strbuf_add(&log, base, baselen); + if (log.len && log.buf[log.len-1] != '/') { + strbuf_addch(&log, '/'); + baselen++; + } while ((de = readdir(d)) != NULL) { struct stat st; - int namelen; if (de->d_name[0] == '.') continue; - namelen = strlen(de->d_name); - if (namelen > 255) - continue; if (has_extension(de->d_name, ".lock")) continue; - memcpy(log + baselen, de->d_name, namelen+1); - if (stat(git_path("logs/%s", log), &st) < 0) - continue; - if (S_ISDIR(st.st_mode)) { - retval = do_for_each_reflog(log, fn, cb_data); + strbuf_addstr(&log, de->d_name); + if (stat(git_path("logs/%s", log.buf), &st) < 0) { + /* Silently ignore. */ } else { - unsigned char sha1[20]; - if (read_ref_full(log, sha1, 0, NULL)) - retval = error("bad ref for %s", log); - else - retval = fn(log, sha1, 0, cb_data); + if (S_ISDIR(st.st_mode)) { + retval = do_for_each_reflog(log.buf, fn, cb_data); + } else { + unsigned char sha1[20]; + if (read_ref_full(log.buf, sha1, 0, NULL)) + retval = error("bad ref for %s", log.buf); + else + retval = fn(log.buf, sha1, 0, cb_data); + } + if (retval) + break; } - if (retval) - break; + strbuf_setlen(&log, baselen); } - free(log); + strbuf_release(&log); closedir(d); return retval; } -- 1.7.10