summaryrefslogtreecommitdiff
path: root/wrapper.c
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-11-06 11:45:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-10 19:03:38 (GMT)
commit463db9b104b5db7d574ce4c5ede8caaa6d02ff4c (patch)
tree1be5e1190a0bd603e612286e63c36cd1d105841c /wrapper.c
parent58ecbd5edeb2357c313db75bc49d45981a2061b7 (diff)
downloadgit-463db9b104b5db7d574ce4c5ede8caaa6d02ff4c.zip
git-463db9b104b5db7d574ce4c5ede8caaa6d02ff4c.tar.gz
git-463db9b104b5db7d574ce4c5ede8caaa6d02ff4c.tar.bz2
wrapper: move odb_* to environment.c
The odb_mkstemp and odb_pack_keep functions open files under the $GIT_OBJECT_DIRECTORY directory. This requires access to the git configuration which very simple programs do not need. Move these functions to environment.o, closer to their dependencies. This should make it easier for programs to link to wrapper.o without linking to environment.o. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wrapper.c')
-rw-r--r--wrapper.c37
1 files changed, 0 insertions, 37 deletions
diff --git a/wrapper.c b/wrapper.c
index 3195ef3..e67b70a 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -274,43 +274,6 @@ int git_inflate(z_streamp strm, int flush)
return ret;
}
-int odb_mkstemp(char *template, size_t limit, const char *pattern)
-{
- int fd;
- /*
- * we let the umask do its job, don't try to be more
- * restrictive except to remove write permission.
- */
- int mode = 0444;
- snprintf(template, limit, "%s/%s",
- get_object_directory(), pattern);
- fd = git_mkstemp_mode(template, mode);
- if (0 <= fd)
- return fd;
-
- /* slow path */
- /* some mkstemp implementations erase template on failure */
- snprintf(template, limit, "%s/%s",
- get_object_directory(), pattern);
- safe_create_leading_directories(template);
- return xmkstemp_mode(template, mode);
-}
-
-int odb_pack_keep(char *name, size_t namesz, unsigned char *sha1)
-{
- int fd;
-
- snprintf(name, namesz, "%s/pack/pack-%s.keep",
- get_object_directory(), sha1_to_hex(sha1));
- fd = open(name, O_RDWR|O_CREAT|O_EXCL, 0600);
- if (0 <= fd)
- return fd;
-
- /* slow path */
- safe_create_leading_directories(name);
- return open(name, O_RDWR|O_CREAT|O_EXCL, 0600);
-}
-
static int warn_if_unremovable(const char *op, const char *file, int rc)
{
if (rc < 0) {