Browse Source

initdb: make safe_create_dir public

Soon we will want to create initdb functions for ref backends, and
code from initdb that calls this function needs to move into the files
backend. So this function needs to be public.

Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Jeff King <peff@peff.net>
maint
David Turner 9 years ago committed by Jeff King
parent
commit
eb33876c26
  1. 12
      builtin/init-db.c
  2. 8
      cache.h
  3. 12
      path.c

12
builtin/init-db.c

@ -24,18 +24,6 @@ static int init_shared_repository = -1; @@ -24,18 +24,6 @@ static int init_shared_repository = -1;
static const char *init_db_template_dir;
static const char *git_link;

static void safe_create_dir(const char *dir, int share)
{
if (mkdir(dir, 0777) < 0) {
if (errno != EEXIST) {
perror(dir);
exit(1);
}
}
else if (share && adjust_shared_perm(dir))
die(_("Could not make %s writable by group"), dir);
}

static void copy_templates_1(struct strbuf *path, struct strbuf *template,
DIR *dir)
{

8
cache.h

@ -1747,4 +1747,12 @@ void stat_validity_update(struct stat_validity *sv, int fd); @@ -1747,4 +1747,12 @@ void stat_validity_update(struct stat_validity *sv, int fd);
int versioncmp(const char *s1, const char *s2);
void sleep_millisec(int millisec);

/*
* Create a directory and (if share is nonzero) adjust its permissions
* according to the shared_repository setting. Only use this for
* directories under $GIT_DIR. Don't use it for working tree
* directories.
*/
void safe_create_dir(const char *dir, int share);

#endif /* CACHE_H */

12
path.c

@ -740,6 +740,18 @@ int adjust_shared_perm(const char *path) @@ -740,6 +740,18 @@ int adjust_shared_perm(const char *path)
return 0;
}

void safe_create_dir(const char *dir, int share)
{
if (mkdir(dir, 0777) < 0) {
if (errno != EEXIST) {
perror(dir);
exit(1);
}
}
else if (share && adjust_shared_perm(dir))
die(_("Could not make %s writable by group"), dir);
}

static int have_same_root(const char *path1, const char *path2)
{
int is_abs1, is_abs2;

Loading…
Cancel
Save