remove gcc warnings and cleanup inline mess

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

diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h
index 8217fd30dc77d3bc21e6662423b9e7449a000c0a..12b64790434ca173248ec3ab7f86b0d2cf324c94 100644 (file)
--- a/etc/afpd/directory.h
+++ b/etc/afpd/directory.h
@@ -1,5 +1,5 @@
 /*
- * $Id: directory.h,v 1.6 2002-10-11 14:18:28 didg Exp $
+ * $Id: directory.h,v 1.13.2.4.2.2.2.1 2008-11-25 15:16:32 didg Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -53,21 +53,36 @@ struct dir {
     int                d_flags;
 
     time_t      ctime;                /* inode ctime */
-    int         offcnt;               /* offspring count */
+    u_int32_t   offcnt;               /* offspring count */
 
-    char       *d_m_name;             /* mac name */
+    char       *d_m_name;            /* mac name */
     char        *d_u_name;            /* unix name */
 };
 
 struct path {
-    char       *m_name;             /* mac name */
+    int         m_type;             /* mac name type (long name, unicode */
+    char       *m_name;            /* mac name */
     char        *u_name;            /* unix name */
-
-    int         st_valid;
+    struct dir  *d_dir;             /* */
+    int         st_valid;           /* does st_errno and st set */
     int         st_errno;
     struct stat st;
 };
 
+#ifndef ATACC
+static inline int path_isadir(struct path *o_path)
+{
+    return o_path->d_dir != NULL;
+#if 0
+    return o_path->m_name == '\0' || /* we are in a it */
+           !o_path->st_valid ||      /* in cache but we can't chdir in it */ 
+           (!o_path->st_errno && S_ISDIR(o_path->st.st_mode)); /* not in cache an can't chdir */
+#endif
+}
+#else
+extern int path_isadir(struct path *o_path);
+#endif
+
 /* child addition/removal macros */
 #define dirchildadd(a, b) do { \
        if (!(a)->d_child) \
@@ -122,6 +137,7 @@ struct path {
 #define DIRPBIT_GID    11
 #define DIRPBIT_ACCESS 12
 #define DIRPBIT_PDINFO  13         /* ProDOS Info */
+#define DIRPBIT_UNIXPR  15
 
 /* directory attribute bits (see file.h for other bits) */
 #define ATTRBIT_EXPFOLDER   (1 << 1) /* shared point */
@@ -138,6 +154,8 @@ struct path {
 /* file/directory ids. what a mess. we scramble things in a vain attempt
  * to get something meaningful */
 #ifndef AFS
+
+#if 0
 #define CNID_XOR(a)  (((a) >> 16) ^ (a))
 #define CNID_DEV(a)   ((((CNID_XOR(major((a)->st_dev)) & 0xf) << 3) | \
        (CNID_XOR(minor((a)->st_dev)) & 0x7)) << 24)
@@ -145,6 +163,10 @@ struct path {
                                       & 0x00ffffff)
 #define CNID_FILE(a)  (((a) & 0x1) << 31)
 #define CNID(a,b)     (CNID_DEV(a) | CNID_INODE(a) | CNID_FILE(b))
+#endif
+
+#define CNID(a,b)     ((a)->st_ino & 0xffffffff)
+
 #else /* AFS */
 #define CNID(a,b)     (((a)->st_ino & 0x7fffffff) | CNID_FILE(b))
 #endif /* AFS */
@@ -163,16 +185,18 @@ struct maccess {
 #define        AR_UOWN         (1<<7)
 
 extern struct dir       *dirnew __P((const char *, const char *));
+extern void             dirfreename __P((struct dir *));
 extern void             dirfree __P((struct dir *));
 extern struct dir      *dirsearch __P((const struct vol *, u_int32_t));
 extern struct dir      *dirlookup __P((const struct vol *, u_int32_t));
+extern struct dir       *dirsearch_byname __P((struct dir *,const char *));
 
 extern struct dir      *adddir __P((struct vol *, struct dir *, 
                                                struct path *));
 
 extern struct dir       *dirinsert __P((struct vol *, struct dir *));
 extern int              movecwd __P((const struct vol *, struct dir *));
-extern int              deletecurdir __P((const struct vol *, char *, int));
+extern int              deletecurdir __P((const struct vol *, char *));
 extern struct path      *cname __P((const struct vol *, struct dir *,
                              char **));
 extern mode_t           mtoumode __P((struct maccess *));
@@ -180,14 +204,18 @@ extern void             utommode __P((struct stat *, struct maccess *));
 extern int getdirparams __P((const struct vol *, u_int16_t, struct path *,
                                  struct dir *, char *, int *));
 extern int setdirparams __P((const struct vol *, struct path *, u_int16_t, char *));
-extern int renamedir __P((char *, char *, struct dir *,
-                              struct dir *, char *, const int));
+extern int renamedir __P((const struct vol *, char *, char *, struct dir *,
+                              struct dir *, char *));
+extern int path_error __P((struct path *, int error));
 
 typedef int (*dir_loop)(struct dirent *, char *, void *);
 
 extern int  for_each_dirent __P((const struct vol *, char *, dir_loop , void *));
 
 extern int  check_access __P((char *name , int mode));
+extern int file_access   __P((struct path *path, int mode));
+
+extern int netatalk_unlink __P((const char *name));
 
 /* from enumerate.c */
 extern char *check_dirent __P((const struct vol *, char *));
@@ -202,7 +230,11 @@ extern int afp_mapname __P((AFPObj *, char *, int, char *, int *));
 
 /* from enumerate.c */
 extern int     afp_enumerate __P((AFPObj *, char *, unsigned int, char *, unsigned int *));
+extern int     afp_enumerate_ext __P((AFPObj *, char *, unsigned int, char *, unsigned int *));
 extern int     afp_enumerate_ext2 __P((AFPObj *, char *, unsigned int, char *, unsigned int *));
+
+/* from catsearch.c */
 extern int     afp_catsearch __P((AFPObj *, char *, int, char *, int *));
+extern int     afp_catsearch_ext __P((AFPObj *, char *, int, char *, int *));
 
 #endif