From ec56af08a9aa9ae261325f5037ec0d5114517d55 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Thu, 31 Jan 2013 17:37:20 +0100
Subject: [PATCH] Refactored: Move msysgit registry detection to it's own
 function

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 src/win32/findfile.c | 51 +++++++++++++++++++++++++-------------------
 src/win32/findfile.h |  1 +
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/win32/findfile.c b/src/win32/findfile.c
index 8c4fc7a4a..c93b0727e 100644
--- a/src/win32/findfile.c
+++ b/src/win32/findfile.c
@@ -113,28 +113,7 @@ int win32_find_system_file_using_registry(git_buf *path, const char *filename)
 {
 	struct win32_path root;
 
-	HKEY hKey;
-	DWORD dwType = REG_SZ;
-	DWORD dwSize = MAX_PATH;
-
-	root.len = 0;
-	if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, REG_MSYSGIT_INSTALL, 0, KEY_ALL_ACCESS, &hKey) == ERROR_SUCCESS)
-	{
-		if (RegQueryValueExW(hKey, L"InstallLocation", NULL, &dwType,(LPBYTE)&root.path, &dwSize) == ERROR_SUCCESS)
-		{
-			// InstallLocation points to the root of the msysgit directory
-			if (dwSize + 4 > MAX_PATH) // 4 = wcslen(L"etc\\")
-			{
-				giterr_set(GITERR_OS, "Cannot locate the system's msysgit directory - path too long");
-				return -1;
-			}
-			wcscat(root.path, L"etc\\");
-			root.len = (DWORD)wcslen(root.path) + 1;
-		}
-	}
-	RegCloseKey(hKey);
-
-	if (!root.len) {
+	if (win32_find_msysgit_in_registry(&root, HKEY_LOCAL_MACHINE, REG_MSYSGIT_INSTALL)) {
 		giterr_set(GITERR_OS, "Cannot locate the system's msysgit directory");
 		return -1;
 	}
@@ -147,3 +126,31 @@ int win32_find_system_file_using_registry(git_buf *path, const char *filename)
 
 	return 0;
 }
+
+int win32_find_msysgit_in_registry(struct win32_path *root, const HKEY hieve, const wchar_t *key)
+{
+	HKEY hKey;
+	DWORD dwType = REG_SZ;
+	DWORD dwSize = MAX_PATH;
+
+	assert(root);
+
+	root->len = 0;
+	if (RegOpenKeyExW(hieve, key, 0, KEY_ALL_ACCESS, &hKey) == ERROR_SUCCESS)
+	{
+		if (RegQueryValueExW(hKey, L"InstallLocation", NULL, &dwType, (LPBYTE)&root->path, &dwSize) == ERROR_SUCCESS)
+		{
+			// InstallLocation points to the root of the msysgit directory
+			if (dwSize + 4 > MAX_PATH) // 4 = wcslen(L"etc\\")
+			{
+				giterr_set(GITERR_OS, "Cannot locate the system's msysgit directory - path too long");
+				return -1;
+			}
+			wcscat(root->path, L"etc\\");
+			root->len = (DWORD)wcslen(root->path) + 1;
+		}
+	}
+	RegCloseKey(hKey);
+
+	return root->len ? 0 : GIT_ENOTFOUND;
+}
diff --git a/src/win32/findfile.h b/src/win32/findfile.h
index 918991cf9..47fe71596 100644
--- a/src/win32/findfile.h
+++ b/src/win32/findfile.h
@@ -18,6 +18,7 @@ int win32_expand_path(struct win32_path *s_root, const wchar_t *templ);
 int win32_find_file(git_buf *path, const struct win32_path *root, const char *filename);
 int win32_find_system_file_using_path(git_buf *path, const char *filename);
 int win32_find_system_file_using_registry(git_buf *path, const char *filename);
+int win32_find_msysgit_in_registry(struct win32_path *root, const HKEY hieve, const wchar_t *key);
 
 #endif