Merge master

[netatalk.git] / etc / afpd / directory.h

diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h
index dd14692faf7a910b89cc4a6b7a0d78b71c445316..82daa86c5b5bf5f7bc11e3afdc88baf3851ed593 100644 (file)
--- a/etc/afpd/directory.h
+++ b/etc/afpd/directory.h
@@ -1,6 +1,4 @@
 /*
- * $Id: directory.h,v 1.33.4.1 2010-02-01 10:56:08 franklahm Exp $
- *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
  *
@@ -26,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
@@ -39,20 +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 AFPDIR_READ    (1<<0)
-
 /* directory bits */
 #define DIRPBIT_ATTR   0
 #define DIRPBIT_PDID   1
@@ -105,14 +91,21 @@ struct maccess {
 #define        AR_UWRITE       (1<<2)
 #define        AR_UOWN         (1<<7)
 
+q_t *invalid_dircache_entries;
+
 typedef int (*dir_loop)(struct dirent *, char *, void *);
 
-extern struct dir *dir_new(const char *mname, const char *uname, const struct vol *, cnid_t pdid, cnid_t did, bstring fullpath); /* volume.c needs it once */
+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, struct stat *);
 extern void        dir_free (struct dir *);
-extern struct dir  *dir_add(const 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 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 **);
 
@@ -121,19 +114,21 @@ extern mode_t      mtoumode (struct maccess *);
 extern void        utommode (struct stat *, struct maccess *);
 extern int         getdirparams (const struct vol *, u_int16_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 *, 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 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         setdirparams(struct vol *, struct path *, u_int16_t, char *);
+extern int         renamedir(const 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 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         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 *);
+extern char        *check_dirent (const struct vol *, char *);
 
 /* FP functions */
 int afp_createdir (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);