X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Ffiledir.c;h=93a9c9940c90afdcbf60a9e58289f5dc5556f13c;hb=9d78f9b52ea18b442fc91c6a1e8d8b607f2f90e8;hp=c8c801180739cffa29eebe9e7364603492df38d3;hpb=46d1c4b029cb8718cee44a48a7551261d17e1988;p=netatalk.git

diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c
index c8c80118..93a9c994 100644
--- a/etc/afpd/filedir.c
+++ b/etc/afpd/filedir.c
@@ -1,5 +1,5 @@
 /*
- * $Id: filedir.c,v 1.15 2001-10-23 13:44:37 rufustfirefly Exp $
+ * $Id: filedir.c,v 1.45.2.2.2.14.2.5 2008-11-25 15:16:33 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -9,25 +9,8 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include <errno.h>
-#include <sys/syslog.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <netatalk/endian.h>
-#include <atalk/adouble.h>
-#include <atalk/afp.h>
-#include <atalk/util.h>
-#ifdef CNID_DB
-#include <atalk/cnid.h>
-#endif /* CNID_DB */
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
-#include <dirent.h>
-
 /* STDC check */
 #if STDC_HEADERS
 #include <string.h>
@@ -43,9 +26,18 @@ char *strchr (), *strrchr ();
 #endif /* ! HAVE_MEMCPY */
 #endif /* STDC_HEADERS */
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#include <dirent.h>
+#include <errno.h>
+#include <sys/param.h>
+#include <atalk/adouble.h>
+
+#include <atalk/afp.h>
+#include <atalk/util.h>
+#include <atalk/cnid.h>
+#include <atalk/logger.h>
 
 #include "directory.h"
 #include "desktop.h"
@@ -54,117 +46,104 @@ char *strchr (), *strrchr ();
 #include "file.h"
 #include "globals.h"
 #include "filedir.h"
+#include "unix.h"
 
+#ifdef DROPKLUDGE
 int matchfile2dirperms(upath, vol, did)
-                              /* Since it's kinda' big; I decided against an
-                              inline function */
-    char	*upath;
-    struct vol  *vol;
-    int		did;
-  /* The below code changes the way file ownership is determined in the name of
-  fixing dropboxes.  It has known security problem.  See the netatalk FAQ for
-  more information */
+/* Since it's kinda' big; I decided against an
+inline function */
+char	*upath;
+struct vol  *vol;
+int		did;
+/* The below code changes the way file ownership is determined in the name of
+fixing dropboxes.  It has known security problem.  See the netatalk FAQ for
+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
-    syslog (LOG_INFO, "begin matchfile2dirperms:");
+    LOG(log_info, logtype_afpd, "begin matchfile2dirperms:");
 #endif /* DEBUG */
 
-    if (stat(upath, &st ) < 0)
-      syslog(LOG_ERR, "Could not stat %s: %s", upath, strerror(errno));
-    strcpy (adpath, "./.AppleDouble/");
-    strcat (adpath, upath);
-    if (( dir = dirsearch( vol, did )) == NULL ) {
-      syslog (LOG_ERR, "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 = vol->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) {
-        syslog (LOG_ERR, 
-	   "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();
-	if ( uid != sb.st_uid )
+        uid=geteuid();
+        if ( uid != sb.st_uid )
         {
-	  seteuid(0);
-	  if (lchown(upath, sb.st_uid, sb.st_gid) < 0)
-          {
-            syslog (LOG_ERR, 
-	      "matchfile2dirperms: Error changing owner/gid of %s: %s",
-		    upath, strerror(errno));
-            return (AFPERR_ACCESS);
-          }
-          if (chmod(upath,(st.st_mode&0777&~default_options.umask)| S_IRGRP| S_IROTH) < 0)
-          {
-            syslog (LOG_ERR, 
-	      "matchfile2dirperms:  Error adding file read permissions: %s",
-		    strerror(errno));
-            return (AFPERR_ACCESS);
-          }
-#ifdef DEBUG
-          else 
-	    syslog (LOG_INFO, 
-	      "matchfile2dirperms:  Added S_IRGRP and S_IROTH: %s",
-		    strerror(errno));
-#endif /* DEBUG */
-          if (lchown(adpath, sb.st_uid, sb.st_gid) < 0)
-          {
-	    syslog (LOG_ERR, 
-	      "matchfile2dirperms: Error changing AppleDouble owner/gid %s: %s",
-	      adpath, strerror(errno));
-            return (AFPERR_ACCESS);
-	  }
-          if (chmod(adpath, (st.st_mode&0777&~default_options.umask)| S_IRGRP| S_IROTH) < 0)
-          {
-            syslog (LOG_ERR, 
-	      "matchfile2dirperms:  Error adding AD file read permissions: %s",
-		    strerror(errno));
-            return (AFPERR_ACCESS);
-          }
-#ifdef DEBUG
-          else 
-	    syslog (LOG_INFO, 
-	      "matchfile2dirperms:  Added S_IRGRP and S_IROTH to AD: %s",
-		    strerror(errno));
-#endif /* DEBUG */
-	}
-#ifdef DEBUG
-        else
-	  syslog (LOG_INFO, 
-	    "matchfile2dirperms: No ownership change necessary.");
-#endif /* DEBUG */
+            seteuid(0);
+            if (lchown(upath, sb.st_uid, sb.st_gid) < 0)
+            {
+                LOG(log_error, logtype_afpd,
+                    "matchfile2dirperms(%s): Error changing owner/gid: %s",
+                    upath, strerror(errno));
+                ret = AFPERR_ACCESS;
+            }
+            else if (chmod(upath,(st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0)
+            {
+                LOG(log_error, logtype_afpd,
+                    "matchfile2dirperms(%s): Error adding file read permissions: %s",
+                    upath, strerror(errno));
+                ret = AFPERR_ACCESS;
+            }
+            else if (lchown(adpath, sb.st_uid, sb.st_gid) < 0)
+            {
+                LOG(log_error, logtype_afpd,
+                    "matchfile2dirperms(%s): Error changing AppleDouble owner/gid: %s",
+                    adpath, strerror(errno));
+                ret = AFPERR_ACCESS;
+            }
+            else if (chmod(adpath, (st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0)
+            {
+                LOG(log_error, logtype_afpd,
+                    "matchfile2dirperms(%s):  Error adding AD file read permissions: %s",
+                    adpath, strerror(errno));
+                ret = AFPERR_ACCESS;
+            }
+            seteuid(uid); 
+        }
     } /* end else if stat success */
-    seteuid(uid); /* Restore process ownership to normal */
+
 #ifdef DEBUG
-    syslog (LOG_INFO, "end matchfile2dirperms:");
+    LOG(log_info, logtype_afpd, "end matchfile2dirperms:");
 #endif /* DEBUG */
-
-    return (AFP_OK);
-
+    return ret;
 }
-    
+#endif
 
 int afp_getfildirparams(obj, ibuf, ibuflen, rbuf, rbuflen )
-    AFPObj      *obj;
-    char	*ibuf, *rbuf;
-    int		ibuflen, *rbuflen;
+AFPObj  *obj _U_;
+char	*ibuf, *rbuf;
+int	ibuflen _U_, *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
-    syslog(LOG_INFO, "begin afp_getfildirparams:");
+    LOG(log_info, logtype_afpd, "begin afp_getfildirparams:");
 #endif /* DEBUG */
 
     *rbuflen = 0;
@@ -172,15 +151,15 @@ int afp_getfildirparams(obj, ibuf, ibuflen, rbuf, rbuflen )
 
     memcpy( &vid, ibuf, sizeof( vid ));
     ibuf += sizeof( vid );
-    if (( vol = getvolbyvid( vid )) == NULL ) {
-	return( AFPERR_PARAM );
+    if (NULL == ( vol = getvolbyvid( vid )) ) {
+        return( AFPERR_PARAM );
     }
 
     memcpy( &did, ibuf, sizeof( did ));
     ibuf += sizeof( did );
 
-    if (( dir = dirsearch( vol, did )) == NULL ) {
-	return( AFPERR_NOOBJ );
+    if (NULL == ( dir = dirlookup( vol, did )) ) {
+        return afp_errno;
     }
 
     memcpy( &fbitmap, ibuf, sizeof( fbitmap ));
@@ -190,31 +169,44 @@ int afp_getfildirparams(obj, ibuf, ibuflen, rbuf, rbuflen )
     dbitmap = ntohs( dbitmap );
     ibuf += sizeof( dbitmap );
 
-    if (( path = cname( vol, dir, &ibuf )) == NULL) {
-	return( AFPERR_NOOBJ );
+    if (NULL == ( s_path = cname( vol, dir, &ibuf )) ) {
+        return get_afp_errno(AFPERR_NOOBJ); 
     }
 
-    if ( stat( mtoupath(vol, path ), &st ) < 0 ) {
-	return( AFPERR_NOOBJ );
+    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 or
+         * it's curdir (maybe deleted, but then we can't know).
+         * So we need to try harder.
+         */
+        of_statdir(vol, s_path);
+    }
+    if ( s_path->st_errno != 0 ) {
+        return( AFPERR_NOOBJ );
     }
 
     buflen = 0;
-    if (S_ISDIR(st.st_mode)) {
-	if (dbitmap) {
-	    ret = getdirparams(vol, dbitmap, ".", curdir,
-			       &st, rbuf + 3 * sizeof( u_int16_t ), &buflen );
-	    if (ret != AFP_OK )
-		return( ret );
-	}
+    if (S_ISDIR(st->st_mode)) {
+        if (dbitmap) {
+            dir = s_path->d_dir;
+            if (!dir) 
+                return AFPERR_NOOBJ;
+
+            ret = getdirparams(vol, dbitmap, s_path, dir,
+                                 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; 
+        *(rbuf + 2 * sizeof( u_int16_t )) = (char) FILDIRBIT_ISDIR;
     } else {
-	if (fbitmap && ( ret = getfilparams(vol, fbitmap, path, curdir, &st,
-		rbuf + 3 * sizeof( u_int16_t ), &buflen )) != AFP_OK ) {
-	    return( ret );
-	}
+        if (fbitmap && AFP_OK != (ret = getfilparams(vol, fbitmap, s_path, curdir, 
+                                            rbuf + 3 * sizeof( u_int16_t ), &buflen )) ) {
+            return( ret );
+        }
         /* this is a file */
-	*(rbuf + 2 * sizeof( u_int16_t )) = FILDIRBIT_ISFILE;
+        *(rbuf + 2 * sizeof( u_int16_t )) = FILDIRBIT_ISFILE;
     }
     *rbuflen = buflen + 3 * sizeof( u_int16_t );
     fbitmap = htons( fbitmap );
@@ -226,26 +218,26 @@ int afp_getfildirparams(obj, ibuf, ibuflen, rbuf, rbuflen )
     *rbuf = 0;
 
 #ifdef DEBUG
-    syslog(LOG_INFO, "end afp_getfildirparams:");
+    LOG(log_info, logtype_afpd, "end afp_getfildirparams:");
 #endif /* DEBUG */
 
     return( AFP_OK );
 }
 
 int afp_setfildirparams(obj, ibuf, ibuflen, rbuf, rbuflen )
-    AFPObj      *obj;
-    char	*ibuf, *rbuf;
-    int		ibuflen, *rbuflen;
+AFPObj  *obj;
+char	*ibuf, *rbuf _U_;
+int	ibuflen _U_, *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
-    syslog(LOG_INFO, "begin afp_setfildirparams:");
+    LOG(log_info, logtype_afpd, "begin afp_setfildirparams:");
 #endif /* DEBUG */
 
     *rbuflen = 0;
@@ -253,8 +245,8 @@ int afp_setfildirparams(obj, ibuf, ibuflen, rbuf, rbuflen )
     memcpy( &vid, ibuf, sizeof(vid));
     ibuf += sizeof( vid );
 
-    if (( vol = getvolbyvid( vid )) == NULL ) {
-	return( AFPERR_PARAM );
+    if (NULL == ( vol = getvolbyvid( vid )) ) {
+        return( AFPERR_PARAM );
     }
 
     if (vol->v_flags & AFPVOL_RO)
@@ -263,65 +255,206 @@ int afp_setfildirparams(obj, ibuf, ibuflen, rbuf, rbuflen )
     memcpy( &did, ibuf, sizeof( did));
     ibuf += sizeof( did);
 
-    if (( dir = dirsearch( vol, did )) == NULL ) {
-	return( AFPERR_NOOBJ );
+    if (NULL == ( dir = dirlookup( vol, did )) ) {
+	return afp_errno;    
     }
 
     memcpy( &bitmap, ibuf, sizeof( bitmap ));
     bitmap = ntohs( bitmap );
     ibuf += sizeof( bitmap );
 
-    if (( path = cname( vol, dir, &ibuf )) == NULL ) {
-	return( AFPERR_NOOBJ );
+    if (NULL == ( path = cname( vol, dir, &ibuf ))) {
+        return get_afp_errno(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_statdir(vol, path);
     }
 
+    if ( path->st_errno != 0 ) {
+        return( AFPERR_NOOBJ );
+    }
     /*
      * If ibuf is odd, make it even.
      */
     if ((u_long)ibuf & 1 ) {
-	ibuf++;
+        ibuf++;
     }
 
-    if (S_ISDIR(st.st_mode)) {
-	rc = setdirparams(vol, path, bitmap, ibuf );
+    if (S_ISDIR(st->st_mode)) {
+        rc = setdirparams(vol, path, bitmap, ibuf );
     } else {
-	rc = setfilparams(vol, path, bitmap, ibuf );
+        rc = setfilparams(vol, path, bitmap, ibuf );
     }
     if ( rc == AFP_OK ) {
-	setvoltime(obj, vol );
+        setvoltime(obj, vol );
     }
 
 #ifdef DEBUG
-    syslog(LOG_INFO, "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 checks 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 (!vol->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, nst;
+    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;
-#ifdef CNID_DB
-    cnid_t              id;
-#endif /* CNID_DB */
+    struct adouble	*adp;
+    struct ofork	*opened = NULL;
+    struct path         path;
+    cnid_t      id;
+
+    ad_init(&ad, vol->v_adouble, vol->v_ad_options);
+    adp = &ad;
+    adflags = 0;
+    
+    if (!isdir) {
+        p = mtoupath(vol, oldname, sdir->d_did, utf8_encoding());
+        if (!p) { 
+            return AFPERR_PARAM; /* can't convert */
+        }
+        id = cnid_get(vol->v_cdb, sdir->d_did, p, strlen(p));
+        p = ctoupath( vol, sdir, oldname );
+        if (!p) { 
+            return AFPERR_PARAM; /* pathname too long */
+        }
+        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 {
+        id = sdir->d_did; /* we already have the CNID */
+        p = ctoupath( vol, sdir->d_parent, oldname );
+        if (!p) {
+            return AFPERR_PARAM;
+        }
+        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_metadata(p, adflags, adp)) {
+    u_int16_t bshort;
+
+        ad_getattr(adp, &bshort);
+        ad_close( adp, ADFLAGS_HF );
+        if ((bshort & htons(ATTRBIT_NORENAME))) 
+            return(AFPERR_OLOCK);
+    }
+
+    if (NULL == (upath = mtoupath(vol, newname, curdir->d_did, utf8_encoding()))){ 
+        return AFPERR_PARAM;
+    }
+    path.u_name = upath;
+    st = &path.st;    
+    if (0 != (rc = check_name(vol, upath))) {
+            return  rc;
+    }
+
+    /* source == destination. we just silently accept this. */
+    if ((!isdir && curdir == sdir) || (isdir && curdir == sdir->d_parent)) {
+        if (strcmp(oldname, newname) == 0)
+            return AFP_OK;
+
+        if (stat(upath, st) == 0) {
+            if (!stat(p, &nst) && !(nst.st_dev == st->st_dev && nst.st_ino == st->st_ino) ) {
+                /* not the same file */
+                return AFPERR_EXIST;
+            }
+            errno = 0;
+        }
+    } 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(vol, p, upath, newname, adp );
+            if (rc == AFP_OK)
+                of_rename(vol, opened, sdir, oldname, curdir, newname);
+        }
+    } else {
+        rc = renamedir(vol, p, upath, sdir, curdir, newname);
+    }
+    if ( rc == AFP_OK && 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_cdb, id, st, curdir->d_did, upath, strlen(upath));
+    }
+
+    return rc;
+}
 
+/* -------------------------------------------- */
+int afp_rename(obj, ibuf, ibuflen, rbuf, rbuflen )
+AFPObj  *obj;
+char	*ibuf, *rbuf _U_;
+int	ibuflen _U_, *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
-    syslog(LOG_INFO, "begin afp_rename:");
+    LOG(log_info, logtype_afpd, "begin afp_rename:");
 #endif /* DEBUG */
 
     *rbuflen = 0;
@@ -329,8 +462,8 @@ int afp_rename(obj, ibuf, ibuflen, rbuf, rbuflen )
 
     memcpy( &vid, ibuf, sizeof( vid ));
     ibuf += sizeof( vid );
-    if (( vol = getvolbyvid( vid )) == NULL ) {
-	return( AFPERR_PARAM );
+    if (NULL == ( vol = getvolbyvid( vid )) ) {
+        return( AFPERR_PARAM );
     }
 
     if (vol->v_flags & AFPVOL_RO)
@@ -338,167 +471,74 @@ int afp_rename(obj, ibuf, ibuflen, rbuf, rbuflen )
 
     memcpy( &did, ibuf, sizeof( did ));
     ibuf += sizeof( did );
-    if (( dir = dirsearch( vol, did )) == NULL ) {
-	return( AFPERR_NOOBJ );
+    if (NULL == ( sdir = dirlookup( vol, did )) ) {
+	return afp_errno;    
     }
 
-    if (( path = cname( vol, dir, &ibuf )) == NULL ) {
-	return( AFPERR_NOOBJ );
+    /* source pathname */
+    if (NULL == ( path = cname( vol, sdir, &ibuf )) ) {
+        return get_afp_errno(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;
+    isdir = path_isadir(path);
+    if ( *path->m_name != '\0' ) {
+        strcpy(oldname, path->m_name); /* an extra copy for of_rename */
+        if (isdir) {
+            /* curdir parent dir, need to move sdir back */
+            sdir = path->d_dir;
+        }
     }
-    plen = (unsigned char) *ibuf++;
-    *( ibuf + plen ) = '\0';
-
-    if ( *path == '\0' ) {
-        if ( curdir->d_parent == NULL ) { /* root directory */
-	    return( AFPERR_NORENAME );
-	}
-	odir = curdir;
-	path = curdir->d_name;
-	if ( movecwd( vol, curdir->d_parent ) < 0 ) {
-	    return( AFPERR_NOOBJ );
-	}
+    else {
+        if ( sdir->d_parent == NULL ) { /* root directory */
+            return( AFPERR_NORENAME );
+        }
+        /* move to destination dir */
+        if ( movecwd( vol, sdir->d_parent ) < 0 ) {
+            return afp_errno;
+        }
+        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(vol, 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 ((vol->v_flags & AFPVOL_MSWINDOWS) && 
-	strpbrk(ibuf, MSWINDOWS_BADCHARS))
-        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 ) {
-	    syslog( LOG_ERR, "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
-    syslog(LOG_INFO, "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;
-    int		ibuflen, *rbuflen;
+AFPObj  *obj;
+char	*ibuf, *rbuf _U_;
+int	ibuflen _U_, *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
-    syslog(LOG_INFO, "begin afp_delete:");
+    LOG(log_info, logtype_afpd, "begin afp_delete:");
 #endif /* DEBUG */ 
 
     *rbuflen = 0;
@@ -506,8 +546,8 @@ int afp_delete(obj, ibuf, ibuflen, rbuf, rbuflen )
 
     memcpy( &vid, ibuf, sizeof( vid ));
     ibuf += sizeof( vid );
-    if (( vol = getvolbyvid( vid )) == NULL ) {
-	return( AFPERR_PARAM );
+    if (NULL == ( vol = getvolbyvid( vid )) ) {
+        return( AFPERR_PARAM );
     }
 
     if (vol->v_flags & AFPVOL_RO)
@@ -515,89 +555,114 @@ int afp_delete(obj, ibuf, ibuflen, rbuf, rbuflen )
 
     memcpy( &did, ibuf, sizeof( did ));
     ibuf += sizeof( int );
-    if (( dir = dirsearch( vol, did )) == NULL ) {
-	return( AFPERR_NOOBJ );
+    if (NULL == ( dir = dirlookup( vol, did )) ) {
+	return afp_errno;    
     }
 
-    if (( path = cname( vol, dir, &ibuf )) == NULL ) {
-	return( AFPERR_NOOBJ );
+    if (NULL == ( s_path = cname( vol, dir, &ibuf )) ) {
+        return get_afp_errno(AFPERR_NOOBJ); 
     }
 
-    if ( *path == '\0' ) {
-	rc = deletecurdir( vol, obj->oldtmp, AFPOBJ_TMPSIZ);
-    } else if (of_findname(vol, curdir, path)) {
+    upath = s_path->u_name;
+    if ( path_isadir( s_path) ) {
+    	if (*s_path->m_name != '\0') {
+    	    rc = AFPERR_ACCESS;
+    	}
+    	else {
+            rc = deletecurdir( vol, obj->oldtmp);
+        }
+    } else if (of_findname(s_path)) {
         rc = AFPERR_BUSY;
-    } else if ((rc = deletefile( upath = mtoupath(vol, path ))) == 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 */
+    } else {
+        rc = deletefile(vol, upath, 1);
     }
     if ( rc == AFP_OK ) {
-	setvoltime(obj, vol );
+	curdir->offcnt--;
+        setvoltime(obj, vol );
     }
 
 #ifdef DEBUG
-    syslog(LOG_INFO, "end afp_delete:");
+    LOG(log_info, logtype_afpd, "end afp_delete:");
 #endif /* DEBUG */
 
     return( rc );
 }
-
-char *ctoupath( vol, dir, name )
-    const struct vol	*vol;
-    struct dir	*dir;
-    char	*name;
+/* ------------------------ */
+char *absupath( vol, dir, u )
+const struct vol	*vol;
+struct dir	*dir;
+char	*u;
 {
     struct dir	*d;
     static char	path[ MAXPATHLEN + 1];
-    char	*p, *u;
+    char	*p;
     int		len;
 
+    if (u == NULL)
+        return NULL;
+        
     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 );
-	len = strlen( u );
-	p -= len;
-	strncpy( p, u, len );
+    memcpy( p, u, len );
+    if (dir) for ( d = dir; d->d_parent; d = d->d_parent ) {
+        u = d->d_u_name;
+        len = strlen( u );
+        if (p -len -1 < path) {
+            /* FIXME 
+               rather rare so LOG error and/or client message ?
+            */
+            return NULL;
+        }
+        *--p = '/';
+        p -= len;
+        memcpy( p, u, len );
     }
-    *--p = '/';
     len = strlen( vol->v_path );
+    if (p -len -1 < path) {
+        return NULL;
+    }
+    *--p = '/';
     p -= len;
-    strncpy( p, vol->v_path, len );
+    memcpy( p, vol->v_path, len );
 
     return( p );
 }
 
+/* ------------------------
+ * FIXME dir could be NULL
+*/
+char *ctoupath( vol, dir, name )
+const struct vol	*vol;
+struct dir	*dir;
+char	*name;
+{
+    return absupath(vol, dir, mtoupath(vol, name, dir->d_did, utf8_encoding()));
+}
 
+/* ------------------------- */
 int afp_moveandrename(obj, ibuf, ibuflen, rbuf, rbuflen )
-    AFPObj      *obj;
-    char	*ibuf, *rbuf;
-    int		ibuflen, *rbuflen;
+AFPObj  *obj;
+char	*ibuf, *rbuf _U_;
+int	ibuflen  _U_, *rbuflen;
 {
     struct vol	*vol;
-    struct dir	*sdir, *ddir, *odir = NULL;
-    struct stat st;
+    struct dir	*sdir, *ddir;
+    int         isdir;
     char	*oldname, *newname;
-    char        *path, *p, *upath; 
-    int		did, rc;
-    int		plen;
+    struct path *path;
+    int		did;
+    int		pdid;
+    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
-    syslog(LOG_INFO, "begin afp_moveandrename:");
+    LOG(log_info, logtype_afpd, "begin afp_moveandrename:");
 #endif /* DEBUG */
 
     *rbuflen = 0;
@@ -605,8 +670,8 @@ int afp_moveandrename(obj, ibuf, ibuflen, rbuf, rbuflen )
 
     memcpy( &vid, ibuf, sizeof( vid ));
     ibuf += sizeof( vid );
-    if (( vol = getvolbyvid( vid )) == NULL ) {
-	return( AFPERR_PARAM );
+    if (NULL == ( vol = getvolbyvid( vid )) ) {
+        return( AFPERR_PARAM );
     }
 
     if (vol->v_flags & AFPVOL_RO)
@@ -615,127 +680,84 @@ int afp_moveandrename(obj, ibuf, ibuflen, rbuf, rbuflen )
     /* source did followed by dest did */
     memcpy( &did, ibuf, sizeof( did ));
     ibuf += sizeof( int );
-    if (( sdir = dirsearch( vol, did )) == NULL ) {
-	return( AFPERR_PARAM );
+    if (NULL == ( sdir = dirlookup( vol, did )) ) {
+        return afp_errno; /* was AFPERR_PARAM */
     }
 
     memcpy( &did, ibuf, sizeof( did ));
     ibuf += sizeof( int );
 
     /* source pathname */
-    if (( path = cname( vol, sdir, &ibuf )) == NULL ) {
-	return( AFPERR_NOOBJ );
+    if (NULL == ( path = cname( vol, sdir, &ibuf )) ) {
+        return get_afp_errno(AFPERR_NOOBJ); 
     }
 
     sdir = curdir;
     newname = obj->newtmp;
     oldname = obj->oldtmp;
-    if ( *path != '\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 );
+    
+    isdir = path_isadir(path);
+    if ( *path->m_name != '\0' ) {
+        if (isdir) {
+            sdir = path->d_dir;
+	}
+        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 */
+        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 ) {
-	return( AFPERR_PARAM );
+    if (NULL == ( ddir = dirlookup( vol, did )) ) {
+        return afp_errno; /*  was AFPERR_PARAM */
     }
-    if (( path = cname( vol, ddir, &ibuf )) == NULL ) {
-	return( AFPERR_NOOBJ );
+    if (NULL == ( path = cname( vol, ddir, &ibuf ))) {
+        return( AFPERR_NOOBJ );
     }
-    if ( *path != '\0' ) {
-	return( AFPERR_BADTYPE );
+    pdid = curdir->d_did;
+    if ( *path->m_name != '\0' ) {
+        return path_error(path, AFPERR_NOOBJ);
     }
 
     /* one more place where we know about path type */
-    if ( *ibuf++ != 2 ) {
-	return( AFPERR_PARAM );
+    if ((plen = copy_path_name(vol, 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 ((vol->v_flags & AFPVOL_MSWINDOWS) && 
-	strpbrk(newname, MSWINDOWS_BADCHARS))
-        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 );
-      
-    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));
-    }
+    rc = moveandrename(vol, sdir, oldname, newname, isdir);
 
+    if ( rc == AFP_OK ) {
+        char *upath = mtoupath(vol, newname, pdid, utf8_encoding());
+        
+        if (NULL == upath) {
+            return AFPERR_PARAM;
+        }
+        curdir->offcnt++;
+        sdir->offcnt--;
 #ifdef DROPKLUDGE
-    if (vol->v_flags & AFPVOL_DROPBOX) {
-        if (retvalue=matchfile2dirperms (newname, vol, did) != AFP_OK) {
-	    return retvalue;
+        if (vol->v_flags & AFPVOL_DROPBOX) {
+            /* FIXME did is not always the source id */
+            if ((retvalue=matchfile2dirperms (upath, vol, did)) != AFP_OK) {
+                return retvalue;
+            }
         }
-    }
+        else
 #endif /* DROPKLUDGE */
+            /* if unix priv don't try to match perm with dest folder */
+            if (!isdir && !vol_unix_priv(vol)) {
+                int  admode = ad_mode("", 0777) | vol->v_perm;
 
-    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 */
-	setvoltime(obj, vol );
+                setfilmode(upath, admode, NULL);
+                setfilmode(vol->ad_path( upath, ADFLAGS_HF ), ad_hf_mode(admode), NULL);
+            }
+        setvoltime(obj, vol );
     }
 
 #ifdef DEBUG
-    syslog(LOG_INFO, "end afp_moveandrename:");
+    LOG(log_info, logtype_afpd, "end afp_moveandrename:");
 #endif /* DEBUG */
 
     return( rc );
@@ -748,32 +770,32 @@ int veto_file(const char*veto_str, const char*path)
  * otherwise, 0 is returned.
  */
 {
-	int i;	/* index to veto_str */
-	int j;	/* index to path */
+    int i;	/* index to veto_str */
+    int j;	/* index to path */
 
-	if ((veto_str == NULL) || (path == NULL))
-		return 0;
-/*
-#ifdef DEBUG
-	syslog(LOG_DEBUG, "veto_file \"%s\", \"%s\"", veto_str, path);
-#endif
-*/
-	for(i=0, j=0; veto_str[i] != '\0'; i++) {
-		if (veto_str[i] == '/') {
-			if ((j>0) && (path[j] == '\0'))
-				return 1;
-			j = 0;
-		} else {
-			if (veto_str[i] != path[j]) {
-				while ((veto_str[i] != '/')
-				    && (veto_str[i] != '\0'))
-					i++;
-				j = 0;
-				continue;
-			}
-			j++;
-		}
-	}
-	return 0;
+    if ((veto_str == NULL) || (path == NULL))
+        return 0;
+    /*
+    #ifdef DEBUG
+    	LOG(log_debug, logtype_afpd, "veto_file \"%s\", \"%s\"", veto_str, path);
+    #endif
+    */
+    for(i=0, j=0; veto_str[i] != '\0'; i++) {
+        if (veto_str[i] == '/') {
+            if ((j>0) && (path[j] == '\0'))
+                return 1;
+            j = 0;
+        } else {
+            if (veto_str[i] != path[j]) {
+                while ((veto_str[i] != '/')
+                        && (veto_str[i] != '\0'))
+                    i++;
+                j = 0;
+                continue;
+            }
+            j++;
+        }
+    }
+    return 0;
 }