X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Ffiledir.c;h=0eb383e59ea4dfdce05a1c1cd756b0a62fad1eb5;hb=40362445845b8c9bc419b9e482a57f707e499072;hp=9f828e712b2fb3d9082a70a669f41bb897853de3;hpb=efc466d375e2b60c34990b39b135ce56bd38a99b;p=netatalk.git

diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c
index 9f828e71..0eb383e5 100644
--- a/etc/afpd/filedir.c
+++ b/etc/afpd/filedir.c
@@ -1,5 +1,5 @@
 /*
- * $Id: filedir.c,v 1.20 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: filedir.c,v 1.35 2002-10-25 11:10:48 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -54,6 +54,7 @@ char *strchr (), *strrchr ();
 #include "file.h"
 #include "globals.h"
 #include "filedir.h"
+#include "unix.h"
 
 int matchfile2dirperms(upath, vol, did)
 /* Since it's kinda' big; I decided against an
@@ -67,26 +68,29 @@ more information */
 {
     struct stat	st, sb;
     struct dir	*dir;
-    char	adpath[50];
-    int		uid;
-
+    char	*adpath;
+    uid_t       uid;
+    int         ret = AFP_OK;
 #ifdef DEBUG
-    LOG(log_info, logtype_default, "begin matchfile2dirperms:");
+    LOG(log_info, logtype_afpd, "begin matchfile2dirperms:");
 #endif /* DEBUG */
 
-    if (stat(upath, &st ) < 0)
-        LOG(log_error, logtype_default, "Could not stat %s: %s", upath, strerror(errno));
-    strcpy (adpath, "./.AppleDouble/");
-    strcat (adpath, upath);
-    if (( dir = dirsearch( vol, did )) == NULL ) {
-        LOG(log_error, logtype_default, "matchfile2dirperms: Unable to get directory info.");
-        return( AFPERR_NOOBJ );
+    if (stat(upath, &st ) < 0) {
+        LOG(log_error, logtype_afpd, "Could not stat %s: %s", upath, strerror(errno));
+        return AFPERR_NOOBJ ;
+    }
+
+    adpath = ad_path( upath, ADFLAGS_HF );
+    /* FIXME dirsearch doesn't move cwd to did ! */
+    if (( dir = dirlookup( vol, did )) == NULL ) {
+        LOG(log_error, logtype_afpd, "matchfile2dirperms: Unable to get directory info.");
+        ret = AFPERR_NOOBJ;
     }
     else if (stat(".", &sb) < 0) {
-        LOG(log_error, logtype_default,
-                "matchfile2dirperms: Error checking directory \"%s\": %s",
-                dir->d_name, strerror(errno));
-        return(AFPERR_NOOBJ );
+        LOG(log_error, logtype_afpd,
+            "matchfile2dirperms: Error checking directory \"%s\": %s",
+            dir->d_m_name, strerror(errno));
+        ret = AFPERR_NOOBJ;
     }
     else {
         uid=geteuid();
@@ -95,58 +99,40 @@ more information */
             seteuid(0);
             if (lchown(upath, sb.st_uid, sb.st_gid) < 0)
             {
-                LOG(log_error, logtype_default,
-                        "matchfile2dirperms: Error changing owner/gid of %s: %s",
-                        upath, strerror(errno));
-                return (AFPERR_ACCESS);
+                LOG(log_error, logtype_afpd,
+                    "matchfile2dirperms: Error changing owner/gid of %s: %s",
+                    upath, strerror(errno));
+                ret = AFPERR_ACCESS;
             }
-            if (chmod(upath,(st.st_mode&0777&~default_options.umask)| S_IRGRP| S_IROTH) < 0)
+            else if (chmod(upath,(st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0)
             {
-                LOG(log_error, logtype_default,
-                        "matchfile2dirperms:  Error adding file read permissions: %s",
-                        strerror(errno));
-                return (AFPERR_ACCESS);
+                LOG(log_error, logtype_afpd,
+                    "matchfile2dirperms:  Error adding file read permissions: %s",
+                    strerror(errno));
+                ret = AFPERR_ACCESS;
             }
-#ifdef DEBUG
-            else
-                LOG(log_info, logtype_default,
-                        "matchfile2dirperms:  Added S_IRGRP and S_IROTH: %s",
-                        strerror(errno));
-#endif /* DEBUG */
-            if (lchown(adpath, sb.st_uid, sb.st_gid) < 0)
+            else if (lchown(adpath, sb.st_uid, sb.st_gid) < 0)
             {
-                LOG(log_error, logtype_default,
-                        "matchfile2dirperms: Error changing AppleDouble owner/gid %s: %s",
-                        adpath, strerror(errno));
-                return (AFPERR_ACCESS);
+                LOG(log_error, logtype_afpd,
+                    "matchfile2dirperms: Error changing AppleDouble owner/gid %s: %s",
+                    adpath, strerror(errno));
+                ret = AFPERR_ACCESS;
             }
-            if (chmod(adpath, (st.st_mode&0777&~default_options.umask)| S_IRGRP| S_IROTH) < 0)
+            else if (chmod(adpath, (st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0)
             {
-                LOG(log_error, logtype_default,
-                        "matchfile2dirperms:  Error adding AD file read permissions: %s",
-                        strerror(errno));
-                return (AFPERR_ACCESS);
+                LOG(log_error, logtype_afpd,
+                    "matchfile2dirperms:  Error adding AD file read permissions: %s",
+                    strerror(errno));
+                ret = AFPERR_ACCESS;
             }
-#ifdef DEBUG
-            else
-                LOG(log_info, logtype_default,
-                        "matchfile2dirperms:  Added S_IRGRP and S_IROTH to AD: %s",
-                        strerror(errno));
-#endif /* DEBUG */
+            seteuid(uid); 
         }
-#ifdef DEBUG
-        else
-            LOG(log_info, logtype_default,
-                    "matchfile2dirperms: No ownership change necessary.");
-#endif /* DEBUG */
     } /* end else if stat success */
-    seteuid(uid); /* Restore process ownership to normal */
+
 #ifdef DEBUG
-    LOG(log_info, logtype_default, "end matchfile2dirperms:");
+    LOG(log_info, logtype_afpd, "end matchfile2dirperms:");
 #endif /* DEBUG */
-
-    return (AFP_OK);
-
+    return ret;
 }
 
 
@@ -155,16 +141,16 @@ AFPObj      *obj;
 char	*ibuf, *rbuf;
 int		ibuflen, *rbuflen;
 {
-    struct stat		st;
+    struct stat		*st;
     struct vol		*vol;
     struct dir		*dir;
     u_int32_t           did;
     int			buflen, ret;
-    char		*path;
     u_int16_t		fbitmap, dbitmap, vid;
+    struct path         *s_path;
 
 #ifdef DEBUG
-    LOG(log_info, logtype_default, "begin afp_getfildirparams:");
+    LOG(log_info, logtype_afpd, "begin afp_getfildirparams:");
 #endif /* DEBUG */
 
     *rbuflen = 0;
@@ -179,7 +165,7 @@ int		ibuflen, *rbuflen;
     memcpy( &did, ibuf, sizeof( did ));
     ibuf += sizeof( did );
 
-    if (( dir = dirsearch( vol, did )) == NULL ) {
+    if (( dir = dirlookup( vol, did )) == NULL ) {
         return( AFPERR_NOOBJ );
     }
 
@@ -190,26 +176,33 @@ int		ibuflen, *rbuflen;
     dbitmap = ntohs( dbitmap );
     ibuf += sizeof( dbitmap );
 
-    if (( path = cname( vol, dir, &ibuf )) == NULL) {
+    if (( s_path = cname( vol, dir, &ibuf )) == NULL) {
         return( AFPERR_NOOBJ );
     }
 
-    if ( stat( mtoupath(vol, path ), &st ) < 0 ) {
+    st   = &s_path->st;
+    if (!s_path->st_valid) {
+        /* it's a dir and it should be there
+         * because we chdir in it in cname
+         */
+        of_stat(s_path);
+    }
+    if ( s_path->st_errno != 0 ) {
         return( AFPERR_NOOBJ );
     }
 
     buflen = 0;
-    if (S_ISDIR(st.st_mode)) {
+    if (S_ISDIR(st->st_mode)) {
         if (dbitmap) {
-            ret = getdirparams(vol, dbitmap, ".", curdir,
-                               &st, rbuf + 3 * sizeof( u_int16_t ), &buflen );
+            ret = getdirparams(vol, dbitmap, s_path, curdir,
+                                 rbuf + 3 * sizeof( u_int16_t ), &buflen );
             if (ret != AFP_OK )
                 return( ret );
         }
         /* this is a directory */
         *(rbuf + 2 * sizeof( u_int16_t )) = (char) FILDIRBIT_ISDIR;
     } else {
-        if (fbitmap && ( ret = getfilparams(vol, fbitmap, path, curdir, &st,
+        if (fbitmap && ( ret = getfilparams(vol, fbitmap, s_path, curdir, 
                                             rbuf + 3 * sizeof( u_int16_t ), &buflen )) != AFP_OK ) {
             return( ret );
         }
@@ -226,7 +219,7 @@ int		ibuflen, *rbuflen;
     *rbuf = 0;
 
 #ifdef DEBUG
-    LOG(log_info, logtype_default, "end afp_getfildirparams:");
+    LOG(log_info, logtype_afpd, "end afp_getfildirparams:");
 #endif /* DEBUG */
 
     return( AFP_OK );
@@ -237,15 +230,15 @@ AFPObj      *obj;
 char	*ibuf, *rbuf;
 int		ibuflen, *rbuflen;
 {
-    struct stat	st;
+    struct stat	*st;
     struct vol	*vol;
     struct dir	*dir;
-    char	*path;
+    struct path *path;
     u_int16_t	vid, bitmap;
     int		did, rc;
 
 #ifdef DEBUG
-    LOG(log_info, logtype_default, "begin afp_setfildirparams:");
+    LOG(log_info, logtype_afpd, "begin afp_setfildirparams:");
 #endif /* DEBUG */
 
     *rbuflen = 0;
@@ -263,7 +256,7 @@ int		ibuflen, *rbuflen;
     memcpy( &did, ibuf, sizeof( did));
     ibuf += sizeof( did);
 
-    if (( dir = dirsearch( vol, did )) == NULL ) {
+    if (( dir = dirlookup( vol, did )) == NULL ) {
         return( AFPERR_NOOBJ );
     }
 
@@ -275,10 +268,17 @@ int		ibuflen, *rbuflen;
         return( AFPERR_NOOBJ );
     }
 
-    if ( stat( mtoupath(vol, path ), &st ) < 0 ) {
-        return( AFPERR_NOOBJ );
+    st   = &path->st;
+    if (!path->st_valid) {
+        /* it's a dir and it should be there
+         * because we chdir in it in cname
+         */
+        of_stat(path);
     }
 
+    if ( path->st_errno != 0 ) {
+        return( AFPERR_NOOBJ );
+    }
     /*
      * If ibuf is odd, make it even.
      */
@@ -286,7 +286,7 @@ int		ibuflen, *rbuflen;
         ibuf++;
     }
 
-    if (S_ISDIR(st.st_mode)) {
+    if (S_ISDIR(st->st_mode)) {
         rc = setdirparams(vol, path, bitmap, ibuf );
     } else {
         rc = setfilparams(vol, path, bitmap, ibuf );
@@ -296,32 +296,160 @@ int		ibuflen, *rbuflen;
     }
 
 #ifdef DEBUG
-    LOG(log_info, logtype_default, "end afp_setfildirparams:");
+    LOG(log_info, logtype_afpd, "end afp_setfildirparams:");
 #endif /* DEBUG */
 
     return( rc );
 }
 
-int afp_rename(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+/* -------------------------------------------- 
+   Factorise some check on a pathname
+*/
+int check_name(const struct vol *vol, char *name)
 {
+    /* check for illegal characters in the unix filename */
+    if (!wincheck(vol, name))
+        return AFPERR_PARAM;
+
+    if ((vol->v_flags & AFPVOL_NOHEX) && strchr(name, '/'))
+        return AFPERR_PARAM;
+
+    if (!validupath(vol, name))
+        return AFPERR_EXIST;
+
+    /* check for vetoed filenames */
+    if (veto_file(vol->v_veto, name))
+        return AFPERR_EXIST;
+    return 0;
+}
+
+/* ------------------------- 
+    move and rename sdir:oldname to curdir:newname in volume vol
+   
+    special care is needed for lock   
+*/
+static int moveandrename(vol, sdir, oldname, newname, isdir)
+const struct vol	*vol;
+struct dir	*sdir;
+char        *oldname;
+char        *newname;
+int         isdir;
+{
+    char            *p;
+    char            *upath;
+    int             rc;
+    struct stat     *st;
+    int             adflags;
     struct adouble	ad;
-    struct stat		st;
-    struct vol		*vol;
-    struct dir		*dir, *odir = NULL;
-    char		*path, *buf, *upath, *newpath;
-    char		*newadpath;
-    u_int32_t		did;
-    int			plen;
-    u_int16_t		vid;
+    struct adouble	*adp;
+    struct ofork	*opened = NULL;
+    struct path         path;
+#ifdef CNID_DB
+    cnid_t      id;
+#endif /* CNID_DB */
+
+    memset(&ad, 0, sizeof(ad));
+    adp = &ad;
+    adflags = 0;
+    
+    if (!isdir) {
+#ifdef CNID_DB
+        p = mtoupath(vol, oldname);
+        id = cnid_get(vol->v_db, sdir->d_did, p, strlen(p));
+#endif /* CNID_DB */
+        p = ctoupath( vol, sdir, oldname );
+        path.st_valid = 0;
+        path.u_name = p;
+        if ((opened = of_findname(&path))) {
+            /* reuse struct adouble so it won't break locks */
+            adp = opened->of_ad;
+        }
+    }
+    else {
+#ifdef CNID_DB
+        id = sdir->d_did; /* we already have the CNID */
+#endif /* CNID_DB */
+        p = ctoupath( vol, sdir->d_parent, oldname );
+        adflags = ADFLAGS_DIR;
+    }
+    /*
+     * p now points to the full pathname of the source fs object.
+     * 
+     * we are in the dest folder so we need to use p for ad_open
+    */
+    
+    if (!ad_open(p, ADFLAGS_HF |adflags, O_RDONLY, 0666, adp)) {
+    u_int16_t bshort;
+
+        ad_getattr(adp, &bshort);
+        ad_close( adp, ADFLAGS_HF );
+        if ((bshort & htons(ATTRBIT_NORENAME))) 
+            return(AFPERR_OLOCK);
+    }
+
+    upath = mtoupath(vol, newname);
+    path.u_name = upath;
+    st = &path.st;    
+    if (0 != (rc = check_name(vol, upath))) {
+            return  rc;
+    }
+
+    /* source == destination. we just silently accept this. */
+    if (curdir == sdir) {
+        if (strcmp(oldname, newname) == 0)
+            return AFP_OK;
+
+        /* deal with case insensitive, case-preserving filesystems. */
+        if ((stat(upath, st) == 0) && strdiacasecmp(oldname, newname))
+            return AFPERR_EXIST;
+
+    } else if (stat(upath, st ) == 0)
+        return AFPERR_EXIST;
+
+    if ( !isdir ) {
+        path.st_valid = 1;
+        path.st_errno = errno;
+        if (of_findname(&path)) {
+            rc = AFPERR_EXIST; /* was AFPERR_BUSY; */
+        } else {
+            rc = renamefile( p, upath, newname,vol_noadouble(vol), adp );
+            if (rc == AFP_OK)
+                of_rename(vol, opened, sdir, oldname, curdir, newname);
+        }
+    } else {
+        rc = renamedir(p, upath, sdir, curdir, newname, vol_noadouble(vol));
+    }
+    if ( rc == AFP_OK ) {
 #ifdef CNID_DB
-    cnid_t              id;
+        /* renaming may have moved the file/dir across a filesystem */
+        if (stat(upath, st) < 0)
+            return AFPERR_MISC;
+
+        /* fix up the catalog entry */
+        cnid_update(vol->v_db, id, st, curdir->d_did, upath, strlen(upath));
 #endif /* CNID_DB */
+    }
+
+    return rc;
+}
 
+/* -------------------------------------------- */
+int afp_rename(obj, ibuf, ibuflen, rbuf, rbuflen )
+AFPObj      *obj;
+char	*ibuf, *rbuf;
+int		ibuflen, *rbuflen;
+{
+    struct vol	*vol;
+    struct dir	*sdir;
+    char        *oldname, *newname;
+    struct path *path;
+    u_int32_t	did;
+    int         plen;
+    u_int16_t	vid;
+    int         isdir = 0;
+    int         rc;
 #ifdef DEBUG
-    LOG(log_info, logtype_default, "begin afp_rename:");
+    LOG(log_info, logtype_afpd, "begin afp_rename:");
 #endif /* DEBUG */
 
     *rbuflen = 0;
@@ -338,153 +466,56 @@ int		ibuflen, *rbuflen;
 
     memcpy( &did, ibuf, sizeof( did ));
     ibuf += sizeof( did );
-    if (( dir = dirsearch( vol, did )) == NULL ) {
+    if (( sdir = dirlookup( vol, did )) == NULL ) {
         return( AFPERR_NOOBJ );
     }
 
-    if (( path = cname( vol, dir, &ibuf )) == NULL ) {
+    /* source pathname */
+    if (( path = cname( vol, sdir, &ibuf )) == NULL ) {
         return( AFPERR_NOOBJ );
     }
 
-    /* another place where we know about the path type */
-    if ( *ibuf++ != 2 ) {
-        return( AFPERR_PARAM );
+    sdir = curdir;
+    newname = obj->newtmp;
+    oldname = obj->oldtmp;
+    if ( *path->m_name != '\0' ) {
+        strcpy(oldname, path->m_name); /* an extra copy for of_rename */
     }
-    plen = (unsigned char) *ibuf++;
-    *( ibuf + plen ) = '\0';
-
-    if ( *path == '\0' ) {
-        if ( curdir->d_parent == NULL ) { /* root directory */
+    else {
+        if ( sdir->d_parent == NULL ) { /* root directory */
             return( AFPERR_NORENAME );
         }
-        odir = curdir;
-        path = curdir->d_name;
-        if ( movecwd( vol, curdir->d_parent ) < 0 ) {
+        /* move to destination dir */
+        if ( movecwd( vol, sdir->d_parent ) < 0 ) {
             return( AFPERR_NOOBJ );
         }
+        isdir = 1;
+        strcpy(oldname, sdir->d_m_name);
     }
 
-#ifdef notdef
-    if ( strcasecmp( path, ibuf ) == 0 ) {
-        return( AFP_OK );
+    /* another place where we know about the path type */
+    if ((plen = copy_path_name(newname, ibuf)) < 0) {
+        return( AFPERR_PARAM );
     }
-#endif /* notdef */
-
-    /* if a curdir/newname ofork exists, return busy */
-    if (of_findname(vol, curdir, ibuf))
-        return AFPERR_BUSY;
-
-    /* source == destination. just say okay. */
-    if (strcmp(path, ibuf) == 0)
-        return AFP_OK;
-
-    /* check for illegal characters */
-    if (!wincheck(vol, ibuf))
-        return AFPERR_PARAM;
-
-    newpath = obj->oldtmp;
-    strcpy( newpath, mtoupath(vol, ibuf ));
 
-    if ((vol->v_flags & AFPVOL_NOHEX) && strchr(newpath, '/'))
-        return AFPERR_PARAM;
-
-    if (!validupath(vol, newpath))
-        return AFPERR_EXIST;
-
-    /* check for vetoed filenames */
-    if (veto_file(vol->v_veto, newpath))
-        return AFPERR_EXIST;
-
-    /* the strdiacasecmp deals with case-insensitive, case preserving
-       filesystems */
-    if (stat( newpath, &st ) == 0 && strdiacasecmp(path, ibuf))
-        return( AFPERR_EXIST );
-
-    upath = mtoupath(vol, path);
-
-#ifdef CNID_DB
-    id = cnid_get(vol->v_db, curdir->d_did, upath, strlen(upath));
-#endif /* CNID_DB */
-
-    if ( rename( upath, newpath ) < 0 ) {
-        switch ( errno ) {
-        case ENOENT :
-            return( AFPERR_NOOBJ );
-        case EACCES :
-            return( AFPERR_ACCESS );
-        default :
-            return( AFPERR_PARAM );
-        }
+    if (!plen) {
+        return AFP_OK; /* newname == oldname same dir */
     }
+    
+    rc = moveandrename(vol, sdir, oldname, newname, isdir);
 
-#ifdef CNID_DB
-    if (stat(newpath, &st) < 0) /* this shouldn't fail */
-        return AFPERR_MISC;
-    cnid_update(vol->v_db, id, &st, curdir->d_did, newpath, strlen(newpath));
-#endif /* CNID_DB */
-
-    if ( !odir ) {
-        newadpath = obj->newtmp;
-        strcpy( newadpath, ad_path( newpath, 0 ));
-        if ( rename( ad_path( upath, 0 ), newadpath ) < 0 ) {
-            if ( errno == ENOENT ) {	/* no adouble header file */
-                if (( unlink( newadpath ) < 0 ) && ( errno != ENOENT )) {
-                    return( AFPERR_PARAM );
-                }
-                goto out;
-            }
-            return( AFPERR_PARAM );
-        }
-
-        memset(&ad, 0, sizeof(ad));
-        if ( ad_open( newpath, ADFLAGS_HF, O_RDWR|O_CREAT, 0666,
-                      &ad) < 0 ) {
-            return( AFPERR_PARAM );
-        }
-    } else {
-        int isad = 1;
-
-        memset(&ad, 0, sizeof(ad));
-        if ( ad_open( newpath, vol_noadouble(vol)|ADFLAGS_HF|ADFLAGS_DIR,
-                      O_RDWR|O_CREAT, 0666, &ad) < 0 ) {
-            if (!((errno == ENOENT) && vol_noadouble(vol)))
-                return( AFPERR_PARAM );
-            isad = 0;
-        }
-        if ((buf = realloc( odir->d_name, plen + 1 )) == NULL ) {
-            LOG(log_error, logtype_default, "afp_rename: realloc: %s", strerror(errno) );
-            if (isad) {
-                ad_flush(&ad, ADFLAGS_HF); /* in case of create */
-                ad_close(&ad, ADFLAGS_HF);
-            }
-            return AFPERR_MISC;
-        }
-        odir->d_name = buf;
-        strcpy( odir->d_name, ibuf );
-        if (!isad)
-            goto out;
+    if ( rc == AFP_OK ) {
+        setvoltime(obj, vol );
     }
 
-    ad_setentrylen( &ad, ADEID_NAME, plen );
-    memcpy( ad_entry( &ad, ADEID_NAME ), ibuf, plen );
-    ad_flush( &ad, ADFLAGS_HF );
-    ad_close( &ad, ADFLAGS_HF );
-
-out:
-    setvoltime(obj, vol );
-
-    /* if it's still open, rename the ofork as well. */
-    if (of_rename(vol, curdir, path, curdir, ibuf) < 0)
-        return AFPERR_MISC;
-
 #ifdef DEBUG
-    LOG(log_info, logtype_default, "end afp_rename:");
+    LOG(log_info, logtype_afpd, "end afp_rename:");
 #endif /* DEBUG */
 
-    return( AFP_OK );
+    return( rc );
 }
 
-
+/* ------------------------------- */
 int afp_delete(obj, ibuf, ibuflen, rbuf, rbuflen )
 AFPObj      *obj;
 char	*ibuf, *rbuf;
@@ -492,12 +523,13 @@ int		ibuflen, *rbuflen;
 {
     struct vol		*vol;
     struct dir		*dir;
-    char		*path, *upath;
+    struct path         *s_path;
+    char		*upath;
     int			did, rc;
     u_int16_t		vid;
 
 #ifdef DEBUG
-    LOG(log_info, logtype_default, "begin afp_delete:");
+    LOG(log_info, logtype_afpd, "begin afp_delete:");
 #endif /* DEBUG */ 
 
     *rbuflen = 0;
@@ -514,54 +546,54 @@ int		ibuflen, *rbuflen;
 
     memcpy( &did, ibuf, sizeof( did ));
     ibuf += sizeof( int );
-    if (( dir = dirsearch( vol, did )) == NULL ) {
+    if (( dir = dirlookup( vol, did )) == NULL ) {
         return( AFPERR_NOOBJ );
     }
 
-    if (( path = cname( vol, dir, &ibuf )) == NULL ) {
+    if (( s_path = cname( vol, dir, &ibuf )) == NULL ) {
         return( AFPERR_NOOBJ );
     }
 
-    if ( *path == '\0' ) {
+    upath = s_path->u_name;
+    if ( *s_path->m_name == '\0' ) {
         rc = deletecurdir( vol, obj->oldtmp, AFPOBJ_TMPSIZ);
-    } else if (of_findname(vol, curdir, path)) {
+    } else if (of_findname(s_path)) {
         rc = AFPERR_BUSY;
-    } else if ((rc = deletefile( upath = mtoupath(vol, path ))) == AFP_OK) {
+    } else if ((rc = deletefile( upath, 1)) == AFP_OK) {
 #ifdef CNID_DB /* get rid of entry */
         cnid_t id = cnid_get(vol->v_db, curdir->d_did, upath, strlen(upath));
         cnid_delete(vol->v_db, id);
 #endif /* CNID_DB */
     }
     if ( rc == AFP_OK ) {
+	curdir->offcnt--;
         setvoltime(obj, vol );
     }
 
 #ifdef DEBUG
-    LOG(log_info, logtype_default, "end afp_delete:");
+    LOG(log_info, logtype_afpd, "end afp_delete:");
 #endif /* DEBUG */
 
     return( rc );
 }
-
-char *ctoupath( vol, dir, name )
+char *absupath( vol, dir, u )
 const struct vol	*vol;
 struct dir	*dir;
-char	*name;
+char	*u;
 {
     struct dir	*d;
     static char	path[ MAXPATHLEN + 1];
-    char	*p, *u;
+    char	*p;
     int		len;
 
     p = path + sizeof( path ) - 1;
     *p = '\0';
-    u = mtoupath(vol, name );
     len = strlen( u );
     p -= len;
     strncpy( p, u, len );
     for ( d = dir; d->d_parent; d = d->d_parent ) {
         *--p = '/';
-        u = mtoupath(vol, d->d_name );
+        u = d->d_u_name;
         len = strlen( u );
         p -= len;
         strncpy( p, u, len );
@@ -574,29 +606,35 @@ char	*name;
     return( p );
 }
 
+char *ctoupath( vol, dir, name )
+const struct vol	*vol;
+struct dir	*dir;
+char	*name;
+{
+    return absupath(vol, dir, mtoupath(vol, name));
+}
 
+/* ------------------------- */
 int afp_moveandrename(obj, ibuf, ibuflen, rbuf, rbuflen )
 AFPObj      *obj;
 char	*ibuf, *rbuf;
 int		ibuflen, *rbuflen;
 {
     struct vol	*vol;
-    struct dir	*sdir, *ddir, *odir = NULL;
-    struct stat st;
+    struct dir	*sdir, *ddir;
+    int         isdir = 0;
     char	*oldname, *newname;
-    char        *path, *p, *upath;
-    int		did, rc;
-    int		plen;
+    struct path *path;
+    int		did;
+    int         plen;
     u_int16_t	vid;
-#ifdef CNID_DB
-    cnid_t      id;
-#endif /* CNID_DB */
+    int         rc;
 #ifdef DROPKLUDGE
     int		retvalue;
 #endif /* DROPKLUDGE */
 
 #ifdef DEBUG
-    LOG(log_info, logtype_default, "begin afp_moveandrename:");
+    LOG(log_info, logtype_afpd, "begin afp_moveandrename:");
 #endif /* DEBUG */
 
     *rbuflen = 0;
@@ -614,7 +652,7 @@ int		ibuflen, *rbuflen;
     /* source did followed by dest did */
     memcpy( &did, ibuf, sizeof( did ));
     ibuf += sizeof( int );
-    if (( sdir = dirsearch( vol, did )) == NULL ) {
+    if (( sdir = dirlookup( vol, did )) == NULL ) {
         return( AFPERR_PARAM );
     }
 
@@ -629,111 +667,60 @@ int		ibuflen, *rbuflen;
     sdir = curdir;
     newname = obj->newtmp;
     oldname = obj->oldtmp;
-    if ( *path != '\0' ) {
+    if ( *path->m_name != '\0' ) {
         /* not a directory */
-        strcpy(newname, path);
-        strcpy(oldname, path); /* an extra copy for of_rename */
-#ifdef CNID_DB
-        p = mtoupath(vol, path);
-        id = cnid_get(vol->v_db, sdir->d_did, p, strlen(p));
-#endif /* CNID_DB */
-        p = ctoupath( vol, sdir, newname );
+        strcpy(oldname, path->m_name); /* an extra copy for of_rename */
     } else {
-        odir = curdir;
-        strcpy( newname, odir->d_name );
-        strcpy(oldname, odir->d_name);
-        p = ctoupath( vol, odir->d_parent, newname );
-#ifdef CNID_DB
-        id = curdir->d_did; /* we already have the CNID */
-#endif /* CNID_DB */
+        isdir = 1;
+        strcpy(oldname, sdir->d_m_name);
     }
-    /*
-     * p now points to the full pathname of the source fs object.
-     */
 
     /* get the destination directory */
-    if (( ddir = dirsearch( vol, did )) == NULL ) {
+    if (( ddir = dirlookup( vol, did )) == NULL ) {
         return( AFPERR_PARAM );
     }
     if (( path = cname( vol, ddir, &ibuf )) == NULL ) {
         return( AFPERR_NOOBJ );
     }
-    if ( *path != '\0' ) {
+    if ( *path->m_name != '\0' ) {
         return( AFPERR_BADTYPE );
     }
 
     /* one more place where we know about path type */
-    if ( *ibuf++ != 2 ) {
+    if ((plen = copy_path_name(newname, ibuf)) < 0) {
         return( AFPERR_PARAM );
     }
 
-    if (( plen = (unsigned char)*ibuf++ ) != 0 ) {
-        strncpy( newname, ibuf, plen );
-        newname[ plen ] = '\0';
+    if (!plen) {
+        strcpy(newname, oldname);
     }
 
-    /* check for illegal characters */
-    if (!wincheck(vol, newname))
-        return AFPERR_PARAM;
-
-    upath = mtoupath(vol, newname);
-
-    if ((vol->v_flags & AFPVOL_NOHEX) && strchr(upath, '/'))
-        return AFPERR_PARAM;
-
-    if (!validupath(vol, upath))
-        return AFPERR_EXIST;
-
-    /* check for vetoed filenames */
-    if (veto_file(vol->v_veto, upath))
-        return AFPERR_EXIST;
-
-    /* source == destination. we just silently accept this. */
-    if (curdir == sdir) {
-        if (strcmp(oldname, newname) == 0)
-            return AFP_OK;
-
-        /* deal with case insensitive, case-preserving filesystems. */
-        if ((stat(upath, &st) == 0) && strdiacasecmp(oldname, newname))
-            return AFPERR_EXIST;
-
-    } else if (stat(upath, &st ) == 0)
-        return( AFPERR_EXIST );
+    rc = moveandrename(vol, sdir, oldname, newname, isdir);
 
-    if ( !odir ) {
-        if (of_findname(vol, curdir, newname)) {
-            rc = AFPERR_BUSY;
-        } else if ((rc = renamefile( p, upath, newname,
-                                     vol_noadouble(vol) )) == AFP_OK) {
-            /* if it's still open, rename the ofork as well. */
-            rc = of_rename(vol, sdir, oldname, curdir, newname);
-        }
-    } else {
-        rc = renamedir(p, upath, odir, curdir, newname, vol_noadouble(vol));
-    }
+    if ( rc == AFP_OK ) {
+        curdir->offcnt++;
+        sdir->offcnt--;
 
+        char *upath = mtoupath(vol, newname);
 #ifdef DROPKLUDGE
-    if (vol->v_flags & AFPVOL_DROPBOX) {
-        if (retvalue=matchfile2dirperms (newname, vol, did) != AFP_OK) {
-            return retvalue;
+        if (vol->v_flags & AFPVOL_DROPBOX) {
+            if ((retvalue=matchfile2dirperms (upath, vol, did)) != AFP_OK) {
+                return retvalue;
+            }
         }
-    }
+        else
 #endif /* DROPKLUDGE */
+            if (!isdir) {
+                int  admode = ad_mode("", 0777);
 
-    if ( rc == AFP_OK ) {
-#ifdef CNID_DB
-        /* renaming may have moved the file/dir across a filesystem */
-        if (stat(upath, &st) < 0)
-            return AFPERR_MISC;
-
-        /* fix up the catalog entry */
-        cnid_update(vol->v_db, id, &st, curdir->d_did, upath, strlen(upath));
-#endif /* CNID_DB */
+                setfilmode(upath, admode, NULL);
+                setfilmode(ad_path( upath, ADFLAGS_HF ), ad_hf_mode(admode), NULL);
+            }
         setvoltime(obj, vol );
     }
 
 #ifdef DEBUG
-    LOG(log_info, logtype_default, "end afp_moveandrename:");
+    LOG(log_info, logtype_afpd, "end afp_moveandrename:");
 #endif /* DEBUG */
 
     return( rc );
@@ -753,7 +740,7 @@ int veto_file(const char*veto_str, const char*path)
         return 0;
     /*
     #ifdef DEBUG
-    	LOG(log_debug, logtype_default, "veto_file \"%s\", \"%s\"", veto_str, path);
+    	LOG(log_debug, logtype_afpd, "veto_file \"%s\", \"%s\"", veto_str, path);
     #endif
     */
     for(i=0, j=0; veto_str[i] != '\0'; i++) {