X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fdirectory.h;h=4a8dad4f5b1534c98dc21d882c79bfe1f9dd2b36;hb=ecfc96169ab669b578e53fa8e13592934fe37788;hp=8217fd30dc77d3bc21e6662423b9e7449a000c0a;hpb=6b814c857d98259bd82737ce8746c6c1d94e9cd5;p=netatalk.git diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h index 8217fd30..4a8dad4f 100644 --- 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.18 2005-04-28 20:49:41 bfernhomberg Exp $ * * Copyright (c) 1990,1991 Regents of The University of Michigan. * All Rights Reserved. @@ -53,40 +53,37 @@ 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 */ + ucs2_t *d_m_name_ucs2; /* mac name as UCS2 */ }; 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; + 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; }; -/* 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) +#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 @@ -105,6 +102,10 @@ struct path { #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 */ @@ -122,6 +123,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 +140,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 +149,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 +171,17 @@ 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 *)); extern struct path *cname __P((const struct vol *, struct dir *, char **)); extern mode_t mtoumode __P((struct maccess *)); @@ -180,15 +189,24 @@ 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)); + +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 *)); @@ -202,7 +220,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