mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lockfile: add accessor get_lock_file_path()

Browse Source 
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty
2015-08-10 11:47:39 +02:00
committed by Junio C Hamano
parent c99a4c2db3
commit b4fb09e4da
6 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config.c
View File

@ -2056,9 +2056,9 @@ int git_config_set_multivar_in_file(const char *config_filename,
MAP_PRIVATE, in_fd, 0);
close(in_fd);
if (chmod(lock->filename.buf, st.st_mode & 07777) < 0) {
if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) {
error("chmod on %s failed: %s",
lock->filename.buf, strerror(errno));
get_lock_file_path(lock), strerror(errno));
ret = CONFIG_NO_WRITE;
goto out_free;
}
@ -2138,7 +2138,7 @@ out_free:
return ret;
write_err_out:
ret = write_error(lock->filename.buf);
ret = write_error(get_lock_file_path(lock));
goto out_free;
}
@ -2239,9 +2239,9 @@ int git_config_rename_section_in_file(const char *config_filename,
fstat(fileno(config_file), &st);
if (chmod(lock->filename.buf, st.st_mode & 07777) < 0) {
if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) {
ret = error("chmod on %s failed: %s",
lock->filename.buf, strerror(errno));
get_lock_file_path(lock), strerror(errno));
goto out;
}
@ -2262,7 +2262,7 @@ int git_config_rename_section_in_file(const char *config_filename,
}
store.baselen = strlen(new_name);
if (!store_write_section(out_fd, new_name)) {
ret = write_error(lock->filename.buf);
ret = write_error(get_lock_file_path(lock));
goto out;
}
/*
@ -2288,7 +2288,7 @@ int git_config_rename_section_in_file(const char *config_filename,
continue;
length = strlen(output);
if (write_in_full(out_fd, output, length) != length) {
ret = write_error(lock->filename.buf);
ret = write_error(get_lock_file_path(lock));
goto out;
}
}