Commit ed0be48b939b1cc6329c6a75114dcd4158a720f5
2013-07-11T15:36:03
Merge pull request #1721 from ethomson/config_paths preload configuration paths
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
diff --git a/src/fileops.c b/src/fileops.c
index 1f58fa5..db53d4f 100644
--- a/src/fileops.c
+++ b/src/fileops.c
@@ -627,6 +627,20 @@ static git_futils_dirs_guess_cb git_futils__dir_guess[GIT_FUTILS_DIR__MAX] = {
git_futils_guess_xdg_dirs,
};
+int git_futils_dirs_global_init(void)
+{
+ git_futils_dir_t i;
+ git_buf *path;
+ int error = 0;
+
+ for (i = 0; i < GIT_FUTILS_DIR__MAX; i++) {
+ if ((error = git_futils_dirs_get(&path, i)) < 0)
+ break;
+ }
+
+ return error;
+}
+
static int git_futils_check_selector(git_futils_dir_t which)
{
if (which < GIT_FUTILS_DIR__MAX)
diff --git a/src/fileops.h b/src/fileops.h
index f4e059c..d23ebaf 100644
--- a/src/fileops.h
+++ b/src/fileops.h
@@ -310,6 +310,13 @@ typedef enum {
} git_futils_dir_t;
/**
+ * Configures global data for configuration file search paths.
+ *
+ * @return 0 on success, <0 on failure
+ */
+extern int git_futils_dirs_global_init(void);
+
+/**
* Get the search path for global/system/xdg files
*
* @param out pointer to git_buf containing search path
diff --git a/src/global.c b/src/global.c
index 2d40ca2..a06d0c8 100644
--- a/src/global.c
+++ b/src/global.c
@@ -65,10 +65,8 @@ int git_threads_init(void)
return -1;
/* Initialize any other subsystems that have global state */
- if ((error = git_hash_global_init()) >= 0)
- _tls_init = 1;
-
- if (error == 0)
+ if ((error = git_hash_global_init()) >= 0 &&
+ (error = git_futils_dirs_global_init()) >= 0)
_tls_init = 1;
GIT_MEMORY_BARRIER;
@@ -127,7 +125,8 @@ int git_threads_init(void)
pthread_key_create(&_tls_key, &cb__free_status);
/* Initialize any other subsystems that have global state */
- if ((error = git_hash_global_init()) >= 0)
+ if ((error = git_hash_global_init()) >= 0 &&
+ (error = git_futils_dirs_global_init()) >= 0)
_tls_init = 1;
GIT_MEMORY_BARRIER;