missing include file

[netatalk.git] / etc / afpd / filedir.c

diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c
index 8e03cbcc0403db67c45515e20ad9ff7730bea338..be346452636531f4e5bac78d95f6f52755081cf2 100644 (file)
--- a/etc/afpd/filedir.c
+++ b/etc/afpd/filedir.c
@@ -1,5 +1,5 @@
 /*
- * $Id: filedir.c,v 1.50 2005-06-02 12:32:17 didg Exp $
+ * $Id: filedir.c,v 1.59 2009-10-16 00:15:53 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -32,12 +32,14 @@ char *strchr (), *strrchr ();
 #include <dirent.h>
 #include <errno.h>
 #include <sys/param.h>
-#include <atalk/adouble.h>
 
+#include <atalk/adouble.h>
+#include <atalk/vfs.h>
 #include <atalk/afp.h>
 #include <atalk/util.h>
 #include <atalk/cnid.h>
 #include <atalk/logger.h>
+#include <atalk/unix.h>
 
 #include "directory.h"
 #include "desktop.h"
@@ -49,12 +51,12 @@ char *strchr (), *strrchr ();
 #include "unix.h"
 
 #ifdef DROPKLUDGE
-int matchfile2dirperms(upath, vol, did)
+int matchfile2dirperms(
 /* Since it's kinda' big; I decided against an
 inline function */
-char   *upath;
-struct vol  *vol;
-int            did;
+    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 */
@@ -129,16 +131,14 @@ more information */
 }
 #endif
 
-int afp_getfildirparams(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj  *obj _U_;
-char   *ibuf, *rbuf;
-int    ibuflen _U_, *rbuflen;
+int afp_getfildirparams(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen)
 {
     struct stat                *st;
     struct vol         *vol;
     struct dir         *dir;
     u_int32_t           did;
-    int                        buflen, ret;
+    int                        ret;
+    size_t             buflen;
     u_int16_t          fbitmap, dbitmap, vid;
     struct path         *s_path;
 
@@ -227,10 +227,7 @@ int        ibuflen _U_, *rbuflen;
     return( AFP_OK );
 }
 
-int afp_setfildirparams(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj  *obj;
-char   *ibuf, *rbuf _U_;
-int    ibuflen _U_, *rbuflen;
+int afp_setfildirparams(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen)
 {
     struct stat        *st;
     struct vol *vol;
@@ -316,8 +313,10 @@ int check_name(const struct vol *vol, char *name)
     if ((vol->v_flags & AFPVOL_NOHEX) && strchr(name, '/'))
         return AFPERR_PARAM;
 
-    if (!vol->vfs->validupath(vol, name))
+    if (!vol->vfs->vfs_validupath(vol, name)) {
+        LOG(log_info, logtype_afpd, "check_name: illegal name: '%s'", name);
         return AFPERR_EXIST;
+    }
 
     /* check for vetoed filenames */
     if (veto_file(vol->v_veto, name))
@@ -330,12 +329,7 @@ int check_name(const struct vol *vol, char *name)
    
     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;
+static int moveandrename(const struct vol *vol, struct dir *sdir, char *oldname, char *newname, int isdir)
 {
     char            *p;
     char            *upath;
@@ -442,10 +436,7 @@ int         isdir;
 }
 
 /* -------------------------------------------- */
-int afp_rename(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj  *obj;
-char   *ibuf, *rbuf _U_;
-int    ibuflen _U_, *rbuflen;
+int afp_rename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen)
 {
     struct vol *vol;
     struct dir *sdir;
@@ -528,10 +519,7 @@ int        ibuflen _U_, *rbuflen;
 }
 
 /* ------------------------------- */
-int afp_delete(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj  *obj;
-char   *ibuf, *rbuf _U_;
-int    ibuflen _U_, *rbuflen;
+int afp_delete(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen)
 {
     struct vol         *vol;
     struct dir         *dir;
@@ -591,10 +579,7 @@ int        ibuflen _U_, *rbuflen;
     return( rc );
 }
 /* ------------------------ */
-char *absupath( vol, dir, u )
-const struct vol       *vol;
-struct dir     *dir;
-char   *u;
+char *absupath(const struct vol *vol, struct dir *dir, char *u)
 {
     struct dir *d;
     static char        path[ MAXPATHLEN + 1];
@@ -636,19 +621,13 @@ char      *u;
 /* ------------------------
  * FIXME dir could be NULL
 */
-char *ctoupath( vol, dir, name )
-const struct vol       *vol;
-struct dir     *dir;
-char   *name;
+char *ctoupath(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 _U_;
-int    ibuflen  _U_, *rbuflen;
+int afp_moveandrename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen)
 {
     struct vol *vol;
     struct dir *sdir, *ddir;
@@ -751,10 +730,10 @@ int       ibuflen  _U_, *rbuflen;
 #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;
+                int  admode = ad_mode("", 0777) | vol->v_fperm;
 
-                setfilmode(upath, admode, NULL);
-                vol->vfs->rf_setfilmode(vol, upath, admode, NULL);
+                setfilmode(upath, admode, NULL, vol->v_umask);
+                vol->vfs->vfs_setfilmode(vol, upath, admode, NULL);
             }
         setvoltime(obj, vol );
     }
@@ -778,15 +757,13 @@ int veto_file(const char*veto_str, const char*path)
 
     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'))
+            if ((j>0) && (path[j] == '\0')) {
+                LOG(log_info, logtype_afpd, "vetoed file:'%s'", path);
                 return 1;
+            }
             j = 0;
         } else {
             if (veto_str[i] != path[j]) {