X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fdirectory.h;h=79c4a0407fe3b6c1d61bb3d2208e1cc22f319d9f;hb=4054f4b3c85ecab060dafd46c0d3632cadbb5803;hp=81345dd7222558495f3bb37aca0fd1e4ea3fe3ef;hpb=dae33a574ac2963d8bd279eaf96e08b5b48afc03;p=netatalk.git diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h index 81345dd7..79c4a040 100644 --- a/etc/afpd/directory.h +++ b/etc/afpd/directory.h @@ -1,6 +1,4 @@ /* - * $Id: directory.h,v 1.9 2003-01-24 07:08:42 didg Exp $ - * * Copyright (c) 1990,1991 Regents of The University of Michigan. * All Rights Reserved. * @@ -38,85 +36,19 @@ #include #endif +#include + #include "globals.h" #include "volume.h" -/* the did tree is now a red-black tree while the parent/child - * tree is a circular doubly-linked list. how exciting. */ -struct dir { - struct dir *d_left, *d_right, *d_back; /* for red-black tree */ - int d_color; - struct dir *d_parent, *d_child; /* parent-child */ - struct dir *d_prev, *d_next; /* siblings */ - void *d_ofork; /* oforks using this directory. */ - u_int32_t d_did; - int d_flags; - - time_t ctime; /* inode ctime */ - int offcnt; /* offspring count */ - - char *d_m_name; /* mac name */ - char *d_u_name; /* unix name */ -}; - -struct path { - int m_type; - char *m_name; /* mac name */ - char *u_name; /* unix name */ - - int st_valid; - int st_errno; - struct stat st; -}; - -#ifndef ATACC -static __inline__ int path_isadir(struct path *o_path) -{ - 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 */ -} -#else -extern int path_isadir(struct path *o_path); -#endif - -/* child addition/removal macros */ -#define dirchildadd(a, b) do { \ - if (!(a)->d_child) \ - (a)->d_child = (b); \ - else { \ - (b)->d_next = (a)->d_child; \ - (b)->d_prev = (b)->d_next->d_prev; \ - (b)->d_next->d_prev = (b); \ - (b)->d_prev->d_next = (b); \ - } \ -} while (0) - -#define dirchildremove(a,b) do { \ - if ((a)->d_child == (b)) \ - (a)->d_child = ((b) == (b)->d_next) ? NULL : (b)->d_next; \ - (b)->d_next->d_prev = (b)->d_prev; \ - (b)->d_prev->d_next = (b)->d_next; \ - (b)->d_next = (b)->d_prev = (b); \ -} while (0) - -#define DIRTREE_COLOR_RED 0 -#define DIRTREE_COLOR_BLACK 1 - -/* setgid directories */ -#ifndef DIRBITS -# ifdef AFS -# define DIRBITS 0 -# else /* AFS */ -# define DIRBITS S_ISGID -# endif /* AFS */ -#endif /* DIRBITS */ - #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 */ @@ -134,22 +66,16 @@ extern int path_isadir(struct path *o_path); #define DIRPBIT_GID 11 #define DIRPBIT_ACCESS 12 #define DIRPBIT_PDINFO 13 /* ProDOS Info */ - -/* directory attribute bits (see file.h for other bits) */ -#define ATTRBIT_EXPFOLDER (1 << 1) /* shared point */ -#define ATTRBIT_MOUNTED (1 << 3) /* mounted share point by non-admin */ -#define ATTRBIT_INEXPFOLDER (1 << 4) /* folder in a shared area */ +#define DIRPBIT_UNIXPR 15 #define FILDIRBIT_ISDIR (1 << 7) /* is a directory */ #define FILDIRBIT_ISFILE (0) /* is a file */ -/* reserved directory id's */ -#define DIRDID_ROOT_PARENT htonl(1) /* parent directory of root */ -#define DIRDID_ROOT htonl(2) /* root directory */ - /* 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) @@ -157,11 +83,14 @@ extern int path_isadir(struct path *o_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 */ - struct maccess { u_char ma_user; u_char ma_world; @@ -174,49 +103,61 @@ struct maccess { #define AR_UWRITE (1<<2) #define AR_UOWN (1<<7) -extern struct dir *dirnew __P((const char *, const char *)); -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 struct path *cname __P((const struct vol *, struct dir *, - char **)); -extern mode_t mtoumode __P((struct maccess *)); -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)); +q_t *invalid_dircache_entries; 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 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); +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 *, + 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 *, + 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 __P((const struct vol *, char *)); +extern char *check_dirent (const struct vol *, char *); /* FP functions */ -extern int afp_createdir __P((AFPObj *, char *, int, char *, int *)); -extern int afp_opendir __P((AFPObj *, char *, int, char *, int *)); -extern int afp_setdirparams __P((AFPObj *, char *, int, char *, int *)); -extern int afp_closedir __P((AFPObj *, char *, int, char *, int *)); -extern int afp_mapid __P((AFPObj *, char *, int, char *, int *)); -extern int afp_mapname __P((AFPObj *, char *, int, char *, int *)); +int afp_createdir (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen); +int afp_opendir (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen); +int afp_setdirparams (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen); +int afp_closedir (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen); +int afp_mapid (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen); +int afp_mapname (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen); +int afp_syncdir (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen); /* 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 *)); -extern int afp_catsearch __P((AFPObj *, char *, int, char *, int *)); +int afp_enumerate (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen); +int afp_enumerate_ext (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen); +int afp_enumerate_ext2 (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen); + +/* from catsearch.c */ +int afp_catsearch (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen); +int afp_catsearch_ext (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen); #endif