Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle repositories that contain symlinks in their path.

This commit is contained in:
christos 2003-03-06 16:14:34 +00:00
parent bacf7b9b2b
commit bcb98aa28e
1 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
gnu/dist/cvs/src/lock.c vendored
View File

@ -97,6 +97,7 @@ static void clear_lock PROTO ((struct lock *lock));
static void set_lockers_name PROTO((struct stat *statp));
static int set_writelock_proc PROTO((Node * p, void *closure));
static int unlock_proc PROTO((Node * p, void *closure));
static int find_root PROTO((char *repository, char *rootdir));
static int write_lock PROTO ((struct lock *lock));
static void lock_simple_remove PROTO ((struct lock *lock));
static void lock_wait PROTO((char *repository));
@ -169,14 +170,19 @@ lock_name (repository, name)
{
struct stat sb;
mode_t new_mode = 0;
int len;
/* The interesting part of the repository is the part relative
to CVSROOT. */
assert (current_parsed_root != NULL);
assert (current_parsed_root->directory != NULL);
assert (strncmp (repository, current_parsed_root->directory,
strlen (current_parsed_root->directory)) == 0);
short_repos = repository + strlen (current_parsed_root->directory) + 1;
/*
* Unfortunately, string comparisons are not enough because we
* might have symlinks present
*/
len = find_root(repository, current_parsed_root->directory);
assert(len != -1);
short_repos = repository + len + 1;
if (strcmp (repository, current_parsed_root->directory) == 0)
short_repos = ".";
@ -279,6 +285,45 @@ lock_name (repository, name)
return retval;
}
/*
* Find the root directory in the repository directory
*/
static int
find_root(repository, rootdir)
char *repository;
char *rootdir;
{
struct stat strep, stroot;
char *p = NULL, *q = NULL;
size_t len;
if (stat(rootdir, &stroot) == -1)
return -1;
len = strlen(repository);
do {
if (p != NULL) {
len = p - repository;
*p = '\0';
}
if (q != NULL)
*q = '/';
if (stat(repository, &strep) == -1) {
if (p != NULL)
*p = '/';
return -1;
}
if (strep.st_dev == stroot.st_dev && strep.st_ino == stroot.st_ino) {
if (p != NULL)
*p = '/';
if (q != NULL)
*q = '/';
return len;
}
q = p;
} while ((p = strrchr(repository, '/')) != NULL);
return -1;
}
/*
* Clean up all outstanding locks
*/