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

cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN

Browse Source 
There are a few places that use these values, so define constants for
them.

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
2014-10-01 12:28:15 +02:00
committed by Junio C Hamano
parent 0a06f14837
commit 7108ad232f
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cache.h
View File

@ -570,6 +570,10 @@ extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
#define REFRESH_IN_PORCELAIN 0x0020 /* user friendly output, not "needs update" */ #define REFRESH_IN_PORCELAIN 0x0020 /* user friendly output, not "needs update" */
extern int refresh_index(struct index_state *, unsigned int flags, const struct pathspec *pathspec, char *seen, const char *header_msg); extern int refresh_index(struct index_state *, unsigned int flags, const struct pathspec *pathspec, char *seen, const char *header_msg);
/* String appended to a filename to derive the lockfile name: */
#define LOCK_SUFFIX ".lock"
#define LOCK_SUFFIX_LEN 5
struct lock_file { struct lock_file {
struct lock_file *next; struct lock_file *next;
int fd; int fd;

11
lockfile.c
View File

@ -166,10 +166,11 @@ static char *resolve_symlink(char *p, size_t s)
static int lock_file(struct lock_file *lk, const char *path, int flags) static int lock_file(struct lock_file *lk, const char *path, int flags)
{ {
/* /*
* subtract 5 from size to make sure there's room for adding * subtract LOCK_SUFFIX_LEN from size to make sure there's
* ".lock" for the lock file name * room for adding ".lock" for the lock file name:
*/ */
static const size_t max_path_len = sizeof(lk->filename) - 5; static const size_t max_path_len = sizeof(lk->filename) -
LOCK_SUFFIX_LEN;
if (!lock_file_list) { if (!lock_file_list) {
/* One-time initialization */ /* One-time initialization */
@ -194,7 +195,7 @@ static int lock_file(struct lock_file *lk, const char *path, int flags)
strcpy(lk->filename, path); strcpy(lk->filename, path);
if (!(flags & LOCK_NODEREF)) if (!(flags & LOCK_NODEREF))
resolve_symlink(lk->filename, max_path_len); resolve_symlink(lk->filename, max_path_len);
strcat(lk->filename, ".lock"); strcat(lk->filename, LOCK_SUFFIX);
lk->fd = open(lk->filename, O_RDWR | O_CREAT | O_EXCL, 0666); lk->fd = open(lk->filename, O_RDWR | O_CREAT | O_EXCL, 0666);
if (0 <= lk->fd) { if (0 <= lk->fd) {
lk->owner = getpid(); lk->owner = getpid();
@ -308,7 +309,7 @@ int commit_lock_file(struct lock_file *lk)
if (close_lock_file(lk)) if (close_lock_file(lk))
return -1; return -1;
strcpy(result_file, lk->filename); strcpy(result_file, lk->filename);
i = strlen(result_file) - 5; /* .lock */ i = strlen(result_file) - LOCK_SUFFIX_LEN; /* .lock */
result_file[i] = 0; result_file[i] = 0;
if (rename(lk->filename, result_file)) if (rename(lk->filename, result_file))
return -1; return -1;

7
refs.c
View File

@ -79,7 +79,8 @@ out:
if (refname[1] == '\0') if (refname[1] == '\0')
return -1; /* Component equals ".". */ return -1; /* Component equals ".". */
} }
if (cp - refname >= 5 && !memcmp(cp - 5, ".lock", 5)) if (cp - refname >= LOCK_SUFFIX_LEN &&
!memcmp(cp - LOCK_SUFFIX_LEN, LOCK_SUFFIX, LOCK_SUFFIX_LEN))
return -1; /* Refname ends with ".lock". */ return -1; /* Refname ends with ".lock". */
return cp - refname; return cp - refname;
} }
@ -2602,11 +2603,11 @@ static int delete_ref_loose(struct ref_lock *lock, int flag)
{ {
if (!(flag & REF_ISPACKED) || flag & REF_ISSYMREF) { if (!(flag & REF_ISPACKED) || flag & REF_ISSYMREF) {
/* loose */ /* loose */
int err, i = strlen(lock->lk->filename) - 5; /* .lock */ int err, i = strlen(lock->lk->filename) - LOCK_SUFFIX_LEN;
lock->lk->filename[i] = 0; lock->lk->filename[i] = 0;
err = unlink_or_warn(lock->lk->filename); err = unlink_or_warn(lock->lk->filename);
lock->lk->filename[i] = '.'; lock->lk->filename[i] = LOCK_SUFFIX[0];
if (err && errno != ENOENT) if (err && errno != ENOENT)
return 1; return 1;
} }