diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-02-24 17:43:10 -0800 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-02-24 17:52:38 -0800 |
| commit | 83634d38be2d0a1ac006d912216cd6787c2b1542 (patch) | |
| tree | 9b13ce789492d17d2030992762959f36b8d89d71 /src/attr.c | |
| parent | 98b9366212ac6670bd5f90e70400e7cf09aea16a (diff) | |
| download | libgit2-83634d38be2d0a1ac006d912216cd6787c2b1542.tar.gz | |
Move system directory cache out of utils
Diffstat (limited to 'src/attr.c')
| -rw-r--r-- | src/attr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/attr.c b/src/attr.c index 15ed5c9e0..d8a171d0f 100644 --- a/src/attr.c +++ b/src/attr.c @@ -1,6 +1,6 @@ #include "common.h" #include "repository.h" -#include "fileops.h" +#include "sysdir.h" #include "config.h" #include "attr.h" #include "ignore.h" @@ -589,7 +589,7 @@ static int collect_attr_files( } if ((flags & GIT_ATTR_CHECK_NO_SYSTEM) == 0) { - error = git_futils_find_system_file(&dir, GIT_ATTR_FILE_SYSTEM); + error = git_sysdir_find_system_file(&dir, GIT_ATTR_FILE_SYSTEM); if (!error) error = push_attr_file(repo, files, NULL, dir.ptr); else if (error == GIT_ENOTFOUND) { @@ -623,13 +623,13 @@ static int attr_cache__lookup_path( /* expand leading ~/ as needed */ if (cfgval && cfgval[0] == '~' && cfgval[1] == '/' && - !git_futils_find_global_file(&buf, &cfgval[2])) + !git_sysdir_find_global_file(&buf, &cfgval[2])) *out = git_buf_detach(&buf); else if (cfgval) *out = git__strdup(cfgval); } - else if (!git_futils_find_xdg_file(&buf, fallback)) + else if (!git_sysdir_find_xdg_file(&buf, fallback)) *out = git_buf_detach(&buf); git_buf_free(&buf); |