struct dir *olddir, const char *oldpath _U_,
struct dir *newdir, const char *newpath)
{
- struct ofork *of, *next, *d_ofork;
+ struct ofork *of, *next;
int done = 0;
if (!s_of)
while ((of = next)) {
next = next->next; /* so we can unhash and still be all right. */
- if (vol == of->of_vol && olddir == of->of_dir &&
- s_of->key.dev == of->key.dev &&
- s_of->key.inode == of->key.inode ) {
+ if (vol == of->of_vol
+ && olddir->d_did == of->of_did
+ && s_of->key.dev == of->key.dev
+ && s_of->key.inode == of->key.inode ) {
if (!done) {
strlcpy( of_name(of), newpath, of->of_ad->ad_m_namelen);
done = 1;
}
- if (newdir != olddir) {
- of->of_d_prev->of_d_next = of->of_d_next;
- of->of_d_next->of_d_prev = of->of_d_prev;
- if (of->of_dir->d_ofork == of) {
- of->of_dir->d_ofork = (of == of->of_d_next) ? NULL : of->of_d_next;
- }
- of->of_dir = newdir;
- if (!(d_ofork = newdir->d_ofork)) {
- newdir->d_ofork = of;
- of->of_d_next = of->of_d_prev = of;
- } else {
- of->of_d_next = d_ofork;
- of->of_d_prev = d_ofork->of_d_prev;
- of->of_d_prev->of_d_next = of;
- d_ofork->of_d_prev = of;
- }
- }
+ if (newdir != olddir)
+ of->of_did = newdir->d_did;
}
}
struct adouble *ad,
struct stat *st)
{
- struct ofork *of, *d_ofork;
+ struct ofork *of;
u_int16_t refnum, of_refnum;
int i;
of->of_ad = ad;
of->of_vol = vol;
- of->of_dir = dir;
-
- if (!(d_ofork = dir->d_ofork)) {
- dir->d_ofork = of;
- of->of_d_next = of->of_d_prev = of;
- } else {
- of->of_d_next = d_ofork;
- of->of_d_prev = d_ofork->of_d_prev;
- d_ofork->of_d_prev->of_d_next = of;
- d_ofork->of_d_prev = of;
- }
+ of->of_did = dir->d_did;
*ofrefnum = refnum;
of->of_refnum = refnum;
if ((ret = lstat(path->u_name, &path->st)) < 0) {
LOG(log_debug, logtype_afpd, "of_stat('%s/%s': %s)",
- cfrombstring(curdir->d_fullpath), path->u_name, strerror(errno));
+ cfrombstr(curdir->d_fullpath), path->u_name, strerror(errno));
path->st_errno = errno;
}
len = blength(path->d_dir->d_u_name);
if (len > (MAXPATHLEN - 3))
len = MAXPATHLEN - 3;
- strncpy(pathname + 3, cfrombstring(path->d_dir->d_u_name), len + 1);
+ strncpy(pathname + 3, cfrombstr(path->d_dir->d_u_name), len + 1);
LOG(log_debug, logtype_afpd, "of_statdir: stating: '%s'", pathname);
return -1;
path->st_errno = 0;
- if ((ret = lstat(cfrombstring(path->d_dir->d_u_name), &path->st)) < 0)
+ if ((ret = lstat(cfrombstr(path->d_dir->d_u_name), &path->st)) < 0)
path->st_errno = errno;
}
return;
of_unhash(of);
-
- /* detach ofork */
- of->of_d_prev->of_d_next = of->of_d_next;
- of->of_d_next->of_d_prev = of->of_d_prev;
- if (of->of_dir->d_ofork == of) {
- of->of_dir->d_ofork = (of == of->of_d_next) ? NULL : of->of_d_next;
- }
-
oforks[ of->of_refnum % nforks ] = NULL;
/* decrease refcount */