X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fdirectory.h;h=4a8dad4f5b1534c98dc21d882c79bfe1f9dd2b36;hb=ecfc96169ab669b578e53fa8e13592934fe37788;hp=87acca8fd77ae4662ba91171c4bb26b7ed19fb8f;hpb=31843674b7bd32eabcce3a1ad6159b4f94921f79;p=netatalk.git diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h index 87acca8f..4a8dad4f 100644 --- a/etc/afpd/directory.h +++ b/etc/afpd/directory.h @@ -1,4 +1,6 @@ /* + * $Id: directory.h,v 1.18 2005-04-28 20:49:41 bfernhomberg Exp $ + * * Copyright (c) 1990,1991 Regents of The University of Michigan. * All Rights Reserved. * @@ -28,6 +30,7 @@ #include /*#include */ /* including it here causes some confusion */ #include +#include /* sys/types.h usually snarfs in major/minor macros. if they don't * try this file. */ @@ -48,42 +51,61 @@ struct dir { void *d_ofork; /* oforks using this directory. */ u_int32_t d_did; int d_flags; - char *d_name; + + time_t ctime; /* inode ctime */ + u_int32_t offcnt; /* offspring count */ + + char *d_m_name; /* mac name */ + char *d_u_name; /* unix name */ + ucs2_t *d_m_name_ucs2; /* mac name as UCS2 */ }; -/* 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) +struct path { + int m_type; /* mac name type (long name, unicode */ + char *m_name; /* mac name */ + char *u_name; /* unix name */ + cnid_t id; /* file id (only for getmetadata) */ + 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 #define DIRTREE_COLOR_RED 0 #define DIRTREE_COLOR_BLACK 1 /* setgid directories */ #ifndef DIRBITS -#define DIRBITS S_ISGID -#endif +# 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 */ @@ -101,6 +123,7 @@ struct dir { #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 */ @@ -117,6 +140,8 @@ struct dir { /* 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) @@ -124,10 +149,14 @@ struct dir { & 0x00ffffff) #define CNID_FILE(a) (((a) & 0x1) << 31) #define CNID(a,b) (CNID_DEV(a) | CNID_INODE(a) | CNID_FILE(b)) -#else -#define CNID(a,b) (((a)->st_ino & 0x7fffffff) | 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; @@ -141,24 +170,45 @@ struct maccess { #define AR_UWRITE (1<<2) #define AR_UOWN (1<<7) -extern struct dir *dirnew __P((const int)); +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 *adddir __P((struct vol *, struct dir *, char *, - int, char *, int, struct stat *)); -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 char *cname __P((const struct vol *, struct dir *, - char **)); +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 int movecwd __P((const struct vol *, struct dir *)); +extern int deletecurdir __P((const struct vol *)); +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, char *, - struct dir *, struct stat *, char *, int *)); -extern int setdirparams __P((const struct vol *, char *, u_int16_t, char *)); -extern int renamedir __P((char *, char *, struct dir *, - struct dir *, char *, const int)); +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((const struct vol *, char *, char *, struct dir *, + struct dir *, char *)); +extern int path_error __P((struct path *, int error)); + +extern void setdiroffcnt __P((struct dir *dir, struct stat *st, u_int32_t count)); +extern int dirreenumerate __P((struct dir *dir, struct stat *st)); +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_rmdir __P((const char *name)); +extern int netatalk_unlink __P((const char *name)); + +extern int caseenumerate __P((const struct vol *, struct path *, struct dir *)); +/* from enumerate.c */ +extern char *check_dirent __P((const struct vol *, char *)); /* FP functions */ extern int afp_createdir __P((AFPObj *, char *, int, char *, int *)); @@ -169,7 +219,12 @@ extern int afp_mapid __P((AFPObj *, char *, int, char *, int *)); extern int afp_mapname __P((AFPObj *, char *, int, char *, int *)); /* from enumerate.c */ -extern int afp_enumerate __P((AFPObj *, char *, int, char *, int *)); +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