X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Funix.h;h=3b3c281b528c57dd4c035243796340823c35ec8f;hb=bd3b0cfd7c0c51048ff898e5e1b121f8a3dd1126;hp=9e2fec919706e39565832c220b1c6def2bff91f9;hpb=ecfc96169ab669b578e53fa8e13592934fe37788;p=netatalk.git

diff --git a/etc/afpd/unix.h b/etc/afpd/unix.h
index 9e2fec91..3b3c281b 100644
--- a/etc/afpd/unix.h
+++ b/etc/afpd/unix.h
@@ -1,14 +1,8 @@
-/*
- * $Id: unix.h,v 1.18 2005-04-28 20:49:45 bfernhomberg Exp $
- */
-
 #ifndef AFPD_UNIX_H
 #define AFPD_UNIX_H
 
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif /* HAVE_SYS_CDEFS_H */
-#include <netatalk/endian.h>
+#include <arpa/inet.h>
+
 #include "config.h"
 #include "volume.h"
 
@@ -32,7 +26,7 @@ typedef int	mode_t;
 #define f_frsize f_fsize
 #else /* TRU64 */
 /* temp fix, was: defined(HAVE_SYS_STATVFS) || defined(__svr4__) */
-#if defined(__svr4__)
+#if defined(__svr4__) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 200040000))
 #include <sys/statvfs.h>
 #define statfs statvfs
 #else /* HAVE_SYS_STATVFS || __svr4__ */
@@ -44,7 +38,9 @@ typedef int	mode_t;
 #include <sys/mnttab.h>
 #endif /* __svr4__ || HAVE_SYS_MNTTAB_H */
 
-
+#if defined(__DragonFly__)
+#define dqblk ufs_dqblk
+#endif
 
 #if defined(HAVE_SYS_MOUNT_H) || defined(BSD4_4) || \
     defined(linux) || defined(ultrix)
@@ -57,6 +53,7 @@ typedef int	mode_t;
 
 
 #ifndef NO_QUOTA_SUPPORT
+#if !defined(HAVE_LIBQUOTA)
 
 #if !(defined(__svr4__) || defined(HAVE_DQB_BTIMELIMIT))
 #define dqb_btimelimit  dqb_btime
@@ -65,8 +62,8 @@ typedef int	mode_t;
 #if defined(linux) || defined(ultrix) || defined(HAVE_QUOTA_H)
 #ifndef NEED_QUOTACTL_WRAPPER
 /*#include <sys/quota.h>*/
-/*long quotactl __P((int, const char *, unsigned int, caddr_t)); */
-/* extern long quotactl __P((int, const char *, long, caddr_t)); */
+/*long quotactl (int, const char *, unsigned int, caddr_t); */
+/* extern long quotactl (int, const char *, long, caddr_t); */
 
 #else /* ! NEED_QUOTACTL_WRAPPER */
 #include <asm/types.h>
@@ -200,36 +197,28 @@ struct dqblk_v1 {
   time_t dqb_itime;
 };
 
-extern long quotactl __P ((unsigned int, const char *, int, caddr_t));
+extern long quotactl (unsigned int, const char *, int, caddr_t);
 
 
 
 #endif /* linux */
 
-extern int getnfsquota __P((struct vol *, const int, const u_int32_t,
-                                struct dqblk *));
+extern int getnfsquota (struct vol *, const int, const uint32_t,
+                        struct dqblk *);
 
-extern int uquota_getvolspace __P((struct vol *, VolSpace *, VolSpace *,
-                                       const u_int32_t));
+#endif /* ! HAVE_LIBQUOTA */
+extern int uquota_getvolspace (const AFPObj *obj, struct vol *, VolSpace *, VolSpace *,
+                               const uint32_t);
 #endif /* NO_QUOTA_SUPPORT */
 
 extern struct afp_options default_options;
 
-extern int gmem            __P((const gid_t));
-extern int setdeskmode      __P((const mode_t));
-extern int setdirunixmode   __P((const struct vol *, const char *, const mode_t));
-extern int setdirmode       __P((const struct vol *, const char *, const mode_t));
-extern int setdeskowner     __P((const uid_t, const gid_t));
-extern int setdirowner      __P((const struct vol *, const char *, const uid_t, const gid_t));
-extern int setfilmode       __P((const char *, mode_t , struct stat *));
-extern int setfilunixmode   __P((const struct vol *, struct path*, const mode_t));
-extern int setfilowner      __P((const struct vol *, const uid_t, const gid_t, struct path*));
-extern int unix_rename      __P((const char *oldpath, const char *newpath));
-extern int dir_rx_set       __P((mode_t mode));
-extern int stickydirmode    __P((const char * name, const mode_t mode, const int dropbox));
-
-extern void accessmode      __P((char *, struct maccess *, struct dir *, struct stat *));
-extern char *fullpathname   __P((const char *));
+extern int setdirunixmode   (const struct vol *, char *, mode_t);
+extern int setdirmode       (const struct vol *, const char *, mode_t);
+extern int setdirowner      (const struct vol *, const char *, const uid_t, const gid_t);
+extern int setfilunixmode   (const struct vol *, struct path*, const mode_t);
+extern int setfilowner      (const struct vol *, const uid_t, const gid_t, struct path*);
+extern void accessmode      (const AFPObj *obj, const struct vol *, char *, struct maccess *, struct dir *, struct stat *);
 
 #ifdef AFS	
     #define accessmode afsmode