git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 02/30] get_ref_dir(): use a strbuf to hold refname

From
mhagger@alum.mit.edu <mhagger@alum.mit.edu>
Date
Apr 24, 2012, 22:45 UTC
Message-ID
<1335307536-26914-3-git-send-email-mhagger@alum.mit.edu>
In-Reply-To
<1335307536-26914-1-git-send-email-mhagger@alum.mit.edu>
From: Michael Haggerty <mhagger@alum.mit.edu>

This simplifies the bookkeeping and allows an (artificial) restriction on refname component length to be removed.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
 refs.c |   54 ++++++++++++++++++++++++++----------------------------
 1 file changed, 26 insertions(+), 28 deletions(-)
diff --git a/refs.c b/refs.c
index d539241..df98622 100644
--- a/refs.c
+++ b/refs.c
@@ -756,7 +756,7 @@ static void get_ref_dir(struct ref_cache *refs, const char *base,
 	const char *path;
 	struct dirent *de;
 	int baselen;
-	char *refname;
+	struct strbuf refname;
 
 	if (*refs->name)
 		path = git_path_submodule(refs->name, "%s", base);
@@ -768,50 +768,48 @@ static void get_ref_dir(struct ref_cache *refs, const char *base,
 		return;
 
 	baselen = strlen(base);
-	refname = xmalloc(baselen + 257);
-
-	memcpy(refname, base, baselen);
-	if (baselen && base[baselen-1] != '/')
-		refname[baselen++] = '/';
+	strbuf_init(&refname, baselen + 257);
+	strbuf_add(&refname, base, baselen);
+	if (baselen && base[baselen-1] != '/') {
+		strbuf_addch(&refname, '/');
+		baselen++;
+	}
 
 	while ((de = readdir(d)) != NULL) {
 		unsigned char sha1[20];
 		struct stat st;
 		int flag;
-		int namelen;
 		const char *refdir;
 
 		if (de->d_name[0] == '.')
 			continue;
-		namelen = strlen(de->d_name);
-		if (namelen > 255)
-			continue;
 		if (has_extension(de->d_name, ".lock"))
 			continue;
-		memcpy(refname + baselen, de->d_name, namelen+1);
+		strbuf_addstr(&refname, de->d_name);
 		refdir = *refs->name
-			? git_path_submodule(refs->name, "%s", refname)
-			: git_path("%s", refname);
-		if (stat(refdir, &st) < 0)
-			continue;
-		if (S_ISDIR(st.st_mode)) {
-			get_ref_dir(refs, refname, dir);
-			continue;
-		}
-		if (*refs->name) {
-			hashclr(sha1);
-			flag = 0;
-			if (resolve_gitlink_ref(refs->name, refname, sha1) < 0) {
+			? git_path_submodule(refs->name, "%s", refname.buf)
+			: git_path("%s", refname.buf);
+		if (stat(refdir, &st) < 0) {
+			/* Silently ignore. */
+		} else if (S_ISDIR(st.st_mode)) {
+			get_ref_dir(refs, refname.buf, dir);
+		} else {
+			if (*refs->name) {
+				hashclr(sha1);
+				flag = 0;
+				if (resolve_gitlink_ref(refs->name, refname.buf, sha1) < 0) {
+					hashclr(sha1);
+					flag |= REF_ISBROKEN;
+				}
+			} else if (read_ref_full(refname.buf, sha1, 1, &flag)) {
 				hashclr(sha1);
 				flag |= REF_ISBROKEN;
 			}
-		} else if (read_ref_full(refname, sha1, 1, &flag)) {
-			hashclr(sha1);
-			flag |= REF_ISBROKEN;
+			add_ref(dir, create_ref_entry(refname.buf, sha1, flag, 1));
 		}
-		add_ref(dir, create_ref_entry(refname, sha1, flag, 1));
+		strbuf_setlen(&refname, baselen);
 	}
-	free(refname);
+	strbuf_release(&refname);
 	closedir(d);
 }
 

-- 
1.7.10
Previous: mhagger@alum.mit.eduNext: mhagger@alum.mit.edu
Message 3 of 37 in “Read loose references lazily”
  1. 00/30 Read loose references lazilymhagger@alum.mit.edu, Apr 24, 2012
  2. 01/30 get_ref_dir(): return early if directory cannot be readmhagger@alum.mit.edu, Apr 24, 2012
  3. 02/30 get_ref_dir(): use a strbuf to hold refnamemhagger@alum.mit.edu, Apr 24, 2012
  4. 03/30 get_ref_dir(): rename "base" parameter to "dirname"mhagger@alum.mit.edu, Apr 24, 2012
  5. 04/30 get_ref_dir(): require that the dirname argument ends in '/'mhagger@alum.mit.edu, Apr 24, 2012
  6. 05/30 refs.c: extract function search_for_subdir()mhagger@alum.mit.edu, Apr 24, 2012
  7. 06/30 get_ref_dir(): take the containing directory as argumentmhagger@alum.mit.edu, Apr 24, 2012
  8. 07/30 do_for_each_reflog(): return early on errormhagger@alum.mit.edu, Apr 24, 2012
  9. 08/30 do_for_each_reflog(): use a strbuf to hold logfile namemhagger@alum.mit.edu, Apr 24, 2012
  10. 09/30 do_for_each_reflog(): reuse strbuf across recursive function callsmhagger@alum.mit.edu, Apr 24, 2012
  11. 10/30 refs: wrap top-level ref_dirs in ref_entriesmhagger@alum.mit.edu, Apr 24, 2012
  12. Michael HaggertyApr 26, 2012
  13. 11/30 get_packed_refs(): return (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  14. 12/30 get_loose_refs(): return (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  15. 13/30 is_refname_available(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  16. 14/30 find_ref(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  17. 15/30 read_packed_refs(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  18. 16/30 add_ref(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  19. 17/30 find_containing_direntry(): use (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  20. 18/30 get_ref_dir(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  21. 19/30 get_ref_dir(): remove dirname argumentmhagger@alum.mit.edu, Apr 24, 2012
  22. 20/30 search_for_subdir(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  23. 21/30 search_ref_dir(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  24. 22/30 add_entry(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  25. 23/30 do_for_each_ref_in_dirs(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  26. 24/30 do_for_each_ref_in_dir(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  27. 25/30 sort_ref_dir(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  28. 26/30 struct ref_dir: store a reference to the enclosing ref_cachemhagger@alum.mit.edu, Apr 24, 2012
  29. 27/30 read_loose_refs(): rename function from get_ref_dir()mhagger@alum.mit.edu, Apr 24, 2012
  30. 28/30 read_loose_refs(): access ref_cache via the ref_dir fieldmhagger@alum.mit.edu, Apr 24, 2012
  31. 29/30 create_dir_entry(): allow the flag value to be passed as an argumentmhagger@alum.mit.edu, Apr 24, 2012
  32. Junio C HamanoApr 25, 2012
  33. Junio C HamanoApr 25, 2012
  34. Michael HaggertyApr 26, 2012
  35. 30/30 refs: read loose references lazilymhagger@alum.mit.edu, Apr 24, 2012
  36. Junio C HamanoApr 25, 2012
  37. Michael HaggertyApr 26, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.