From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM, RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id A267B1FC44 for ; Mon, 13 Feb 2017 15:20:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752976AbdBMPUp (ORCPT ); Mon, 13 Feb 2017 10:20:45 -0500 Received: from mail-oi0-f68.google.com ([209.85.218.68]:33469 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752907AbdBMPUl (ORCPT ); Mon, 13 Feb 2017 10:20:41 -0500 Received: by mail-oi0-f68.google.com with SMTP id j15so7824893oih.0 for ; Mon, 13 Feb 2017 07:20:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wGXeB8NSc/pgQcI2RIdiUF3Z3ilUNhZGhVfmkiHbPXo=; b=UX6llLCFq8KRBTHaI2Q6qTigC6XV22KBvpDkD9hd/xL0MLrAgCLYxPrj/O91u8uXRd J6dhsMuH7noskWCCe+uGvfzJbqhAewBTYv/O3WCEctz9gLcE7NGUSSKrFDZFXIw8mdvh AkzScWHGcgVY6GD+9zw/KFOI/j4uT4/0r5FibbJeTiIpOsOyn/5lTifRFuI39z53VMx9 p73hlDGdzU5g9Z7dxI6dFFF+060yg8RQXmNm5F3dylDzqkIoe9y+qNBNleID+X2rUrr3 9anyhqKqduSUgysGc5PO9/zoh3TzKoYVGRMV0ccrnX4Fqxiq3ySuXSD8v4dfpQby5nb/ HpCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wGXeB8NSc/pgQcI2RIdiUF3Z3ilUNhZGhVfmkiHbPXo=; b=HjG3WvO7DiWcp/K2pdffkscIjJAYNfOfPvHlQzuGkMYL2cxjmFvxxAIwcWht1skUlJ wTKY4Fkj9LZSOr9nNt9x0JHRCxgbJrWoQ/zhKTvrKOnJXfIaYkfyfBYorTrCTkJQiVBG tl3MF2X1iHmQ0tjLy4opWj6hAAnstdTfkgk5jGrKgp/R3XNOKEZUsRKzn8VgXS5nwEKF rNMukl3lAzJ8ncu7RTyaYOc7OI58mwVUUbC4lmLO6Y8oOkUKj67EpdpSdBAzC3ziAWzm R6du6niPG2zW+YS6BzOdD4H9OE5gi6ppcT56rHY4BtTa/In5OJpx7pQy/TfX3FQ5QukC 8h2g== X-Gm-Message-State: AMke39nx40czuKzezxDThOd7oBPAcVySxgTvoOJNBZ2f6MkRD5HsV09SCZrUVGx1hXZqaQ== X-Received: by 10.84.216.24 with SMTP id m24mr30797223pli.22.1486999230743; Mon, 13 Feb 2017 07:20:30 -0800 (PST) Received: from ash ([115.73.162.84]) by smtp.gmail.com with ESMTPSA id h4sm21657547pfk.96.2017.02.13.07.20.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Feb 2017 07:20:30 -0800 (PST) Received: by ash (sSMTP sendmail emulation); Mon, 13 Feb 2017 22:20:25 +0700 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org Cc: Junio C Hamano , Michael Haggerty , Johannes Schindelin , sbeller@google.com, novalis@novalis.org, =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH 02/11] files-backend: convert git_path() to strbuf_git_path() Date: Mon, 13 Feb 2017 22:20:02 +0700 Message-Id: <20170213152011.12050-3-pclouds@gmail.com> X-Mailer: git-send-email 2.11.0.157.gd943d85 In-Reply-To: <20170213152011.12050-1-pclouds@gmail.com> References: <20170213152011.12050-1-pclouds@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org git_path() and friends are going to be killed in files-backend.c in near future. And because there's a risk with overwriting buffer in git_path(), let's convert them all to strbuf_git_path(). We'll have easier time killing/converting strbuf_git_path() then because we won't have to worry about memory management again. Signed-off-by: Nguyễn Thái Ngọc Duy --- refs/files-backend.c | 114 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 90 insertions(+), 24 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index 75565c3aa..6582c9b2d 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -2169,6 +2169,8 @@ static int lock_packed_refs(struct files_ref_store *refs, int flags) static int timeout_configured = 0; static int timeout_value = 1000; struct packed_ref_cache *packed_ref_cache; + struct strbuf sb = STRBUF_INIT; + int ret; files_assert_main_repository(refs, "lock_packed_refs"); @@ -2177,10 +2179,13 @@ static int lock_packed_refs(struct files_ref_store *refs, int flags) timeout_configured = 1; } - if (hold_lock_file_for_update_timeout( - &packlock, git_path("packed-refs"), - flags, timeout_value) < 0) + strbuf_git_path(&sb, "packed-refs"); + ret = hold_lock_file_for_update_timeout(&packlock, sb.buf, + flags, timeout_value); + strbuf_release(&sb); + if (ret < 0) return -1; + /* * Get the current packed-refs while holding the lock. If the * packed-refs file has been modified since we last read it, @@ -2335,6 +2340,9 @@ static void try_remove_empty_parents(char *name) for (q = p; *q; q++) ; while (1) { + struct strbuf sb = STRBUF_INIT; + int ret; + while (q > p && *q != '/') q--; while (q > p && *(q-1) == '/') @@ -2342,7 +2350,10 @@ static void try_remove_empty_parents(char *name) if (q == p) break; *q = '\0'; - if (rmdir(git_path("%s", name))) + strbuf_git_path(&sb, "%s", name); + ret = rmdir(sb.buf); + strbuf_release(&sb); + if (ret) break; } } @@ -2431,7 +2442,11 @@ static int repack_without_refs(struct files_ref_store *refs, return 0; /* no refname exists in packed refs */ if (lock_packed_refs(refs, 0)) { - unable_to_lock_message(git_path("packed-refs"), errno, err); + struct strbuf sb = STRBUF_INIT; + + strbuf_git_path(&sb, "packed-refs"); + unable_to_lock_message(sb.buf, errno, err); + strbuf_release(&sb); return -1; } packed = get_packed_refs(refs); @@ -2529,11 +2544,12 @@ static int rename_tmp_log(const char *newrefname) { int attempts_remaining = 4; struct strbuf path = STRBUF_INIT; + struct strbuf tmp_renamed_log = STRBUF_INIT; int ret = -1; - retry: - strbuf_reset(&path); strbuf_git_path(&path, "logs/%s", newrefname); + strbuf_git_path(&tmp_renamed_log, TMP_RENAMED_LOG); + retry: switch (safe_create_leading_directories_const(path.buf)) { case SCLD_OK: break; /* success */ @@ -2546,7 +2562,7 @@ static int rename_tmp_log(const char *newrefname) goto out; } - if (rename(git_path(TMP_RENAMED_LOG), path.buf)) { + if (rename(tmp_renamed_log.buf, path.buf)) { if ((errno==EISDIR || errno==ENOTDIR) && --attempts_remaining > 0) { /* * rename(a, b) when b is an existing @@ -2574,6 +2590,7 @@ static int rename_tmp_log(const char *newrefname) ret = 0; out: strbuf_release(&path); + strbuf_release(&tmp_renamed_log); return ret; } @@ -2614,9 +2631,15 @@ static int files_rename_ref(struct ref_store *ref_store, int flag = 0, logmoved = 0; struct ref_lock *lock; struct stat loginfo; - int log = !lstat(git_path("logs/%s", oldrefname), &loginfo); + struct strbuf sb_oldref = STRBUF_INIT; + struct strbuf sb_newref = STRBUF_INIT; + struct strbuf tmp_renamed_log = STRBUF_INIT; + int log, ret; struct strbuf err = STRBUF_INIT; + strbuf_git_path(&sb_oldref, "logs/%s", oldrefname); + log = !lstat(sb_oldref.buf, &loginfo); + strbuf_release(&sb_oldref); if (log && S_ISLNK(loginfo.st_mode)) return error("reflog for %s is a symlink", oldrefname); @@ -2630,7 +2653,12 @@ static int files_rename_ref(struct ref_store *ref_store, if (!rename_ref_available(oldrefname, newrefname)) return 1; - if (log && rename(git_path("logs/%s", oldrefname), git_path(TMP_RENAMED_LOG))) + strbuf_git_path(&sb_oldref, "logs/%s", oldrefname); + strbuf_git_path(&tmp_renamed_log, TMP_RENAMED_LOG); + ret = log && rename(sb_oldref.buf, tmp_renamed_log.buf); + strbuf_release(&sb_oldref); + strbuf_release(&tmp_renamed_log); + if (ret) return error("unable to move logfile logs/%s to "TMP_RENAMED_LOG": %s", oldrefname, strerror(errno)); @@ -2709,13 +2737,19 @@ static int files_rename_ref(struct ref_store *ref_store, log_all_ref_updates = flag; rollbacklog: - if (logmoved && rename(git_path("logs/%s", newrefname), git_path("logs/%s", oldrefname))) + strbuf_git_path(&sb_newref, "logs/%s", newrefname); + strbuf_git_path(&sb_oldref, "logs/%s", oldrefname); + if (logmoved && rename(sb_newref.buf, sb_oldref.buf)) error("unable to restore logfile %s from %s: %s", oldrefname, newrefname, strerror(errno)); + strbuf_git_path(&tmp_renamed_log, TMP_RENAMED_LOG); if (!logmoved && log && - rename(git_path(TMP_RENAMED_LOG), git_path("logs/%s", oldrefname))) + rename(tmp_renamed_log.buf, sb_oldref.buf)) error("unable to restore logfile %s from "TMP_RENAMED_LOG": %s", oldrefname, strerror(errno)); + strbuf_release(&sb_newref); + strbuf_release(&sb_oldref); + strbuf_release(&tmp_renamed_log); return 1; } @@ -3111,22 +3145,32 @@ int set_worktree_head_symref(const char *gitdir, const char *target) static int files_reflog_exists(struct ref_store *ref_store, const char *refname) { + struct strbuf sb = STRBUF_INIT; struct stat st; + int ret; /* Check validity (but we don't need the result): */ files_downcast(ref_store, 0, "reflog_exists"); - return !lstat(git_path("logs/%s", refname), &st) && - S_ISREG(st.st_mode); + strbuf_git_path(&sb, "logs/%s", refname); + ret = !lstat(sb.buf, &st) && S_ISREG(st.st_mode); + strbuf_release(&sb); + return ret; } static int files_delete_reflog(struct ref_store *ref_store, const char *refname) { + struct strbuf sb = STRBUF_INIT; + int ret; + /* Check validity (but we don't need the result): */ files_downcast(ref_store, 0, "delete_reflog"); - return remove_path(git_path("logs/%s", refname)); + strbuf_git_path(&sb, "logs/%s", refname); + ret = remove_path(sb.buf); + strbuf_release(&sb); + return ret; } static int show_one_reflog_ent(struct strbuf *sb, each_reflog_ent_fn fn, void *cb_data) @@ -3181,7 +3225,9 @@ static int files_for_each_reflog_ent_reverse(struct ref_store *ref_store, /* Check validity (but we don't need the result): */ files_downcast(ref_store, 0, "for_each_reflog_ent_reverse"); - logfp = fopen(git_path("logs/%s", refname), "r"); + strbuf_git_path(&sb, "logs/%s", refname); + logfp = fopen(sb.buf, "r"); + strbuf_release(&sb); if (!logfp) return -1; @@ -3287,7 +3333,9 @@ static int files_for_each_reflog_ent(struct ref_store *ref_store, /* Check validity (but we don't need the result): */ files_downcast(ref_store, 0, "for_each_reflog_ent"); - logfp = fopen(git_path("logs/%s", refname), "r"); + strbuf_git_path(&sb, "logs/%s", refname); + logfp = fopen(sb.buf, "r"); + strbuf_release(&sb); if (!logfp) return -1; @@ -3369,12 +3417,15 @@ static struct ref_iterator *files_reflog_iterator_begin(struct ref_store *ref_st { struct files_reflog_iterator *iter = xcalloc(1, sizeof(*iter)); struct ref_iterator *ref_iterator = &iter->base; + struct strbuf sb = STRBUF_INIT; /* Check validity (but we don't need the result): */ files_downcast(ref_store, 0, "reflog_iterator_begin"); base_ref_iterator_init(ref_iterator, &files_reflog_iterator_vtable); - iter->dir_iterator = dir_iterator_begin(git_path("logs")); + strbuf_git_path(&sb, "logs"); + iter->dir_iterator = dir_iterator_begin(sb.buf); + strbuf_release(&sb); return ref_iterator; } @@ -3843,8 +3894,13 @@ static int files_transaction_commit(struct ref_store *ref_store, ret = TRANSACTION_GENERIC_ERROR; goto cleanup; } - for_each_string_list_item(ref_to_delete, &refs_to_delete) - unlink_or_warn(git_path("logs/%s", ref_to_delete->string)); + for_each_string_list_item(ref_to_delete, &refs_to_delete) { + struct strbuf sb = STRBUF_INIT; + + strbuf_git_path(&sb, "logs/%s", ref_to_delete->string); + unlink_or_warn(sb.buf); + strbuf_release(&sb); + } clear_loose_ref_cache(refs); cleanup: @@ -4098,18 +4154,28 @@ static int files_reflog_expire(struct ref_store *ref_store, static int files_init_db(struct ref_store *ref_store, struct strbuf *err) { + struct strbuf sb = STRBUF_INIT; + /* Check validity (but we don't need the result): */ files_downcast(ref_store, 0, "init_db"); /* * Create .git/refs/{heads,tags} */ - safe_create_dir(git_path("refs/heads"), 1); - safe_create_dir(git_path("refs/tags"), 1); + strbuf_git_path(&sb, "refs/heads"); + safe_create_dir(sb.buf, 1); + strbuf_reset(&sb); + strbuf_git_path(&sb, "refs/tags"); + safe_create_dir(sb.buf, 1); + strbuf_reset(&sb); if (get_shared_repository()) { - adjust_shared_perm(git_path("refs/heads")); - adjust_shared_perm(git_path("refs/tags")); + strbuf_git_path(&sb, "refs/heads"); + adjust_shared_perm(sb.buf); + strbuf_reset(&sb); + strbuf_git_path(&sb, "refs/tags"); + adjust_shared_perm(sb.buf); } + strbuf_release(&sb); return 0; } -- 2.11.0.157.gd943d85