wrap shared_repository global in get/set accessors

It would be useful to control access to the global
shared_repository, so that we can lazily load its config.
The first step to doing so is to make sure all access
goes through a set of functions.

This step is purely mechanical, and should result in no
change of behavior.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/init-db.c b/builtin/init-db.c
index 6223b7d46af346b0d96870ee0c647ab9a5440b33..e9b22569ff00ce1bf85d7969c44667d644adc82f 100644 (file)
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -199,13 +199,13 @@ static int create_default_files(const char *template_path)
 
        /* reading existing config may have overwrote it */
        if (init_shared_repository != -1)
 
        /* reading existing config may have overwrote it */
        if (init_shared_repository != -1)

-               shared_repository = init_shared_repository;
+               set_shared_repository(init_shared_repository);

 
        /*
         * We would have created the above under user's umask -- under
         * shared-repository settings, we would need to fix them up.
         */
 
        /*
         * We would have created the above under user's umask -- under
         * shared-repository settings, we would need to fix them up.
         */

-       if (shared_repository) {
+       if (get_shared_repository()) {

                adjust_shared_perm(get_git_dir());
                adjust_shared_perm(git_path_buf(&buf, "refs"));
                adjust_shared_perm(git_path_buf(&buf, "refs/heads"));
                adjust_shared_perm(get_git_dir());
                adjust_shared_perm(git_path_buf(&buf, "refs"));
                adjust_shared_perm(git_path_buf(&buf, "refs/heads"));


@@ -369,7 +369,7 @@ int init_db(const char *template_dir, unsigned int flags)
 
        create_object_directory();
 
 
        create_object_directory();
 

-       if (shared_repository) {
+       if (get_shared_repository()) {

                char buf[10];
                /* We do not spell "group" and such, so that
                 * the configuration can be read by older version
                char buf[10];
                /* We do not spell "group" and such, so that
                 * the configuration can be read by older version


@@ -377,12 +377,12 @@ int init_db(const char *template_dir, unsigned int flags)
                 * and compatibility values for PERM_GROUP and
                 * PERM_EVERYBODY.
                 */
                 * and compatibility values for PERM_GROUP and
                 * PERM_EVERYBODY.
                 */

-               if (shared_repository < 0)
+               if (get_shared_repository() < 0)

                        /* force to the mode value */
                        /* force to the mode value */

-                       xsnprintf(buf, sizeof(buf), "0%o", -shared_repository);
-               else if (shared_repository == PERM_GROUP)
+                       xsnprintf(buf, sizeof(buf), "0%o", -get_shared_repository());
+               else if (get_shared_repository() == PERM_GROUP)

                        xsnprintf(buf, sizeof(buf), "%d", OLD_PERM_GROUP);
                        xsnprintf(buf, sizeof(buf), "%d", OLD_PERM_GROUP);

-               else if (shared_repository == PERM_EVERYBODY)
+               else if (get_shared_repository() == PERM_EVERYBODY)

                        xsnprintf(buf, sizeof(buf), "%d", OLD_PERM_EVERYBODY);
                else
                        die("BUG: invalid value for shared_repository");
                        xsnprintf(buf, sizeof(buf), "%d", OLD_PERM_EVERYBODY);
                else
                        die("BUG: invalid value for shared_repository");


@@ -398,7 +398,7 @@ int init_db(const char *template_dir, unsigned int flags)
                   "", and the last '%s%s' is the verbatim directory name. */
                printf(_("%s%s Git repository in %s%s\n"),
                       reinit ? _("Reinitialized existing") : _("Initialized empty"),
                   "", and the last '%s%s' is the verbatim directory name. */
                printf(_("%s%s Git repository in %s%s\n"),
                       reinit ? _("Reinitialized existing") : _("Initialized empty"),

-                      shared_repository ? _(" shared") : "",
+                      get_shared_repository() ? _(" shared") : "",

                       git_dir, len && git_dir[len-1] != '/' ? "/" : "");
        }
 
                       git_dir, len && git_dir[len-1] != '/' ? "/" : "");
        }
 


@@ -493,8 +493,8 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
                                 * and we know shared_repository should always be 0;
                                 * but just in case we play safe.
                                 */
                                 * and we know shared_repository should always be 0;
                                 * but just in case we play safe.
                                 */

-                               saved = shared_repository;
-                               shared_repository = 0;
+                               saved = get_shared_repository();
+                               set_shared_repository(0);

                                switch (safe_create_leading_directories_const(argv[0])) {
                                case SCLD_OK:
                                case SCLD_PERMS:
                                switch (safe_create_leading_directories_const(argv[0])) {
                                case SCLD_OK:
                                case SCLD_PERMS:


@@ -506,7 +506,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
                                        die_errno(_("cannot mkdir %s"), argv[0]);
                                        break;
                                }
                                        die_errno(_("cannot mkdir %s"), argv[0]);
                                        break;
                                }

-                               shared_repository = saved;
+                               set_shared_repository(saved);

                                if (mkdir(argv[0], 0777) < 0)
                                        die_errno(_("cannot mkdir %s"), argv[0]);
                                mkdir_tried = 1;
                                if (mkdir(argv[0], 0777) < 0)
                                        die_errno(_("cannot mkdir %s"), argv[0]);
                                mkdir_tried = 1;


@@ -524,7 +524,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
        }
 
        if (init_shared_repository != -1)
        }
 
        if (init_shared_repository != -1)

-               shared_repository = init_shared_repository;
+               set_shared_repository(init_shared_repository);

 
        /*
         * GIT_WORK_TREE makes sense only in conjunction with GIT_DIR
 
        /*
         * GIT_WORK_TREE makes sense only in conjunction with GIT_DIR

diff --git a/cache.h b/cache.h
index 02e38d1a91e25ed76660b5cde5d4e2db9d2c88e9..fdb9583cf53fa9812adf039f6312cca8fd605a0a 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -651,7 +651,6 @@ extern int prefer_symlink_refs;
 extern int log_all_ref_updates;
 extern int warn_ambiguous_refs;
 extern int warn_on_object_refname_ambiguity;
 extern int log_all_ref_updates;
 extern int warn_ambiguous_refs;
 extern int warn_on_object_refname_ambiguity;

-extern int shared_repository;

 extern const char *apply_default_whitespace;
 extern const char *apply_default_ignorewhitespace;
 extern const char *git_attributes_file;
 extern const char *apply_default_whitespace;
 extern const char *apply_default_ignorewhitespace;
 extern const char *git_attributes_file;


@@ -664,6 +663,9 @@ extern size_t delta_base_cache_limit;
 extern unsigned long big_file_threshold;
 extern unsigned long pack_size_limit_cfg;
 
 extern unsigned long big_file_threshold;
 extern unsigned long pack_size_limit_cfg;
 

+void set_shared_repository(int value);
+int get_shared_repository(void);
+

 /*
  * Do replace refs need to be checked this run?  This variable is
  * initialized to true unless --no-replace-object is used or
 /*
  * Do replace refs need to be checked this run?  This variable is
  * initialized to true unless --no-replace-object is used or

diff --git a/environment.c b/environment.c
index 6dec9d0403f11579a7ab316db87a1dbbc58e71b2..b42e2384348523749f5cea8c85f7601ef4a92199 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -29,7 +29,6 @@ int repository_format_version;
 int repository_format_precious_objects;
 const char *git_commit_encoding;
 const char *git_log_output_encoding;
 int repository_format_precious_objects;
 const char *git_commit_encoding;
 const char *git_log_output_encoding;

-int shared_repository = PERM_UMASK;

 const char *apply_default_whitespace;
 const char *apply_default_ignorewhitespace;
 const char *git_attributes_file;
 const char *apply_default_whitespace;
 const char *apply_default_ignorewhitespace;
 const char *git_attributes_file;


@@ -325,3 +324,15 @@ const char *get_commit_output_encoding(void)
 {
        return git_commit_encoding ? git_commit_encoding : "UTF-8";
 }
 {
        return git_commit_encoding ? git_commit_encoding : "UTF-8";
 }

+
+static int the_shared_repository = PERM_UMASK;
+
+void set_shared_repository(int value)
+{
+       the_shared_repository = value;
+}
+
+int get_shared_repository(void)
+{
+       return the_shared_repository;
+}

diff --git a/path.c b/path.c
index 8b7e16812927645367c4912e88d2a5f3065efb85..a6f1cd69a06e02fb2a3881d87a32d34c1f8af854 100644 (file)
--- a/path.c
+++ b/path.c
@@ -699,17 +699,17 @@ static int calc_shared_perm(int mode)
 {
        int tweak;
 
 {
        int tweak;
 

-       if (shared_repository < 0)
-               tweak = -shared_repository;
+       if (get_shared_repository() < 0)
+               tweak = -get_shared_repository();

        else
        else

-               tweak = shared_repository;
+               tweak = get_shared_repository();

 
        if (!(mode & S_IWUSR))
                tweak &= ~0222;
        if (mode & S_IXUSR)
                /* Copy read bits to execute bits */
                tweak |= (tweak & 0444) >> 2;
 
        if (!(mode & S_IWUSR))
                tweak &= ~0222;
        if (mode & S_IXUSR)
                /* Copy read bits to execute bits */
                tweak |= (tweak & 0444) >> 2;

-       if (shared_repository < 0)
+       if (get_shared_repository() < 0)

                mode = (mode & ~0777) | tweak;
        else
                mode |= tweak;
                mode = (mode & ~0777) | tweak;
        else
                mode |= tweak;


@@ -722,7 +722,7 @@ int adjust_shared_perm(const char *path)
 {
        int old_mode, new_mode;
 
 {
        int old_mode, new_mode;
 

-       if (!shared_repository)
+       if (!get_shared_repository())

                return 0;
        if (get_st_mode_bits(path, &old_mode) < 0)
                return -1;
                return 0;
        if (get_st_mode_bits(path, &old_mode) < 0)
                return -1;

diff --git a/setup.c b/setup.c
index b2f2e690e46d6dae1372a7022a0eca71a7fb80ed..ac777c5f10d79527470b52335d6fc48a7ee5c89e 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -377,7 +377,7 @@ static int check_repo_format(const char *var, const char *value, void *cb)
        if (strcmp(var, "core.repositoryformatversion") == 0)
                repository_format_version = git_config_int(var, value);
        else if (strcmp(var, "core.sharedrepository") == 0)
        if (strcmp(var, "core.repositoryformatversion") == 0)
                repository_format_version = git_config_int(var, value);
        else if (strcmp(var, "core.sharedrepository") == 0)

-               shared_repository = git_config_perm(var, value);
+               set_shared_repository(git_config_perm(var, value));

        else if (skip_prefix(var, "extensions.", &ext)) {
                /*
                 * record any known extensions here; otherwise,
        else if (skip_prefix(var, "extensions.", &ext)) {
                /*
                 * record any known extensions here; otherwise,