All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, mhagger@alum.mit.edu
Cc: David Turner <dturner@twopensource.com>,
	Ronnie Sahlberg <sahlberg@google.com>,
	Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v5 19/26] refs.c: move refname_is_safe to the common code
Date: Tue, 27 Oct 2015 22:14:20 -0400	[thread overview]
Message-ID: <1445998467-11511-20-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1445998467-11511-1-git-send-email-dturner@twopensource.com>

This function does not contain any backend specific code so we move it
to the common code. This function might be used by other refs backends.

While we are doing so, we improve the comment's grammar and clarify a
safety rule.

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
 refs-be-files.c | 33 ---------------------------------
 refs.c          | 24 ++++++++++++++++++++++++
 refs.h          | 11 +++++++++++
 3 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/refs-be-files.c b/refs-be-files.c
index 156ab4f..0111282 100644
--- a/refs-be-files.c
+++ b/refs-be-files.c
@@ -196,39 +196,6 @@ static struct ref_dir *get_ref_dir(struct ref_entry *entry)
 	return dir;
 }
 
-/*
- * Check if a refname is safe.
- * For refs that start with "refs/" we consider it safe as long they do
- * not try to resolve to outside of refs/.
- *
- * For all other refs we only consider them safe iff they only contain
- * upper case characters and '_' (like "HEAD" AND "MERGE_HEAD", and not like
- * "config").
- */
-static int refname_is_safe(const char *refname)
-{
-	if (starts_with(refname, "refs/")) {
-		char *buf;
-		int result;
-
-		buf = xmalloc(strlen(refname) + 1);
-		/*
-		 * Does the refname try to escape refs/?
-		 * For example: refs/foo/../bar is safe but refs/foo/../../bar
-		 * is not.
-		 */
-		result = !normalize_path_copy(buf, refname + strlen("refs/"));
-		free(buf);
-		return result;
-	}
-	while (*refname) {
-		if (!isupper(*refname) && *refname != '_')
-			return 0;
-		refname++;
-	}
-	return 1;
-}
-
 static struct ref_entry *create_ref_entry(const char *refname,
 					  const unsigned char *sha1, int flag,
 					  int check_name)
diff --git a/refs.c b/refs.c
index 9cafcc9..cd0ab21 100644
--- a/refs.c
+++ b/refs.c
@@ -949,3 +949,27 @@ int ref_transaction_verify(struct ref_transaction *transaction,
 				      NULL, old_sha1,
 				      flags, NULL, err);
 }
+
+int refname_is_safe(const char *refname)
+{
+	if (starts_with(refname, "refs/")) {
+		char *buf;
+		int result;
+
+		buf = xmalloc(strlen(refname) + 1);
+		/*
+		 * Does the refname try to escape refs/?
+		 * For example: refs/foo/../bar is safe but refs/foo/../../bar
+		 * is not.
+		 */
+		result = !normalize_path_copy(buf, refname + strlen("refs/"));
+		free(buf);
+		return result;
+	}
+	while (*refname) {
+		if (!isupper(*refname) && *refname != '_')
+			return 0;
+		refname++;
+	}
+	return 1;
+}
diff --git a/refs.h b/refs.h
index 3d24c79..927b64d 100644
--- a/refs.h
+++ b/refs.h
@@ -396,6 +396,17 @@ extern int for_each_reflog(each_ref_fn, void *);
  */
 extern int check_refname_format(const char *refname, int flags);
 
+/*
+ * Check if a refname is safe.
+ * For a ref that starts with "refs/", we consider it safe as long it does
+ * not try to resolve to outside of refs/.
+ *
+ * For all other refs we only consider them safe iff they only consist of
+ * upper case characters and '_' (like "HEAD" AND "MERGE_HEAD", and not like
+ * "config").
+ */
+extern int refname_is_safe(const char *refname);
+
 extern const char *prettify_refname(const char *refname);
 
 extern char *shorten_unambiguous_ref(const char *refname, int strict);
-- 
2.4.2.658.g6d8523e-twtrsrc

  parent reply	other threads:[~2015-10-28  2:16 UTC|newest]

Thread overview: 67+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-28  2:14 [PATCH v5 00/26] refs backend pre-vtable David Turner
2015-10-28  2:14 ` [PATCH v5 01/26] refs.c: create a public version of verify_refname_available David Turner
2015-10-28  2:14 ` [PATCH v5 02/26] refs: make is_branch public David Turner
2015-10-28  2:14 ` [PATCH v5 03/26] refs-be-files.c: rename refs to refs-be-files David Turner
2015-10-28  2:14 ` [PATCH v5 04/26] refs.c: add a new refs.c file to hold all common refs code David Turner
2015-10-28  2:14 ` [PATCH v5 05/26] refs.c: move update_ref to refs.c David Turner
2015-10-28  2:14 ` [PATCH v5 06/26] refs.c: move delete_pseudoref and delete_ref to the common code David Turner
2015-10-28  2:14 ` [PATCH v5 07/26] refs.c: move read_ref_at to the common refs file David Turner
2015-10-28  2:14 ` [PATCH v5 08/26] refs.c: move the hidden refs functions to the common code David Turner
2015-10-28  2:14 ` [PATCH v5 09/26] refs.c: move dwim and friend functions to the common refs code David Turner
2015-10-28  2:14 ` [PATCH v5 10/26] refs.c: move warn_if_dangling_symref* to the common code David Turner
2015-10-28  2:14 ` [PATCH v5 11/26] refs.c: move read_ref, read_ref_full and ref_exists " David Turner
2015-10-28  2:14 ` [PATCH v5 12/26] refs.c: move resolve_refdup to common David Turner
2015-10-28  2:14 ` [PATCH v5 13/26] refs.c: move check_refname_format to the common code David Turner
2015-10-28  2:14 ` [PATCH v5 14/26] refs.c: move is_branch " David Turner
2015-10-28  2:14 ` [PATCH v5 15/26] refs.c: move prettify_refname " David Turner
2015-10-28  2:14 ` [PATCH v5 16/26] refs.c: move ref iterators " David Turner
2015-11-01  4:39   ` Michael Haggerty
2015-10-28  2:14 ` [PATCH v5 17/26] refs.c: move head_ref_namespaced " David Turner
2015-10-28  2:14 ` [PATCH v5 18/26] refs: move transaction functions into " David Turner
2015-11-01  8:17   ` Michael Haggerty
2015-11-02 22:19     ` David Turner
2015-10-28  2:14 ` David Turner [this message]
2015-10-28  2:14 ` [PATCH v5 20/26] refs.c: move copy_msg to the " David Turner
2015-10-28  2:14 ` [PATCH v5 21/26] refs.c: move peel_object " David Turner
2015-10-28  2:14 ` [PATCH v5 22/26] refs.c: move should_autocreate_reflog to " David Turner
2015-10-28  2:14 ` [PATCH v5 23/26] initdb: move safe_create_dir into " David Turner
2015-10-28  2:14 ` [PATCH v5 24/26] refs: make files_log_ref_write functions public David Turner
2015-10-28  2:14 ` [PATCH v5 25/26] refs: break out ref conflict checks David Turner
2015-11-02 16:52   ` Michael Haggerty
2015-10-28  2:14 ` [PATCH v5 26/26] introduce "extensions" form of core.repositoryformatversion David Turner
2015-11-03  7:36 ` [PATCH v5 00/26] refs backend pre-vtable Michael Haggerty
2015-11-03  7:39 ` [PATCH v6 00/25] " Michael Haggerty
2015-11-03  7:39   ` [PATCH v6 01/25] refs: make is_branch public Michael Haggerty
2015-11-03  7:39   ` [PATCH v6 02/25] refs/files-backend.c: new file, renamed from refs.c Michael Haggerty
2015-11-03  7:39   ` [PATCH v6 03/25] refs: add a new file, refs/refs.c, to hold common refs code Michael Haggerty
2015-11-03  7:39   ` [PATCH v6 04/25] refs: move update_ref to refs/refs.c Michael Haggerty
2015-11-03  7:39   ` [PATCH v6 05/25] refs: move delete_pseudoref and delete_ref to the common code Michael Haggerty
2015-11-03  7:39   ` [PATCH v6 06/25] refs: move read_ref_at to the common refs file Michael Haggerty
2015-11-03  7:39   ` [PATCH v6 07/25] refs: move the hidden refs functions to the common code Michael Haggerty
2015-11-03  7:39   ` [PATCH v6 08/25] refs: move dwim and friend functions to the common refs code Michael Haggerty
2015-11-03  7:39   ` [PATCH v6 09/25] refs: move warn_if_dangling_symref* to the common code Michael Haggerty
2015-11-03  7:39   ` [PATCH v6 10/25] refs: move read_ref, read_ref_full and ref_exists " Michael Haggerty
2015-11-03  7:39   ` [PATCH v6 11/25] refs: move resolve_refdup to common Michael Haggerty
2015-11-03  7:39   ` [PATCH v6 12/25] refs: move check_refname_format to the common code Michael Haggerty
2015-11-03  7:39   ` [PATCH v6 13/25] refs: move is_branch " Michael Haggerty
2015-11-03  7:39   ` [PATCH v6 14/25] refs: move prettify_refname " Michael Haggerty
2015-11-03  7:39   ` [PATCH v6 15/25] refs: move ref iterators " Michael Haggerty
2015-11-03  7:40   ` [PATCH v6 16/25] refs: move head_ref_namespaced " Michael Haggerty
2015-11-03  7:40   ` [PATCH v6 17/25] refs: move transaction functions " Michael Haggerty
2015-11-03  7:40   ` [PATCH v6 18/25] refs: move refname_is_safe " Michael Haggerty
2015-11-03  7:40   ` [PATCH v6 19/25] refs: move copy_msg " Michael Haggerty
2015-11-03  7:40   ` [PATCH v6 20/25] refs: move peel_object " Michael Haggerty
2015-11-03  7:40   ` [PATCH v6 21/25] refs: move should_autocreate_reflog to " Michael Haggerty
2015-11-03  7:40   ` [PATCH v6 22/25] initdb: make safe_create_dir public Michael Haggerty
2015-11-03  7:40   ` [PATCH v6 23/25] files_log_ref_write: new function Michael Haggerty
2015-11-03  7:40   ` [PATCH v6 24/25] refs: create a shared version of verify_refname_available Michael Haggerty
2015-11-03  7:40   ` [PATCH v6 25/25] refs: break out ref conflict checks Michael Haggerty
2015-11-04 21:01     ` David Turner
2015-11-05  4:00       ` Michael Haggerty
2015-11-05 16:22         ` David Turner
2015-11-06 13:34           ` Michael Haggerty
2015-11-06 17:28             ` Junio C Hamano
2015-11-06 23:24               ` Junio C Hamano
2015-11-08  5:03                 ` Michael Haggerty
2015-11-08  5:54                   ` Michael Haggerty
2015-11-08 18:23                   ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1445998467-11511-20-git-send-email-dturner@twopensource.com \
    --to=dturner@twopensource.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mhagger@alum.mit.edu \
    --cc=sahlberg@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.