mmap: set FD_CLOEXEC for file descriptors we keep open for mmap()

[git.git] / config.c

diff --git a/config.c b/config.c
index fcccf7e2a4f3b7487af10d4f7b505c7ef492b9e8..2e0d5a8681c1167b178a355782c90149adc42d9f 100644 (file)
--- a/config.c
+++ b/config.c
@@ -298,6 +298,21 @@ int git_default_config(const char *var, const char *value)
                return 0;
        }
 
+       if (!strcmp(var, "core.packedgitwindowsize")) {
+               int pgsz = getpagesize();
+               packed_git_window_size = git_config_int(var, value);
+               packed_git_window_size /= pgsz;
+               if (packed_git_window_size < 2)
+                       packed_git_window_size = 2;
+               packed_git_window_size *= pgsz;
+               return 0;
+       }
+
+       if (!strcmp(var, "core.packedgitlimit")) {
+               packed_git_limit = git_config_int(var, value);
+               return 0;
+       }
+
        if (!strcmp(var, "user.name")) {
                strlcpy(git_default_name, value, sizeof(git_default_name));
                return 0;
@@ -689,7 +704,7 @@ int git_config_set_multivar(const char* key, const char* value,
                }
 
                fstat(in_fd, &st);
-               contents = mmap(NULL, st.st_size, PROT_READ,
+               contents = xmmap(NULL, st.st_size, PROT_READ,
                        MAP_PRIVATE, in_fd, 0);
                close(in_fd);