X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fdirectory.h;h=eb89c606afc41cce1994851265283bed05d27e9a;hb=d3dff4ba4b8db3131a16641d35a6554be5fb5160;hp=76267e73b9dac151a088c175af46d8348468dae3;hpb=8ea9eaad323ec8ea180ffc277cd409d713a5895f;p=netatalk.git

diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h
index 76267e73..eb89c606 100644
--- a/etc/afpd/directory.h
+++ b/etc/afpd/directory.h
@@ -24,10 +24,8 @@
 #ifndef AFPD_DIRECTORY_H
 #define AFPD_DIRECTORY_H 1
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
-/*#include <sys/stat.h>*/ /* including it here causes some confusion */
-#include <netatalk/endian.h>
+#include <arpa/inet.h>
 #include <dirent.h>
 
 /* sys/types.h usually snarfs in major/minor macros. if they don't
@@ -37,21 +35,10 @@
 #endif
 
 #include <atalk/directory.h>
+#include <atalk/globals.h>
 
-#include "globals.h"
 #include "volume.h"
 
-#define DIRF_FSMASK	(3<<0)
-#define DIRF_NOFS	(0<<0)
-#define DIRF_AFS	(1<<0)
-#define DIRF_UFS	(2<<0)
-
-#define DIRF_OFFCNT    (1<<4) /* offsprings count is valid */
-#define DIRF_CNID	   (1<<5) /* renumerate id */
-#define DIRF_CACHELOCK (1<<6) /* lock in cache, don't remove in dircache_eviction, for catsearch */
-
-#define AFPDIR_READ	(1<<0)
-
 /* directory bits */
 #define DIRPBIT_ATTR	0
 #define DIRPBIT_PDID	1
@@ -110,33 +97,33 @@ typedef int (*dir_loop)(struct dirent *, char *, void *);
 
 extern void        dir_free_invalid_q(void);
 extern struct dir  *dir_new(const char *mname, const char *uname, const struct vol *,
-                            cnid_t pdid, cnid_t did, bstring fullpath, time_t ctime);
+                            cnid_t pdid, cnid_t did, bstring fullpath, struct stat *);
 extern void        dir_free (struct dir *);
 extern struct dir  *dir_add(struct vol *, const struct dir *, struct path *, int);
 extern int         dir_modify(const struct vol *vol, struct dir *dir, cnid_t pdid, cnid_t did,
                               const char *new_mname, const char *new_uname, bstring pdir_fullpath);
 extern int         dir_remove(const struct vol *vol, struct dir *dir);
 extern struct dir  *dirlookup (const struct vol *, cnid_t);
+extern struct dir *dirlookup_bypath(const struct vol *vol, const char *path);
+
 extern int         movecwd (const struct vol *, struct dir *);
 extern struct path *cname (struct vol *, struct dir *, char **);
 
 extern int         deletecurdir (struct vol *);
 extern mode_t      mtoumode (struct maccess *);
-extern void        utommode (struct stat *, struct maccess *);
-extern int         getdirparams (const struct vol *, u_int16_t, struct path *,
+extern int         getdirparams (const AFPObj *obj, const struct vol *, uint16_t, struct path *,
                                  struct dir *, char *, size_t *);
 
-extern int         setdirparams(struct vol *, struct path *, u_int16_t, char *);
-extern int         renamedir(const struct vol *, int, char *, char *, struct dir *,
+extern int         setdirparams(struct vol *, struct path *, uint16_t, char *);
+extern int         renamedir(struct vol *, int, char *, char *, struct dir *,
                              struct dir *, char *);
 extern int         path_error(struct path *, int error);
-extern void        setdiroffcnt(struct dir *dir, struct stat *st,  u_int32_t count);
+extern void        setdiroffcnt(struct dir *dir, struct stat *st,  uint32_t count);
 extern int         dirreenumerate(struct dir *dir, struct stat *st);
 extern int         for_each_dirent(const struct vol *, char *, dir_loop , void *);
-extern int         check_access(char *name , int mode);
-extern int         file_access(struct path *path, int mode);
+extern int         check_access(const AFPObj *obj, struct vol *, char *name , int mode);
+extern int         file_access(const AFPObj *obj, struct vol *vol, struct path *path, int mode);
 extern int         netatalk_unlink (const char *name);
-extern int         caseenumerate (const struct vol *, struct path *, struct dir *);
 
 /* from enumerate.c */
 extern char        *check_dirent (const struct vol *, char *);