summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-09-11 19:03:15 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-09-16 09:21:11 (GMT)
commite7676d2f6454c9c99e600ee2ce3c7205a9fcfb5f (patch)
treef7aa5183b7bbf18debc5cd50a4ea24d632d79ed4
parent9d0734ae49c8c0a5a2c6b6bf85011d095182e357 (diff)
downloadgit-e7676d2f6454c9c99e600ee2ce3c7205a9fcfb5f.zip
git-e7676d2f6454c9c99e600ee2ce3c7205a9fcfb5f.tar.gz
git-e7676d2f6454c9c99e600ee2ce3c7205a9fcfb5f.tar.bz2
Allow multiple "git_path()" uses
This allows you to maintain a few filesystem pathnames concurrently, by simply replacing the single static "pathname" buffer with a LRU of four buffers. We did exactly the same thing with sha1_to_hex(), for pretty much exactly the same reason. Sometimes you want to use two pathnames, and while it's easy enough to xstrdup() them, why not just do the LU buffer thing. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--path.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/path.c b/path.c
index db8905f..bb89fb0 100644
--- a/path.c
+++ b/path.c
@@ -13,9 +13,15 @@
#include "cache.h"
#include <pwd.h>
-static char pathname[PATH_MAX];
static char bad_path[] = "/bad-path/";
+static char *get_pathname(void)
+{
+ static char pathname_array[4][PATH_MAX];
+ static int index;
+ return pathname_array[3 & ++index];
+}
+
static char *cleanup_path(char *path)
{
/* Clean it up */
@@ -31,6 +37,7 @@ char *mkpath(const char *fmt, ...)
{
va_list args;
unsigned len;
+ char *pathname = get_pathname();
va_start(args, fmt);
len = vsnprintf(pathname, PATH_MAX, fmt, args);
@@ -43,6 +50,7 @@ char *mkpath(const char *fmt, ...)
char *git_path(const char *fmt, ...)
{
const char *git_dir = get_git_dir();
+ char *pathname = get_pathname();
va_list args;
unsigned len;